Skip to content

Commit

Permalink
make musicFolderIds ints
Browse files Browse the repository at this point in the history 
#50 (comment)
https://github.com/einsteinx2/iSubMusicStreamer/blob/006c1dafee6b926fde9d775cb0e64011a4662853/Classes/Models/API%20Models/MediaFolder.swift#L16

related #50
  • Loading branch information
@sentriz
sentriz committed Nov 8, 2021
1 parent a59c030 commit 03998be
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 33 deletions.
12 changes: 12 additions & 0 deletions server/ctrlsubsonic/ctrl.go
View file
Expand Up @@ -30,6 +30,7 @@ type Controller struct {
CachePath string
CoverCachePath string
PodcastsPath string
MusicPaths []string
Jukebox *jukebox.Jukebox
Scrobblers []scrobble.Scrobbler
Podcasts *podcasts.Podcasts
Expand Down Expand Up @@ -116,3 +117,14 @@ func (c *Controller) HR(h handlerSubsonicRaw) http.Handler {
}
})
}

func (c *Controller) getMusicFolder(p params.Params) string {
idx, err := p.GetInt("musicFolderId")
if err != nil {
return ""
}
if idx < 0 || idx > len(c.MusicPaths) {
return ""
}
return c.MusicPaths[idx]
}
8 changes: 7 additions & 1 deletion server/ctrlsubsonic/ctrl_test.go
View file
Expand Up @@ -9,6 +9,7 @@ import (
"net/url"
"os"
"path"
"path/filepath"
"regexp"
"strings"
"testing"
Expand Down Expand Up @@ -110,8 +111,13 @@ func makec(t *testing.T, roots []string) (*Controller, *mockfs.MockFS) {
m.ResetDates()
m.LogAlbums()

var absRoots []string
for _, root := range roots {
absRoots = append(absRoots, filepath.Join(m.TmpDir(), root))
}

base := &ctrlbase.Controller{DB: m.DB()}
return &Controller{Controller: base}, m
return &Controller{Controller: base, MusicPaths: absRoots}, m
}

func TestMain(m *testing.M) {
Expand Down
10 changes: 5 additions & 5 deletions server/ctrlsubsonic/handlers_by_folder.go
View file
Expand Up @@ -24,7 +24,7 @@ func (c *Controller) ServeGetIndexes(r *http.Request) *spec.Response {
Select("id").
Model(&db.Album{}).
Where("parent_id IS NULL")
if m, _ := params.Get("musicFolderId"); m != "" {
if m := c.getMusicFolder(params); m != "" {
rootQ = rootQ.
Where("root_dir=?", m)
}
Expand Down Expand Up @@ -145,7 +145,7 @@ func (c *Controller) ServeGetAlbumList(r *http.Request) *spec.Response {
return spec.NewError(10, "unknown value `%s` for parameter 'type'", v)
}

if m, _ := params.Get("musicFolderId"); m != "" {
if m := c.getMusicFolder(params); m != "" {
q = q.Where("root_dir=?", m)
}
var folders []*db.Album
Expand Down Expand Up @@ -185,7 +185,7 @@ func (c *Controller) ServeSearchTwo(r *http.Request) *spec.Response {
Select("id").
Model(&db.Album{}).
Where("parent_id IS NULL")
if m, _ := params.Get("musicFolderId"); m != "" {
if m := c.getMusicFolder(params); m != "" {
rootQ = rootQ.Where("root_dir=?", m)
}

Expand All @@ -207,7 +207,7 @@ func (c *Controller) ServeSearchTwo(r *http.Request) *spec.Response {
Where(`tag_artist_id IS NOT NULL AND (right_path LIKE ? OR right_path_u_dec LIKE ?)`, query, query).
Offset(params.GetOrInt("albumOffset", 0)).
Limit(params.GetOrInt("albumCount", 20))
if m, _ := params.Get("musicFolderId"); m != "" {
if m := c.getMusicFolder(params); m != "" {
q = q.Where("root_dir=?", m)
}
if err := q.Find(&albums).Error; err != nil {
Expand All @@ -224,7 +224,7 @@ func (c *Controller) ServeSearchTwo(r *http.Request) *spec.Response {
Where("filename LIKE ? OR filename_u_dec LIKE ?", query, query).
Offset(params.GetOrInt("songOffset", 0)).
Limit(params.GetOrInt("songCount", 20))
if m, _ := params.Get("musicFolderId"); m != "" {
if m := c.getMusicFolder(params); m != "" {
q = q.
Joins("JOIN albums ON albums.id=tracks.album_id").
Where("albums.root_dir=?", m)
Expand Down
5 changes: 2 additions & 3 deletions server/ctrlsubsonic/handlers_by_folder_test.go
View file
Expand Up @@ -2,7 +2,6 @@ package ctrlsubsonic

import (
"net/url"
"path/filepath"
"testing"

_ "github.com/jinzhu/gorm/dialects/sqlite"
Expand All @@ -14,8 +13,8 @@ func TestGetIndexes(t *testing.T) {

runQueryCases(t, contr, contr.ServeGetIndexes, []*queryCase{
{url.Values{}, "no_args", false},
{url.Values{"musicFolderId": {filepath.Join(m.TmpDir(), "m-0")}}, "with_music_folder_1", false},
{url.Values{"musicFolderId": {filepath.Join(m.TmpDir(), "m-1")}}, "with_music_folder_2", false},
{url.Values{"musicFolderId": {"0"}}, "with_music_folder_1", false},
{url.Values{"musicFolderId": {"1"}}, "with_music_folder_2", false},
})
}

Expand Down
12 changes: 6 additions & 6 deletions server/ctrlsubsonic/handlers_by_tags.go
View file
Expand Up @@ -23,7 +23,7 @@ func (c *Controller) ServeGetArtists(r *http.Request) *spec.Response {
Joins("LEFT JOIN albums sub ON artists.id=sub.tag_artist_id").
Group("artists.id").
Order("artists.name COLLATE NOCASE")
if m, _ := params.Get("musicFolderId"); m != "" {
if m := c.getMusicFolder(params); m != "" {
q = q.Where("sub.root_dir=?", m)
}
if err := q.Find(&artists).Error; err != nil {
Expand Down Expand Up @@ -148,7 +148,7 @@ func (c *Controller) ServeGetAlbumListTwo(r *http.Request) *spec.Response {
default:
return spec.NewError(10, "unknown value `%s` for parameter 'type'", listType)
}
if m, _ := params.Get("musicFolderId"); m != "" {
if m := c.getMusicFolder(params); m != "" {
q = q.Where("root_dir=?", m)
}
var albums []*db.Album
Expand Down Expand Up @@ -188,7 +188,7 @@ func (c *Controller) ServeSearchThree(r *http.Request) *spec.Response {
Where("name LIKE ? OR name_u_dec LIKE ?", query, query).
Offset(params.GetOrInt("artistOffset", 0)).
Limit(params.GetOrInt("artistCount", 20))
if m, _ := params.Get("musicFolderId"); m != "" {
if m := c.getMusicFolder(params); m != "" {
q = q.
Joins("JOIN albums ON albums.tag_artist_id=artists.id").
Where("albums.root_dir=?", m)
Expand All @@ -207,7 +207,7 @@ func (c *Controller) ServeSearchThree(r *http.Request) *spec.Response {
Where("tag_title LIKE ? OR tag_title_u_dec LIKE ?", query, query).
Offset(params.GetOrInt("albumOffset", 0)).
Limit(params.GetOrInt("albumCount", 20))
if m, _ := params.Get("musicFolderId"); m != "" {
if m := c.getMusicFolder(params); m != "" {
q = q.Where("root_dir=?", m)
}
if err := q.Find(&albums).Error; err != nil {
Expand All @@ -224,7 +224,7 @@ func (c *Controller) ServeSearchThree(r *http.Request) *spec.Response {
Where("tag_title LIKE ? OR tag_title_u_dec LIKE ?", query, query).
Offset(params.GetOrInt("songOffset", 0)).
Limit(params.GetOrInt("songCount", 20))
if m, _ := params.Get("musicFolderId"); m != "" {
if m := c.getMusicFolder(params); m != "" {
q = q.
Joins("JOIN albums ON albums.id=tracks.album_id").
Where("albums.root_dir=?", m)
Expand Down Expand Up @@ -344,7 +344,7 @@ func (c *Controller) ServeGetSongsByGenre(r *http.Request) *spec.Response {
Preload("Album").
Offset(params.GetOrInt("offset", 0)).
Limit(params.GetOrInt("count", 10))
if m, _ := params.Get("musicFolderId"); m != "" {
if m := c.getMusicFolder(params); m != "" {
q = q.Where("albums.root_dir=?", m)
}
if err := q.Find(&tracks).Error; err != nil {
Expand Down
5 changes: 2 additions & 3 deletions server/ctrlsubsonic/handlers_by_tags_test.go
View file
Expand Up @@ -2,7 +2,6 @@ package ctrlsubsonic

import (
"net/url"
"path/filepath"
"testing"
)

Expand All @@ -13,8 +12,8 @@ func TestGetArtists(t *testing.T) {

runQueryCases(t, contr, contr.ServeGetArtists, []*queryCase{
{url.Values{}, "no_args", false},
{url.Values{"musicFolderId": {filepath.Join(m.TmpDir(), "m-0")}}, "with_music_folder_1", false},
{url.Values{"musicFolderId": {filepath.Join(m.TmpDir(), "m-1")}}, "with_music_folder_2", false},
{url.Values{"musicFolderId": {"0"}}, "with_music_folder_1", false},
{url.Values{"musicFolderId": {"1"}}, "with_music_folder_2", false},
})
}

Expand Down
18 changes: 4 additions & 14 deletions server/ctrlsubsonic/handlers_common.go
View file
Expand Up @@ -71,21 +71,11 @@ func (c *Controller) ServeScrobble(r *http.Request) *spec.Response {
}

func (c *Controller) ServeGetMusicFolders(r *http.Request) *spec.Response {
var roots []string
err := c.DB.
Model(&db.Album{}).
Pluck("DISTINCT(root_dir)", &roots).
Where("parent_id IS NULL").
Error
if err != nil {
return spec.NewError(0, "error getting roots: %v", err)
}

sub := spec.NewResponse()
sub.MusicFolders = &spec.MusicFolders{}
sub.MusicFolders.List = make([]*spec.MusicFolder, len(roots))
for i, root := range roots {
sub.MusicFolders.List[i] = &spec.MusicFolder{ID: root, Name: filepath.Base(root)}
sub.MusicFolders.List = make([]*spec.MusicFolder, len(c.MusicPaths))
for i, path := range c.MusicPaths {
sub.MusicFolders.List[i] = &spec.MusicFolder{ID: i, Name: filepath.Base(path)}
}
return sub
}
Expand Down Expand Up @@ -226,7 +216,7 @@ func (c *Controller) ServeGetRandomSongs(r *http.Request) *spec.Response {
q = q.Joins("JOIN track_genres ON track_genres.track_id=tracks.id")
q = q.Joins("JOIN genres ON genres.id=track_genres.genre_id AND genres.name=?", genre)
}
if m, _ := params.Get("musicFolderId"); m != "" {
if m := c.getMusicFolder(params); m != "" {
q = q.Where("albums.root_dir=?", m)
}
q.Find(&tracks)
Expand Down
2 changes: 1 addition & 1 deletion server/ctrlsubsonic/spec/spec.go
View file
Expand Up @@ -179,7 +179,7 @@ type MusicFolders struct {
}

type MusicFolder struct {
ID string `xml:"id,attr,omitempty" json:"id,omitempty"`
ID int `xml:"id,attr" json:"id"`
Name string `xml:"name,attr,omitempty" json:"name,omitempty"`
}

Expand Down
1 change: 1 addition & 0 deletions server/server.go
View file
Expand Up @@ -93,6 +93,7 @@ func New(opts Options) (*Server, error) {
CachePath: opts.CachePath,
CoverCachePath: opts.CoverCachePath,
PodcastsPath: opts.PodcastPath,
MusicPaths: opts.MusicPaths,
Jukebox: &jukebox.Jukebox{},
Scrobblers: []scrobble.Scrobbler{&lastfm.Scrobbler{DB: opts.DB}, &listenbrainz.Scrobbler{}},
Podcasts: podcast,
Expand Down

0 comments on commit 03998be

Please sign in to comment.