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

Search: Use quotes for serializing strings containing ":"

Browse source
This commit is contained in:
Michael Mayer 2020-12-14 10:35:37 +01:00
parent 29075d03a8
commit c6dd1c608d
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/form/serialize.go
View file

@ -57,7 +57,7 @@ func Serialize(f interface{}, all bool) string {
}
case string:
if val := strings.TrimSpace(strings.ReplaceAll(fieldValue.String(), "\"", "")); val != "" {
if strings.Contains(val, " ") {
if strings.ContainsAny(val, " :'()[]-+`") {
q = append(q, fmt.Sprintf("%s:\"%s\"", fieldName, val))
} else {
q = append(q, fmt.Sprintf("%s:%s", fieldName, val))

5
internal/form/serialize_test.go
View file

@ -55,6 +55,7 @@ type TestForm struct {
func TestSerialize(t *testing.T) {
form := TestForm{
Query: "foo BAR",
Name: "yo/ba:z.JPG",
Private: true,
Photo: false,
Lat: 1.5,
@ -67,8 +68,8 @@ func TestSerialize(t *testing.T) {
Before: time.Date(2019, 01, 15, 0, 0, 0, 0, time.UTC),
}
expected := "q:\"foo BAR\" lat:1.500000 lng:-10.333330 chroma:1 diff:424242 year:2002 before:2019-01-15 private:true"
expectedAll := "q:\"foo BAR\" lat:1.500000 lng:-10.333330 chroma:1 diff:424242 year:2002 before:2019-01-15 private:true count:100 order:name"
expected := "q:\"foo BAR\" name:\"yo/ba:z.JPG\" lat:1.500000 lng:-10.333330 chroma:1 diff:424242 year:2002 before:2019-01-15 private:true"
expectedAll := "q:\"foo BAR\" name:\"yo/ba:z.JPG\" lat:1.500000 lng:-10.333330 chroma:1 diff:424242 year:2002 before:2019-01-15 private:true count:100 order:name"
t.Run("value", func(t *testing.T) {
result := Serialize(form, false)