heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

search normal and unidecoded cols when searching

Browse Source
This commit is contained in:
sentriz
2019-06-27 15:54:06 +01:00
parent dea0a5cfab
commit f69b24ca79
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/handler/handler_sub_by_folder.go
View File

@@ -166,7 +166,8 @@ func (c *Controller) SearchTwo(w http.ResponseWriter, r *http.Request) {
// search "artists" // search "artists"
var artists []*model.Album var artists []*model.Album
c.DB. c.DB.
Where("parent_id = 1 AND right_path_u_dec LIKE ?", query). Where("parent_id = 1 "+
"AND (right_path || right_path_u_dec) LIKE ?", query).
Offset(getIntParamOr(r, "artistOffset", 0)). Offset(getIntParamOr(r, "artistOffset", 0)).
Limit(getIntParamOr(r, "artistCount", 20)). Limit(getIntParamOr(r, "artistCount", 20)).
Find(&artists) Find(&artists)
@@ -178,7 +179,8 @@ func (c *Controller) SearchTwo(w http.ResponseWriter, r *http.Request) {
// search "albums" // search "albums"
var albums []*model.Album var albums []*model.Album
c.DB. c.DB.
Where("tag_artist_id IS NOT NULL AND right_path_u_dec LIKE ?", query). Where("tag_artist_id IS NOT NULL "+
"AND (right_path || right_path_u_dec) LIKE ?", query).
Offset(getIntParamOr(r, "albumOffset", 0)). Offset(getIntParamOr(r, "albumOffset", 0)).
Limit(getIntParamOr(r, "albumCount", 20)). Limit(getIntParamOr(r, "albumCount", 20)).
Find(&albums) Find(&albums)
@@ -190,7 +192,7 @@ func (c *Controller) SearchTwo(w http.ResponseWriter, r *http.Request) {
var tracks []*model.Track var tracks []*model.Track
c.DB. c.DB.
Preload("Album"). Preload("Album").
Where("filename_u_dec LIKE ?", query). Where("(filename || filename_u_dec) LIKE ?", query).
Offset(getIntParamOr(r, "songOffset", 0)). Offset(getIntParamOr(r, "songOffset", 0)).
Limit(getIntParamOr(r, "songCount", 20)). Limit(getIntParamOr(r, "songCount", 20)).
Find(&tracks) Find(&tracks)

6
server/handler/handler_sub_by_tags.go
View File

@@ -167,7 +167,7 @@ func (c *Controller) SearchThree(w http.ResponseWriter, r *http.Request) {
// search "artists" // search "artists"
var artists []*model.Artist var artists []*model.Artist
c.DB. c.DB.
Where("name_u_dec LIKE ?", query). Where("(name || name_u_dec) LIKE ?", query).
Offset(getIntParamOr(r, "artistOffset", 0)). Offset(getIntParamOr(r, "artistOffset", 0)).
Limit(getIntParamOr(r, "artistCount", 20)). Limit(getIntParamOr(r, "artistCount", 20)).
Find(&artists) Find(&artists)
@@ -180,7 +180,7 @@ func (c *Controller) SearchThree(w http.ResponseWriter, r *http.Request) {
var albums []*model.Album var albums []*model.Album
c.DB. c.DB.
Preload("TagArtist"). Preload("TagArtist").
Where("tag_title_u_dec LIKE ?", query). Where("(tag_title || tag_title_u_dec) LIKE ?", query).
Offset(getIntParamOr(r, "albumOffset", 0)). Offset(getIntParamOr(r, "albumOffset", 0)).
Limit(getIntParamOr(r, "albumCount", 20)). Limit(getIntParamOr(r, "albumCount", 20)).
Find(&albums) Find(&albums)
@@ -193,7 +193,7 @@ func (c *Controller) SearchThree(w http.ResponseWriter, r *http.Request) {
var tracks []*model.Track var tracks []*model.Track
c.DB. c.DB.
Preload("Album"). Preload("Album").
Where("tag_title_u_dec LIKE ?", query). Where("(tag_title || tag_title_u_dec) LIKE ?", query).
Offset(getIntParamOr(r, "songOffset", 0)). Offset(getIntParamOr(r, "songOffset", 0)).
Limit(getIntParamOr(r, "songCount", 20)). Limit(getIntParamOr(r, "songCount", 20)).
Find(&tracks) Find(&tracks)