KurlesHS/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

drive: Added --drive-starred-only to only show starred files - fixes #3928

Browse source
This commit is contained in:
Jay McEntire 2020-08-21 10:30:41 -06:00 • committed by GitHub
parent fee8f21ce1
commit 45afe97e8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
backend/drive/drive.go
View file

@ -281,6 +281,11 @@ commands (copy, sync, etc), and with all other commands too.`,
Default: false, Default: false,
Help: "Only show files that are in the trash.\nThis will show trashed files in their original directory structure.", Help: "Only show files that are in the trash.\nThis will show trashed files in their original directory structure.",
Advanced: true, Advanced: true,
}, {
Name: "starred_only",
Default: false,
Help: "Only show files that are starred.",
Advanced: true,
}, { }, {
Name: "formats", Name: "formats",
Default: "", Default: "",
@ -513,6 +518,7 @@ type Options struct {
SkipChecksumGphotos bool `config:"skip_checksum_gphotos"` SkipChecksumGphotos bool `config:"skip_checksum_gphotos"`
SharedWithMe bool `config:"shared_with_me"` SharedWithMe bool `config:"shared_with_me"`
TrashedOnly bool `config:"trashed_only"` TrashedOnly bool `config:"trashed_only"`
StarredOnly bool `config:"starred_only"`
Extensions string `config:"formats"` Extensions string `config:"formats"`
ExportExtensions string `config:"export_formats"` ExportExtensions string `config:"export_formats"`
ImportExtensions string `config:"import_formats"` ImportExtensions string `config:"import_formats"`
@ -696,6 +702,7 @@ func (f *Fs) list(ctx context.Context, dirIDs []string, title string, directorie
} }
query = append(query, q) query = append(query, q)
} }
// Search with sharedWithMe will always return things listed in "Shared With Me" (without any parents) // Search with sharedWithMe will always return things listed in "Shared With Me" (without any parents)
// We must not filter with parent when we try list "ROOT" with drive-shared-with-me // We must not filter with parent when we try list "ROOT" with drive-shared-with-me
// If we need to list file inside those shared folders, we must search it without sharedWithMe // If we need to list file inside those shared folders, we must search it without sharedWithMe
@ -707,8 +714,16 @@ func (f *Fs) list(ctx context.Context, dirIDs []string, title string, directorie
if parentsQuery.Len() > 1 { if parentsQuery.Len() > 1 {
_, _ = parentsQuery.WriteString(" or ") _, _ = parentsQuery.WriteString(" or ")
} }
if f.opt.SharedWithMe && dirID == f.rootFolderID { if (f.opt.SharedWithMe || f.opt.StarredOnly) && dirID == f.rootFolderID {
_, _ = parentsQuery.WriteString("sharedWithMe=true") if f.opt.SharedWithMe {
_, _ = parentsQuery.WriteString("sharedWithMe=true")
}
if f.opt.StarredOnly {
if f.opt.SharedWithMe {
_, _ = parentsQuery.WriteString(" and ")
}
_, _ = parentsQuery.WriteString("starred=true")
}
} else { } else {
_, _ = fmt.Fprintf(parentsQuery, "'%s' in parents", dirID) _, _ = fmt.Fprintf(parentsQuery, "'%s' in parents", dirID)
} }