tabshift/pocketbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trim normalized file extension

Browse Source
This commit is contained in:
Gani Georgiev
2025-12-12 08:49:10 +02:00
parent 4399a6c1ab
commit 7286f34104
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -2,6 +2,8 @@
- Store the correct `image/png` as attrs content type when generating a thumb fallback _(e.g. for `webp`)_. - Store the correct `image/png` as attrs content type when generating a thumb fallback _(e.g. for `webp`)_.
- Trimmed the normalized file extension to ensure that there is only one beginning `.` character.
## v0.34.2 ## v0.34.2

8
tools/filesystem/file.go
View File

@@ -196,19 +196,19 @@ func normalizeName(fr FileReader, name string) string {
// extension // extension
// --- // ---
originalExt := extractExtension(name) originalExt := extractExtension(name)
cleanExt := extInvalidCharsRegex.ReplaceAllString(originalExt, "") cleanExt := "." + strings.Trim(extInvalidCharsRegex.ReplaceAllString(originalExt, ""), ".")
if cleanExt == "" { if cleanExt == "." {
// try to detect the extension from the file content // try to detect the extension from the file content
cleanExt, _ = detectExtension(fr) cleanExt, _ = detectExtension(fr)
} }
if extLength := len(cleanExt); extLength > 20 { if extLength := len(cleanExt); extLength > 20 {
// keep only the last 20 characters (it is multibyte safe after the regex replace) // keep only the last 20 characters (it is multibyte safe after the regex replace)
cleanExt = "." + cleanExt[extLength-20:] cleanExt = "." + strings.Trim(cleanExt[extLength-20:], ".")
} }
// name // name
// --- // ---
cleanName := inflector.Snakecase(strings.TrimSuffix(name, originalExt)) cleanName := inflector.Snakecase(strings.TrimSuffix(strings.TrimSuffix(name, originalExt), "."))
if length := len(cleanName); length < 3 { if length := len(cleanName); length < 3 {
// the name is too short so we concatenate an additional random part // the name is too short so we concatenate an additional random part
cleanName += security.RandomStringWithAlphabet(10, randomAlphabet) cleanName += security.RandomStringWithAlphabet(10, randomAlphabet)

2
tools/filesystem/file_test.go
View File

@@ -211,6 +211,8 @@ func TestFileNameNormalizations(t *testing.T) {
{".png", `^\w{10}_\w{10}\.png$`}, {".png", `^\w{10}_\w{10}\.png$`},
{".tar.gz", `^\w{10}_\w{10}\.tar\.gz$`}, {".tar.gz", `^\w{10}_\w{10}\.tar\.gz$`},
{"a.tar.gz", `^a\w{10}_\w{10}\.tar\.gz$`}, {"a.tar.gz", `^a\w{10}_\w{10}\.tar\.gz$`},
{"....abc", `^\w{10}_\w{10}\.abc$`},
{"a.b.c.?.?.?.2", `^a_b_c_\w{10}\.2$`},
{"a.b.c.d.tar.gz", `^a_b_c_d_\w{10}\.tar\.gz$`}, {"a.b.c.d.tar.gz", `^a_b_c_d_\w{10}\.tar\.gz$`},
{"abcd", `^abcd_\w{10}\.txt$`}, {"abcd", `^abcd_\w{10}\.txt$`},
{"a b! c d . 456", `^a_b_c_d_\w{10}\.456$`}, // normalize spaces {"a b! c d . 456", `^a_b_c_d_\w{10}\.456$`}, // normalize spaces

6
tools/filesystem/filesystem_test.go
View File

@@ -600,6 +600,7 @@ func TestFileSystemGetReuploadableFile(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer r.Close()
raw, err := io.ReadAll(r) raw, err := io.ReadAll(r)
if err != nil { if err != nil {
@@ -677,12 +678,13 @@ func TestFileSystemCopy(t *testing.T) {
if err := fsys.Copy(src, dst); err != nil { if err := fsys.Copy(src, dst); err != nil {
t.Fatalf("Failed to copy %q to %q: %v", src, dst, err) t.Fatalf("Failed to copy %q to %q: %v", src, dst, err)
} }
f, err := fsys.GetReader(dst) f, err := fsys.GetReader(dst)
//nolint
defer f.Close()
if err != nil { if err != nil {
t.Fatalf("Missing copied file %q: %v", dst, err) t.Fatalf("Missing copied file %q: %v", dst, err)
} }
defer f.Close()
if f.Size() != 73 { if f.Size() != 73 {
t.Fatalf("Expected file size %d, got %d", 73, f.Size()) t.Fatalf("Expected file size %d, got %d", 73, f.Size())
} }