github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-23 15:25:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

union: fix server-side copy

Browse Source
This commit is contained in:
Max Sum 2020-05-10 04:28:30 +08:00 committed by Nick Craig-Wood
parent 1f005a82ad
commit f21e97001b
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
backend/union/union.go
View File

@ -18,6 +18,7 @@ import (
"github.com/rclone/rclone/fs/config/configmap" "github.com/rclone/rclone/fs/config/configmap"
"github.com/rclone/rclone/fs/config/configstruct" "github.com/rclone/rclone/fs/config/configstruct"
"github.com/rclone/rclone/fs/hash" "github.com/rclone/rclone/fs/hash"
"github.com/rclone/rclone/fs/operations"
) )
// Register with Fs // Register with Fs
@ -200,19 +201,27 @@ func (f *Fs) Copy(ctx context.Context, src fs.Object, remote string) (fs.Object,
return nil, fs.ErrorCantCopy return nil, fs.ErrorCantCopy
} }
o := srcObj.UnWrap() o := srcObj.UnWrap()
u := o.UpstreamFs() su := o.UpstreamFs()
do := u.Features().Copy if su.Features().Copy == nil {
if do == nil {
return nil, fs.ErrorCantCopy return nil, fs.ErrorCantCopy
} }
if !u.IsCreatable() { var du *upstream.Fs
for _, u := range f.upstreams {
if operations.Same(u.RootFs, su.RootFs) {
du = u
}
}
if du == nil {
return nil, fs.ErrorCantCopy
}
if !du.IsCreatable() {
return nil, fs.ErrorPermissionDenied return nil, fs.ErrorPermissionDenied
} }
co, err := do(ctx, o, remote) co, err := du.Features().Copy(ctx, o, remote)
if err != nil || co == nil { if err != nil || co == nil {
return nil, err return nil, err
} }
wo, err := f.wrapEntries(u.WrapObject(co)) wo, err := f.wrapEntries(du.WrapObject(co))
return wo.(*Object), err return wo.(*Object), err
} }
@ -243,18 +252,28 @@ func (f *Fs) Move(ctx context.Context, src fs.Object, remote string) (fs.Object,
objs := make([]*upstream.Object, len(entries)) objs := make([]*upstream.Object, len(entries))
errs := Errors(make([]error, len(entries))) errs := Errors(make([]error, len(entries)))
multithread(len(entries), func(i int) { multithread(len(entries), func(i int) {
u := entries[i].UpstreamFs() su := entries[i].UpstreamFs()
o, ok := entries[i].(*upstream.Object) o, ok := entries[i].(*upstream.Object)
if !ok { if !ok {
errs[i] = errors.Wrap(fs.ErrorNotAFile, u.Name()) errs[i] = errors.Wrap(fs.ErrorNotAFile, su.Name())
return return
} }
mo, err := u.Features().Move(ctx, o.UnWrap(), remote) var du *upstream.Fs
for _, u := range f.upstreams {
if operations.Same(u.RootFs, su.RootFs) {
du = u
}
}
if du == nil {
errs[i] = errors.Wrap(fs.ErrorCantMove, su.Name()+":"+remote)
return
}
mo, err := du.Features().Move(ctx, o.UnWrap(), remote)
if err != nil || mo == nil { if err != nil || mo == nil {
errs[i] = errors.Wrap(err, u.Name()) errs[i] = errors.Wrap(err, su.Name())
return return
} }
objs[i] = u.WrapObject(mo) objs[i] = du.WrapObject(mo)
}) })
var en []upstream.Entry var en []upstream.Entry
for _, o := range objs { for _, o := range objs {
@ -297,7 +316,7 @@ func (f *Fs) DirMove(ctx context.Context, src fs.Fs, srcRemote, dstRemote string
su := upstreams[i] su := upstreams[i]
var du *upstream.Fs var du *upstream.Fs
for _, u := range f.upstreams { for _, u := range f.upstreams {
if u.RootFs.Root() == su.RootFs.Root() { if operations.Same(u.RootFs, su.RootFs) {
du = u du = u
} }
} }