"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
s3: fix handling of objects with // in #5858
Nick Craig-Wood77429b154e57
diff --git a/backend/s3/s3.go b/backend/s3/s3.goindex c26d63a3c..2adcc333a 100644--- a/backend/s3/s3.go+++ b/backend/s3/s3.go@@ -3677,6 +3677,9 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (fs.Fs, eif opt.Provider == "IDrive" {f.features.SetTier = false}+ if opt.Provider == "AWS" {+ f.features.DoubleSlash = true+ }if opt.DirectoryMarkers {f.features.CanHaveEmptyDirectories = true}@@ -4148,7 +4151,7 @@ func (f *Fs) list(ctx context.Context, opt listOpt, fn listFn) error {opt.prefix += "/"}if !opt.findFile {- if opt.directory != "" {+ if opt.directory != "" && (opt.prefix == "" && !bucket.IsAllSlashes(opt.directory) || opt.prefix != "" && !strings.HasSuffix(opt.directory, "/")) {opt.directory += "/"}}@@ -4245,14 +4248,18 @@ func (f *Fs) list(ctx context.Context, opt listOpt, fn listFn) error {}remote = f.opt.Enc.ToStandardPath(remote)if !strings.HasPrefix(remote, opt.prefix) {- fs.Logf(f, "Odd name received %q", remote)+ fs.Logf(f, "Odd directory name received %q", remote)continue}remote = remote[len(opt.prefix):]+ // Trim one slash off the remote name+ remote, _ = strings.CutSuffix(remote, "/")+ if remote == "" || bucket.IsAllSlashes(remote) {+ remote += "/"+ }if opt.addBucket {remote = bucket.Join(opt.bucket, remote)}- remote = strings.TrimSuffix(remote, "/")err = fn(remote, &types.Object{Key: &remote}, nil, true)if err != nil {if err == errEndList {