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

google cloud storage: fix ListDir on subdirectory

Browse source
This commit is contained in:
Nick Craig-Wood 2014-07-28 18:04:52 +01:00
parent 457ef2c190
commit cc679aa714
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
googlecloudstorage/googlecloudstorage.go
View file

@ -255,10 +255,8 @@ func (f *FsStorage) list(directories bool, fn func(string, *storage.Object)) {
fs.Log(f, "Couldn't read bucket %q: %s", f.bucket, err)
return
}
if !directories {
for _, object := range objects.Items {
if directories && !strings.HasSuffix(object.Name, "/") {
continue
}
if !strings.HasPrefix(object.Name, f.root) {
fs.Log(f, "Odd name received %q", object.Name)
continue
@ -266,6 +264,15 @@ func (f *FsStorage) list(directories bool, fn func(string, *storage.Object)) {
remote := object.Name[rootLength:]
fn(remote, object)
}
} else {
var object storage.Object
for _, prefix := range objects.Prefixes {
if !strings.HasSuffix(prefix, "/") {
continue
}
fn(prefix[:len(prefix)-1], &object)
}
}
if objects.NextPageToken == "" {
break
}