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

Search: Limit result file types when sorting by similarity #2040

Browse source 
This also attempts to improve the (undocumented) randomly sorted
search results.

Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2023-10-06 02:57:07 +02:00
parent 9b3efe6872
commit c78d12b56d
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
internal/search/photos.go
View file

@ -16,6 +16,7 @@ import (
"github.com/photoprism/photoprism/pkg/clean"
"github.com/photoprism/photoprism/pkg/fs"
"github.com/photoprism/photoprism/pkg/geo"
"github.com/photoprism/photoprism/pkg/media"
"github.com/photoprism/photoprism/pkg/pluscode"
"github.com/photoprism/photoprism/pkg/rnd"
"github.com/photoprism/photoprism/pkg/s2"
@ -209,6 +210,10 @@ func searchPhotos(f form.SearchPhotos, sess *entity.Session, resultCols string)
// Find primary files only?
if f.Primary {
s = s.Where("files.file_primary = 1")
} else if f.Order == sortby.Similar {
s = s.Where("files.file_primary = 1 OR files.media_type = ?", media.Video)
} else if f.Order == sortby.Random {
s = s.Where("files.file_primary = 1 AND photos.photo_type NOT IN ('live','video') OR photos.photo_type IN ('live','video') AND files.media_type IN ('live','video')")
} else {
// Otherwise, find all matching media except sidecar files.
s = s.Where("files.file_sidecar = 0")