github/rclone
1
Fork 0
mirror of https://github.com/rclone/rclone synced 2024-12-28 21:03:45 +01:00
Code Releases Activity

dropbox: Fix deprecation warnings for Move, MoveDir and Copy - fixes #1699

Browse Source
This commit is contained in:
Nick Craig-Wood 2017-09-24 20:01:30 +01:00
parent 29e2744155
commit 0e76e35b6f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dropbox/dropbox.go
View File

@ -527,9 +527,9 @@ func (f *Fs) Copy(src fs.Object, remote string) (fs.Object, error) {
arg.FromPath = srcObj.remotePath() arg.FromPath = srcObj.remotePath()
arg.ToPath = dstObj.remotePath() arg.ToPath = dstObj.remotePath()
var err error var err error
var entry files.IsMetadata var result *files.RelocationResult
err = f.pacer.Call(func() (bool, error) { err = f.pacer.Call(func() (bool, error) {
entry, err = f.srv.Copy(&arg) result, err = f.srv.CopyV2(&arg)
return shouldRetry(err) return shouldRetry(err)
}) })
if err != nil { if err != nil {
@ -537,7 +537,7 @@ func (f *Fs) Copy(src fs.Object, remote string) (fs.Object, error) {
} }
// Set the metadata // Set the metadata
fileInfo, ok := entry.(*files.FileMetadata) fileInfo, ok := result.Metadata.(*files.FileMetadata)
if !ok { if !ok {
return nil, fs.ErrorNotAFile return nil, fs.ErrorNotAFile
} }
@ -590,9 +590,9 @@ func (f *Fs) Move(src fs.Object, remote string) (fs.Object, error) {
arg.FromPath = srcObj.remotePath() arg.FromPath = srcObj.remotePath()
arg.ToPath = dstObj.remotePath() arg.ToPath = dstObj.remotePath()
var err error var err error
var entry files.IsMetadata var result *files.RelocationResult
err = f.pacer.Call(func() (bool, error) { err = f.pacer.Call(func() (bool, error) {
entry, err = f.srv.Move(&arg) result, err = f.srv.MoveV2(&arg)
return shouldRetry(err) return shouldRetry(err)
}) })
if err != nil { if err != nil {
@ -600,7 +600,7 @@ func (f *Fs) Move(src fs.Object, remote string) (fs.Object, error) {
} }
// Set the metadata // Set the metadata
fileInfo, ok := entry.(*files.FileMetadata) fileInfo, ok := result.Metadata.(*files.FileMetadata)
if !ok { if !ok {
return nil, fs.ErrorNotAFile return nil, fs.ErrorNotAFile
} }
@ -644,7 +644,7 @@ func (f *Fs) DirMove(src fs.Fs, srcRemote, dstRemote string) error {
arg.FromPath = srcPath arg.FromPath = srcPath
arg.ToPath = dstPath arg.ToPath = dstPath
err = f.pacer.Call(func() (bool, error) { err = f.pacer.Call(func() (bool, error) {
_, err = f.srv.Move(&arg) _, err = f.srv.MoveV2(&arg)
return shouldRetry(err) return shouldRetry(err)
}) })
if err != nil { if err != nil {