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

Search: Strip file path and extension when filtering by name

Browse Source
This commit is contained in:
Michael Mayer 2021-10-01 17:26:29 +02:00
parent 74233809b9
commit 39dc5cb777
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/search/like.go
View File

@ -249,7 +249,7 @@ func OrLike(col, s string) (where string, values []interface{}) {
values = make([]interface{}, len(terms))
for i := range terms {
values[i] = terms[i]
values[i] = strings.TrimSpace(terms[i])
}
like := fmt.Sprintf("%s LIKE ?", col)

17
internal/search/photos.go
View File

@ -2,15 +2,16 @@ package search
import (
"fmt"
"path"
"strings"
"time"
"github.com/dustin/go-humanize/english"
"github.com/jinzhu/gorm"
"github.com/photoprism/photoprism/internal/entity"
"github.com/photoprism/photoprism/internal/form"
"github.com/photoprism/photoprism/pkg/fs"
"github.com/photoprism/photoprism/pkg/rnd"
"github.com/photoprism/photoprism/pkg/txt"
)
@ -370,13 +371,19 @@ func Photos(f form.PhotoSearch) (results PhotoResults, count int, err error) {
}
}
// Filter by main file name.
// Filter by primary file name without path and extension.
if f.Name != "" {
where, values := OrLike("photos.photo_name", f.Name)
s = s.Where(where, values...)
where, names := OrLike("photos.photo_name", f.Name)
// Omit file path and known extensions.
for i := range names {
names[i] = fs.StripKnownExt(path.Base(names[i].(string)))
}
s = s.Where(where, names...)
}
// Filter by actual file name.
// Filter by complete file names.
if f.Filename != "" {
where, values := OrLike("files.file_name", f.Filename)
s = s.Where(where, values...)

15
internal/search/photos_geo.go
View File

@ -2,15 +2,16 @@ package search
import (
"fmt"
"path"
"strings"
"time"
"github.com/dustin/go-humanize/english"
"github.com/jinzhu/gorm"
"github.com/photoprism/photoprism/internal/entity"
"github.com/photoprism/photoprism/internal/form"
"github.com/photoprism/photoprism/pkg/fs"
"github.com/photoprism/photoprism/pkg/pluscode"
"github.com/photoprism/photoprism/pkg/rnd"
"github.com/photoprism/photoprism/pkg/s2"
@ -225,10 +226,16 @@ func PhotosGeo(f form.PhotoSearchGeo) (results GeoResults, err error) {
}
}
// Filter by main file name.
// Filter by primary file name without path and extension.
if f.Name != "" {
where, values := OrLike("photos.photo_name", f.Name)
s = s.Where(where, values...)
where, names := OrLike("photos.photo_name", f.Name)
// Omit file path and known extensions.
for i := range names {
names[i] = fs.StripKnownExt(path.Base(names[i].(string)))
}
s = s.Where(where, names...)
}
// Filter by photo title.