Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

jottacloud: fix server-side copy onto a trashed file keeping the old name case

Nick Craig-Wooda91ddbeddc61
diff --git a/backend/jottacloud/jottacloud.go b/backend/jottacloud/jottacloud.go
index a67a02bfb..2659fca2a 100644
--- a/backend/jottacloud/jottacloud.go
+++ b/backend/jottacloud/jottacloud.go
@@ -1518,6 +1518,11 @@ func (f *Fs) Copy(ctx context.Context, src fs.Object, remote string) (fs.Object,
// Workaround necessary when destination was a trashed file, to avoid the copied file also being in trash (bug in api?)
fs.Debugf(src, "Server-side copied to trashed destination, restoring")
info, err = f.createOrUpdate(ctx, remote, createTime, modTime, info.Size, info.MD5)
+ // The restored file keeps the name it was trashed with, which may differ in case
+ if err == nil && info != nil && info.Name != f.opt.Enc.FromStandardName(path.Base(remote)) {
+ fs.Debugf(src, "Renaming restored %q to %q", info.Name, path.Base(remote))
+ info, err = f.copyOrMove(ctx, "mv", f.filePath(remote), remote)
+ }
} else if createTimeMeta || modTimeMeta {
info, err = f.createOrUpdate(ctx, remote, createTime, modTime, info.Size, info.MD5)
}