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

yandex: fix single level directory listing

Browse source
This commit is contained in:
Nick Craig-Wood 2017-02-25 13:39:16 +00:00
parent 79e3c67bbd
commit efbb040e3f
2 changed files with 47 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
yandex/api/resource_info_request_helpers.go
View file

@ -14,10 +14,10 @@ func createResourceInfoRequest(c *Client,
parameters["sort"] = opt.SortMode.String() parameters["sort"] = opt.SortMode.String()
} }
if opt.Limit != nil { if opt.Limit != nil {
parameters["limit"] = opt.Limit parameters["limit"] = *opt.Limit
} }
if opt.Offset != nil { if opt.Offset != nil {
parameters["offset"] = opt.Offset parameters["offset"] = *opt.Offset
} }
if opt.Fields != nil { if opt.Fields != nil {
parameters["fields"] = strings.Join(opt.Fields, ",") parameters["fields"] = strings.Join(opt.Fields, ",")
@ -26,7 +26,7 @@ func createResourceInfoRequest(c *Client,
parameters["preview_size"] = opt.PreviewSize.String() parameters["preview_size"] = opt.PreviewSize.String()
} }
if opt.PreviewCrop != nil { if opt.PreviewCrop != nil {
parameters["preview_crop"] = opt.PreviewCrop parameters["preview_crop"] = *opt.PreviewCrop
} }
} }
return createGetRequest(c, apiPath, parameters) return createGetRequest(c, apiPath, parameters)

42
yandex/yandex.go
View file

@ -170,17 +170,32 @@ func (f *Fs) setRoot(root string) {
type listFn func(remote string, item *yandex.ResourceInfoResponse, isDirectory bool) error type listFn func(remote string, item *yandex.ResourceInfoResponse, isDirectory bool) error
// listDir lists this directory only returning objects and directories // listDir lists this directory only returning objects and directories
func (f *Fs) listDir(fn listFn) (err error) { func (f *Fs) listDir(dir string, fn listFn) (err error) {
//request object meta info //request object meta info
var opt yandex.ResourceInfoRequestOptions var opt yandex.ResourceInfoRequestOptions
ResourceInfoResponse, err := f.yd.NewResourceInfoRequest(f.diskRoot, opt).Exec() root := f.diskRoot
if dir != "" {
root += dir + "/"
}
var limit uint32 = 1000 // max number of object per request
var itemsCount uint32 //number of items per page in response
var offset uint32 //for the next page of request
opt.Limit = &limit
opt.Offset = &offset
//query each page of list until itemCount is less then limit
for {
ResourceInfoResponse, err := f.yd.NewResourceInfoRequest(root, opt).Exec()
if err != nil { if err != nil {
return err return err
} }
itemsCount = uint32(len(ResourceInfoResponse.Embedded.Items))
if ResourceInfoResponse.ResourceType == "dir" { if ResourceInfoResponse.ResourceType == "dir" {
//list all subdirs //list all subdirs
for _, element := range ResourceInfoResponse.Embedded.Items { for i, element := range ResourceInfoResponse.Embedded.Items {
remote := element.Name remote := path.Join(dir, element.Name)
fs.Debugf(i, "%q", remote)
switch element.ResourceType { switch element.ResourceType {
case "dir": case "dir":
err = fn(remote, &element, true) err = fn(remote, &element, true)
@ -197,6 +212,14 @@ func (f *Fs) listDir(fn listFn) (err error) {
} }
} }
} }
//offset for the next page of items
offset += itemsCount
//check if we reached end of list
if itemsCount < limit {
break
}
}
return nil return nil
} }
@ -284,22 +307,13 @@ func (f *Fs) List(out fs.ListOpts, dir string) {
var err error var err error
switch out.Level() { switch out.Level() {
case 1: case 1:
if dir == "" { err = f.listDir(dir, listItem)
err = f.listDir(listItem)
} else {
err = f.list(dir, listItem)
}
case fs.MaxLevel: case fs.MaxLevel:
err = f.list(dir, listItem) err = f.list(dir, listItem)
default: default:
out.SetError(fs.ErrorLevelNotSupported) out.SetError(fs.ErrorLevelNotSupported)
} }
if err != nil { if err != nil {
// FIXME
// if err == swift.ContainerNotFound {
// err = fs.ErrorDirNotFound
// }
out.SetError(err) out.SetError(err)
} }
} }