This repository has been archived by the owner on Sep 3, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 508
Add support for file request paging to Remote::FindParentById #24
Open
arolett2
wants to merge
1
commit into
rakyll:master
Choose a base branch
from
arolett2:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Does this code compile? You should need a panic("unreachable") here. There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 { | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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