"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
internxt: fix "directory not empty" and stale directories after moves and deletes
Nick Craig-Wood7ff5da851715
diff --git a/backend/internxt/internxt.go b/backend/internxt/internxt.goindex fc4f1b46f..a2b985b6b 100644--- a/backend/internxt/internxt.go+++ b/backend/internxt/internxt.go@@ -474,8 +474,10 @@ func (f *Fs) Rmdir(ctx context.Context, dir string) error {if err != nil {return err}- if len(childFolders) > 0 {- return fs.ErrorDirectoryNotEmpty+ for _, e := range childFolders {+ if !recent.stale(e.UUID, id, e.PlainName) {+ return fs.ErrorDirectoryNotEmpty+ }}var childFiles []folders.File@@ -487,8 +489,10 @@ func (f *Fs) Rmdir(ctx context.Context, dir string) error {if err != nil {return err}- if len(childFiles) > 0 {- return fs.ErrorDirectoryNotEmpty+ for _, e := range childFiles {+ if !recent.stale(e.UUID, id, joinNameExt(e.PlainName, e.Type)) {+ return fs.ErrorDirectoryNotEmpty+ }}// Delete the directory@@ -502,6 +506,7 @@ func (f *Fs) Rmdir(ctx context.Context, dir string) error {if err != nil {return err}+ recent.deleted(id)f.dirCache.FlushDir(dir)return nil@@ -520,6 +525,9 @@ func (f *Fs) FindLeaf(ctx context.Context, pathID, leaf string) (string, bool, ereturn "", false, err}for _, e := range entries {+ if recent.stale(e.UUID, pathID, e.PlainName) {+ continue+ }if f.opt.Encoding.ToStandardName(e.PlainName) == leaf {return e.UUID, true, nil}@@ -753,6 +761,9 @@ func (f *Fs) List(ctx context.Context, dir string) (fs.DirEntries, error) {return nil, err}for _, e := range foldersList {+ if recent.stale(e.UUID, dirID, e.PlainName) {+ continue+ }remote := path.Join(dir, f.opt.Encoding.ToStandardName(e.PlainName))out = append(out, fs.NewDir(remote, e.ModificationTime))}@@ -845,6 +856,7 @@ func (f *Fs) Remove(ctx context.Context, remote string) error {if err != nil {return err}+ recent.deleted(dirID)f.dirCache.FlushDir(remote)return nil}@@ -1026,6 +1038,7 @@ func (f *Fs) DirMove(ctx context.Context, src fs.Fs, srcRemote, dstRemote stringif err != nil {return err}+ recent.moved(srcID, dstDirectoryID, encodedLeaf)srcFs.dirCache.FlushDir(srcRemote)return nil