Skip to content
This repository has been archived by the owner on Sep 3, 2020. It is now read-only.

Add support for file request paging to Remote::FindParentById #24

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for file request paging to Remote::FindParentById #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion changes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (g *Commands) resolveChangeListRecv(

var remoteChildren []*File
if r != nil {
if remoteChildren, err = g.rem.FindByParentId(r.Id); err != nil {
if remoteChildren, err = g.rem.FindByParentID(r.Id, g.opts.Hidden); err != nil {
return
}
}
Expand Down
36 changes: 23 additions & 13 deletions remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,21 +89,31 @@ func (r *Remote) FindByPath(p string) (file *File, err error) {
return r.findByPathRecv("root", parts[1:])
}

func (r *Remote) FindByParentId(parentId string) (files []*File, err error) {
req := r.service.Files.List()
// TODO: use field selectors
req.Q(fmt.Sprintf("'%s' in parents and trashed=false", parentId))
results, err := req.Do()
// TODO: handle paging
if err != nil {
return
}
for _, f := range results.Items {
if !strings.HasPrefix(f.Title, ".") { // ignore hidden files
files = append(files, NewRemoteFile(f))
func (r *Remote) FindByParentID(parentID string, hidden bool) ([]*File, error) {

pageToken := ""
var files []*File
for {
req := r.service.Files.List()
// TODO: use field selectors
req.Q(fmt.Sprintf("'%s' in parents and trashed=false", parentID))
if pageToken != "" {
req.PageToken(pageToken)
}
results, err := req.Do()
if err != nil {
return files, err
}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

files = make([]*File, len(results.Items)), then you don't have to append.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you know of a way to find the total length of the response? i.e total number of files? If I can't figure it out then I guess I could append on subsuquent loops but that seems suboptimal.
https://developers.google.com/drive/v2/reference/files/list

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this code compile? You should need a panic("unreachable") here.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does on Go 1.1 and later. What versions are you trying to support? See https://golang.org/doc/go1.1#return. Do you want me to add it?

for _, f := range results.Items {
if hidden || !strings.HasPrefix(f.Title, ".") { // ignore hidden files
files = append(files, NewRemoteFile(f))
}
}
pageToken = results.NextPageToken
if pageToken == "" {
return files, err
}
}
return
}

func (r *Remote) Trash(id string) error {
Expand Down