Fix json filename generation (#2887)

This commit is contained in:
WithoutPants
2022-09-06 13:10:24 +10:00
parent 0c513a604d
commit 13bdba5b24
9 changed files with 63 additions and 7 deletions

View File

@@ -5,6 +5,7 @@ import (
"io"
"os"
"path/filepath"
"regexp"
"strings"
)
@@ -116,3 +117,25 @@ func Touch(path string) error {
}
return nil
}
var (
replaceCharsRE = regexp.MustCompile(`[&=\\/:*"?_ ]`)
removeCharsRE = regexp.MustCompile(`[^[:alnum:]-.]`)
multiHyphenRE = regexp.MustCompile(`\-+`)
)
// SanitiseBasename returns a file basename removing any characters that are illegal or problematic to use in the filesystem.
func SanitiseBasename(v string) string {
v = strings.TrimSpace(v)
// replace illegal filename characters with -
v = replaceCharsRE.ReplaceAllString(v, "-")
// remove other characters
v = removeCharsRE.ReplaceAllString(v, "")
// remove multiple hyphens
v = multiHyphenRE.ReplaceAllString(v, "-")
return strings.TrimSpace(v)
}

26
pkg/fsutil/file_test.go Normal file
View File

@@ -0,0 +1,26 @@
package fsutil
import "testing"
func TestSanitiseBasename(t *testing.T) {
tests := []struct {
name string
v string
want string
}{
{"basic", "basic", "basic"},
{"spaces", `spaced name`, "spaced-name"},
{"leading/trailing spaces", ` spaced name `, "spaced-name"},
{"hyphen name", `hyphened-name`, "hyphened-name"},
{"multi-hyphen", `hyphened--name`, "hyphened-name"},
{"replaced characters", `a&b=c\d/:e*"f?_ g`, "a-b-c-d-e-f-g"},
{"removed characters", `foo!!bar@@and, more`, "foobarand-more"},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := SanitiseBasename(tt.v); got != tt.want {
t.Errorf("SanitiseBasename() = %v, want %v", got, tt.want)
}
})
}
}