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

iclouddrive: fix 'directory not found' error when the directory contains accent marks

Brais Couced15f1142ef12
diff --git a/backend/iclouddrive/iclouddrive.go b/backend/iclouddrive/iclouddrive.go
index 7228db060..1a51b9ab8 100644
--- a/backend/iclouddrive/iclouddrive.go
+++ b/backend/iclouddrive/iclouddrive.go
@@ -27,6 +27,8 @@ import (
"github.com/rclone/rclone/lib/dircache"
"github.com/rclone/rclone/lib/encoder"
"github.com/rclone/rclone/lib/pacer"
+
+ "golang.org/x/text/unicode/norm"
)
/*
@@ -225,7 +227,8 @@ func (f *Fs) findLeafItem(ctx context.Context, pathID string, leaf string) (item
return nil, false, err
}
for _, item := range items {
- if strings.EqualFold(item.FullName(), leaf) {
+ // iCloud returns file names in NFD Unicode normalization, so normalized to NFC for consistent comparison
+ if strings.EqualFold(norm.NFC.String(item.FullName()), leaf) {
return item, true, nil
}
}