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

clean up indexings

Browse Source
This commit is contained in:
sentriz
2019-06-27 18:06:33 +01:00
parent c6d4ea5b90
commit 79eeca77ae
6 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/handler/handler_sub_by_folder.go
View File

@@ -32,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.RightPathUDec[0])
i := indexOf(folder.IndexRightPath())
index, ok := indexMap[i]
if !ok {
index = &subsonic.Index{
@@ -168,7 +168,7 @@ func (c *Controller) SearchTwo(w http.ResponseWriter, r *http.Request) {
c.DB.
Where(`
parent_id = 1
AND (right_path LIKE ? AND
AND (right_path LIKE ? OR
right_path_u_dec LIKE ?)
`, query, query).
Offset(getIntParamOr(r, "artistOffset", 0)).
@@ -184,7 +184,7 @@ func (c *Controller) SearchTwo(w http.ResponseWriter, r *http.Request) {
c.DB.
Where(`
tag_artist_id IS NOT NULL
AND (right_path LIKE ? AND
AND (right_path LIKE ? OR
right_path_u_dec LIKE ?)
`, query, query).
Offset(getIntParamOr(r, "albumOffset", 0)).
@@ -199,7 +199,7 @@ func (c *Controller) SearchTwo(w http.ResponseWriter, r *http.Request) {
c.DB.
Preload("Album").
Where(`
filename LIKE ? AND
filename LIKE ? OR
filename_u_dec LIKE ?
`, query, query).
Offset(getIntParamOr(r, "songOffset", 0)).