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

Backend: Keep ampersand in titles generated from file names

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-07-20 13:25:09 +02:00
parent 0da72687e6
commit 2283f6019a
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/txt/file_title.go
View file

@ -7,7 +7,7 @@ import (
"github.com/photoprism/photoprism/pkg/fs"
)
var FileTitleRegexp = regexp.MustCompile("[\\p{L}\\-,':]{2,}")
var FileTitleRegexp = regexp.MustCompile("[\\p{L}\\-,':]{2,}|( & )?")
// FileTitle returns the string with the first characters of each word converted to uppercase.
func FileTitle(s string) string {

3
pkg/txt/file_title_test.go
View file

@ -80,4 +80,7 @@ func TestFileTitle(t *testing.T) {
t.Run("invalid words", func(t *testing.T) {
assert.Equal(t, "", FileTitle("jg hg "))
})
t.Run("ampersand", func(t *testing.T) {
assert.Equal(t, "Coouussinen, Du & Ich", FileTitle("coouussinen, du & ich"))
})
}