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

use unidecoded string when searching

Browse Source
This commit is contained in:
sentriz
2019-06-27 15:36:10 +01:00
parent 45c2336731
commit dea0a5cfab
5 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/handler/handler_sub_by_folder.go
View File

@@ -20,7 +20,6 @@ import (
func (c *Controller) GetIndexes(w http.ResponseWriter, r *http.Request) {
var folders []*model.Album
c.DB.
Select("*, count(sub.id) as child_count").
Joins(`
@@ -33,7 +32,7 @@ func (c *Controller) GetIndexes(w http.ResponseWriter, r *http.Request) {
indexMap := make(map[string]*subsonic.Index)
indexes := []*subsonic.Index{}
for _, folder := range folders {
i := indexOf(folder.RightPath[0])
i := indexOf(folder.RightPathUDec[0])
index, ok := indexMap[i]
if !ok {
index = &subsonic.Index{
@@ -167,7 +166,7 @@ func (c *Controller) SearchTwo(w http.ResponseWriter, r *http.Request) {
// search "artists"
var artists []*model.Album
c.DB.
Where("parent_id = 1 AND right_path LIKE ?", query).
Where("parent_id = 1 AND right_path_u_dec LIKE ?", query).
Offset(getIntParamOr(r, "artistOffset", 0)).
Limit(getIntParamOr(r, "artistCount", 20)).
Find(&artists)
@@ -179,7 +178,7 @@ func (c *Controller) SearchTwo(w http.ResponseWriter, r *http.Request) {
// search "albums"
var albums []*model.Album
c.DB.
Where("tag_artist_id IS NOT NULL AND right_path LIKE ?", query).
Where("tag_artist_id IS NOT NULL AND right_path_u_dec LIKE ?", query).
Offset(getIntParamOr(r, "albumOffset", 0)).
Limit(getIntParamOr(r, "albumCount", 20)).
Find(&albums)
@@ -191,7 +190,7 @@ func (c *Controller) SearchTwo(w http.ResponseWriter, r *http.Request) {
var tracks []*model.Track
c.DB.
Preload("Album").
Where("filename LIKE ?", query).
Where("filename_u_dec LIKE ?", query).
Offset(getIntParamOr(r, "songOffset", 0)).
Limit(getIntParamOr(r, "songCount", 20)).
Find(&tracks)

8
server/handler/handler_sub_by_tags.go
View File

@@ -25,7 +25,7 @@ func (c *Controller) GetArtists(w http.ResponseWriter, r *http.Request) {
indexMap := make(map[string]*subsonic.Index)
indexes := &subsonic.Artists{}
for _, artist := range artists {
i := indexOf(artist.Name[0])
i := indexOf(artist.NameUDec[0])
index, ok := indexMap[i]
if !ok {
index = &subsonic.Index{
@@ -167,7 +167,7 @@ func (c *Controller) SearchThree(w http.ResponseWriter, r *http.Request) {
// search "artists"
var artists []*model.Artist
c.DB.
Where("name LIKE ?", query).
Where("name_u_dec LIKE ?", query).
Offset(getIntParamOr(r, "artistOffset", 0)).
Limit(getIntParamOr(r, "artistCount", 20)).
Find(&artists)
@@ -180,7 +180,7 @@ func (c *Controller) SearchThree(w http.ResponseWriter, r *http.Request) {
var albums []*model.Album
c.DB.
Preload("TagArtist").
Where("tag_title LIKE ?", query).
Where("tag_title_u_dec LIKE ?", query).
Offset(getIntParamOr(r, "albumOffset", 0)).
Limit(getIntParamOr(r, "albumCount", 20)).
Find(&albums)
@@ -193,7 +193,7 @@ func (c *Controller) SearchThree(w http.ResponseWriter, r *http.Request) {
var tracks []*model.Track
c.DB.
Preload("Album").
Where("tag_title LIKE ?", query).
Where("tag_title_u_dec LIKE ?", query).
Offset(getIntParamOr(r, "songOffset", 0)).
Limit(getIntParamOr(r, "songCount", 20)).
Find(&tracks)

6
server/handler/handler_sub_common.go
View File

@@ -11,7 +11,6 @@ import (
"unicode"
"github.com/jinzhu/gorm"
"github.com/rainycape/unidecode"
"github.com/sentriz/gonic/model"
"github.com/sentriz/gonic/scanner"
@@ -21,11 +20,10 @@ import (
func indexOf(in byte) string {
lower := strings.ToLower(string(in))
decode := unidecode.Unidecode(lower)
if !unicode.IsLetter(rune(decode[0])) {
if !unicode.IsLetter(rune(lower[0])) {
return "#"
}
return decode
return lower
}
func (c *Controller) Stream(w http.ResponseWriter, r *http.Request) {