drive: handle shared drives with leading/trailing space in name (related to #6618)

This commit is contained in:
albertony 2022-12-12 20:05:12 +01:00
parent 8b9f3bbe29
commit 5a59b49b6b
3 changed files with 51 additions and 30 deletions

View file

@ -13,7 +13,8 @@ import (
)
const (
configNameRe = `[\w\p{L}\p{N}.]+(?:[ -]+[\w\p{L}\p{N}.-]+)*` // don't allow it to start with `-` as it complicates usage (#4261)
configNameRe = `[\w\p{L}\p{N}.]+(?:[ -]+[\w\p{L}\p{N}.-]+)*` // May contain Unicode numbers and letters, as well as `_`, `-`, `.` and space, but not start with `-` (it complicates usage, see #4261) or space, and not end with space
illegalPartOfConfigNameRe = `^[ -]+|[^\w\p{L}\p{N}. -]+|[ ]+$`
)
var (
@ -32,6 +33,9 @@ var (
// configNameMatcher is a pattern to match an rclone config name
configNameMatcher = regexp.MustCompile(`^` + configNameRe + `$`)
// illegalPartOfConfigNameMatcher is a pattern to match a sequence of characters not allowed in an rclone config name
illegalPartOfConfigNameMatcher = regexp.MustCompile(illegalPartOfConfigNameRe)
// remoteNameMatcher is a pattern to match an rclone remote name at the start of a config
remoteNameMatcher = regexp.MustCompile(`^:?` + configNameRe + `(?::$|,)`)
)
@ -44,6 +48,21 @@ func CheckConfigName(configName string) error {
return nil
}
// MakeConfigName makes an input into something legal to be used as a config name.
// Returns a string where any sequences of illegal characters are replaced with
// a single underscore. If the input is already valid as a config name, it is
// returned unchanged. If the input is an empty string, a single underscore is
// returned.
func MakeConfigName(name string) string {
if name == "" {
return "_"
}
if configNameMatcher.MatchString(name) {
return name
}
return illegalPartOfConfigNameMatcher.ReplaceAllString(name, "_")
}
// checkRemoteName returns an error if remoteName is invalid
func checkRemoteName(remoteName string) error {
if remoteName == ":" || remoteName == "::" {