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

lib/transform: make titlecase capitalise words instead of upper-casing them

kevina4a2a78b908c
diff --git a/lib/transform/transform.go b/lib/transform/transform.go
index 6428f58b9..7708e552d 100644
--- a/lib/transform/transform.go
+++ b/lib/transform/transform.go
@@ -23,7 +23,9 @@ import (
"github.com/rclone/rclone/fs"
"github.com/rclone/rclone/fs/fserrors"
"github.com/rclone/rclone/lib/encoder"
+ "golang.org/x/text/cases"
"golang.org/x/text/encoding/charmap"
+ "golang.org/x/text/language"
"golang.org/x/text/unicode/norm"
)
@@ -217,7 +219,8 @@ func transformPathSegment(s string, t transform) (string, error) {
case ConvUppercase:
return strings.ToUpper(s), nil
case ConvTitlecase:
- return strings.ToTitle(s), nil
+ // A Caser is not safe for concurrent use, so make one per call.
+ return cases.Title(language.Und).String(s), nil
case ConvASCII:
return toASCII(s), nil
case ConvURL:
diff --git a/lib/transform/transform_test.go b/lib/transform/transform_test.go
index 3b15e90ee..9a2cefab1 100644
--- a/lib/transform/transform_test.go
+++ b/lib/transform/transform_test.go
@@ -168,3 +168,20 @@ func TestVarious(t *testing.T) {
assert.Equal(t, test.want, got)
}
}
+
+func TestTitlecase(t *testing.T) {
+ for _, test := range []struct {
+ path string
+ want string
+ }{
+ {"hello world.txt", "Hello World.txt"},
+ {"a dir/my report v2.pdf", "A Dir/My Report V2.pdf"},
+ {"ÉCOLE été", "École Été"},
+ } {
+ ctx, err := newOptions("all,titlecase")
+ require.NoError(t, err)
+
+ got := Path(ctx, test.path, false)
+ assert.Equal(t, test.want, got)
+ }
+}