luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Library: Allow "#" at the beginning of path names #3695

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2023-09-20 17:13:25 +02:00
parent 4d1003846c
commit 8957462672
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/clean/path.go
View file

@ -22,7 +22,7 @@ func Path(s string) string {
}
switch r {
case '~', '\\', '|', '"', '?', '*', '<', '>', '{', '}':
case '\\', '|', '"', '?', '*', '%', '<', '>', '{', '}':
return -1
default:
return r
@ -38,7 +38,7 @@ func UserPath(dir string) string {
return dir
}
dir = strings.Trim(path.Clean(Path(strings.ReplaceAll(dir, "\\", "/"))), "./ \\*%#~?|<>")
dir = strings.Trim(path.Clean(Path(strings.ReplaceAll(dir, "\\", "/"))), " ./\\|?*%<>")
if strings.Contains(dir, "/.") || strings.Contains(dir, "..") || strings.Contains(dir, "//") {
return ""

12
pkg/clean/path_test.go
View file

@ -40,6 +40,12 @@ func TestPath(t *testing.T) {
t.Run("Special Chars", func(t *testing.T) {
assert.Equal(t, "filename.", Path("filename.?**"))
})
t.Run("IncludesHash", func(t *testing.T) {
assert.Equal(t, "1970-05 (Tray #005) to 3-78 Person-Abbrev Place", Path("1970-05 (Tray #005) to 3-78 Person-Abbrev Place"))
})
t.Run("StartsWithHash", func(t *testing.T) {
assert.Equal(t, "#2020", Path("#2020"))
})
}
func TestUserPath(t *testing.T) {
@ -70,6 +76,12 @@ func TestUserPath(t *testing.T) {
t.Run("Replace", func(t *testing.T) {
assert.Equal(t, "", UserPath("${https://<host>:<port>/<path>}"))
})
t.Run("IncludesHash", func(t *testing.T) {
assert.Equal(t, "1970-05 (Tray #005) to 3-78 Person-Abbrev Place", UserPath("1970-05 (Tray #005) to 3-78 Person-Abbrev Place"))
})
t.Run("StartsWithHash", func(t *testing.T) {
assert.Equal(t, "#2020", UserPath("#2020"))
})
t.Run("Unclean", func(t *testing.T) {
assert.Equal(t, "foo/bar/baz", UserPath("/foo/bar/baz/"))
assert.Equal(t, "dirty/path", UserPath("/dirty/path/"))