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

parse incoming ids in handlers

Browse Source
This commit is contained in:
sentriz
2020-05-11 22:44:59 +01:00
committed by Senan Kelly
parent 8a1a9bfcad
commit b8ed413ed3
6 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/ctrlsubsonic/handlers_by_folder.go
View File

@@ -54,17 +54,17 @@ func (c *Controller) ServeGetIndexes(r *http.Request) *spec.Response {
func (c *Controller) ServeGetMusicDirectory(r *http.Request) *spec.Response { func (c *Controller) ServeGetMusicDirectory(r *http.Request) *spec.Response {
params := r.Context().Value(CtxParams).(params.Params) params := r.Context().Value(CtxParams).(params.Params)
id, err := params.GetInt("id") id, err := params.GetID("id")
if err != nil { if err != nil {
return spec.NewError(10, "please provide an `id` parameter") return spec.NewError(10, "please provide an `id` parameter")
} }
childrenObj := []*spec.TrackChild{} childrenObj := []*spec.TrackChild{}
folder := &db.Album{} folder := &db.Album{}
c.DB.First(folder, id) c.DB.First(folder, id.Value)
// ** begin start looking for child childFolders in the current dir // ** begin start looking for child childFolders in the current dir
var childFolders []*db.Album var childFolders []*db.Album
c.DB. c.DB.
Where("parent_id=?", id). Where("parent_id=?", id.Value).
Order("albums.right_path COLLATE NOCASE"). Order("albums.right_path COLLATE NOCASE").
Find(&childFolders) Find(&childFolders)
for _, c := range childFolders { for _, c := range childFolders {
@@ -73,7 +73,7 @@ func (c *Controller) ServeGetMusicDirectory(r *http.Request) *spec.Response {
// ** begin start looking for child childTracks in the current dir // ** begin start looking for child childTracks in the current dir
var childTracks []*db.Track var childTracks []*db.Track
c.DB. c.DB.
Where("album_id=?", id). Where("album_id=?", id.Value).
Preload("Album"). Preload("Album").
Order("filename"). Order("filename").
Find(&childTracks) Find(&childTracks)

4
server/ctrlsubsonic/handlers_by_folder_test.go
View File

@@ -15,8 +15,8 @@ func TestGetIndexes(t *testing.T) {
func TestGetMusicDirectory(t *testing.T) { func TestGetMusicDirectory(t *testing.T) {
runQueryCases(t, testController.ServeGetMusicDirectory, []*queryCase{ runQueryCases(t, testController.ServeGetMusicDirectory, []*queryCase{
{url.Values{"id": {"2"}}, "without_tracks", false}, {url.Values{"id": {"al-2"}}, "without_tracks", false},
{url.Values{"id": {"3"}}, "with_tracks", false}, {url.Values{"id": {"al-3"}}, "with_tracks", false},
}) })
} }

14
server/ctrlsubsonic/handlers_by_tags.go
View File

@@ -48,14 +48,14 @@ func (c *Controller) ServeGetArtists(r *http.Request) *spec.Response {
func (c *Controller) ServeGetArtist(r *http.Request) *spec.Response { func (c *Controller) ServeGetArtist(r *http.Request) *spec.Response {
params := r.Context().Value(CtxParams).(params.Params) params := r.Context().Value(CtxParams).(params.Params)
id, err := params.GetInt("id") id, err := params.GetID("id")
if err != nil { if err != nil {
return spec.NewError(10, "please provide an `id` parameter") return spec.NewError(10, "please provide an `id` parameter")
} }
artist := &db.Artist{} artist := &db.Artist{}
c.DB. c.DB.
Preload("Albums"). Preload("Albums").
First(artist, id) First(artist, id.Value)
sub := spec.NewResponse() sub := spec.NewResponse()
sub.Artist = spec.NewArtistByTags(artist) sub.Artist = spec.NewArtistByTags(artist)
sub.Artist.Albums = make([]*spec.Album, len(artist.Albums)) sub.Artist.Albums = make([]*spec.Album, len(artist.Albums))
@@ -68,7 +68,7 @@ func (c *Controller) ServeGetArtist(r *http.Request) *spec.Response {
func (c *Controller) ServeGetAlbum(r *http.Request) *spec.Response { func (c *Controller) ServeGetAlbum(r *http.Request) *spec.Response {
params := r.Context().Value(CtxParams).(params.Params) params := r.Context().Value(CtxParams).(params.Params)
id, err := params.GetInt("id") id, err := params.GetID("id")
if err != nil { if err != nil {
return spec.NewError(10, "please provide an `id` parameter") return spec.NewError(10, "please provide an `id` parameter")
} }
@@ -79,7 +79,7 @@ func (c *Controller) ServeGetAlbum(r *http.Request) *spec.Response {
Preload("Tracks", func(db *gorm.DB) *gorm.DB { Preload("Tracks", func(db *gorm.DB) *gorm.DB {
return db.Order("tracks.tag_disc_number, tracks.tag_track_number") return db.Order("tracks.tag_disc_number, tracks.tag_track_number")
}). }).
First(album, id). First(album, id.Value).
Error Error
if gorm.IsRecordNotFoundError(err) { if gorm.IsRecordNotFoundError(err) {
return spec.NewError(10, "couldn't find an album with that id") return spec.NewError(10, "couldn't find an album with that id")
@@ -211,7 +211,7 @@ func (c *Controller) ServeSearchThree(r *http.Request) *spec.Response {
func (c *Controller) ServeGetArtistInfoTwo(r *http.Request) *spec.Response { func (c *Controller) ServeGetArtistInfoTwo(r *http.Request) *spec.Response {
params := r.Context().Value(CtxParams).(params.Params) params := r.Context().Value(CtxParams).(params.Params)
id, err := params.GetInt("id") id, err := params.GetID("id")
if err != nil { if err != nil {
return spec.NewError(10, "please provide an `id` parameter") return spec.NewError(10, "please provide an `id` parameter")
} }
@@ -221,11 +221,11 @@ func (c *Controller) ServeGetArtistInfoTwo(r *http.Request) *spec.Response {
} }
artist := &db.Artist{} artist := &db.Artist{}
err = c.DB. err = c.DB.
Where("id=?", id). Where("id=?", id.Value).
Find(artist). Find(artist).
Error Error
if gorm.IsRecordNotFoundError(err) { if gorm.IsRecordNotFoundError(err) {
return spec.NewError(70, "artist with id `%d` not found", id) return spec.NewError(70, "artist with id `%s` not found", id)
} }
info, err := lastfm.ArtistGetInfo(apiKey, artist) info, err := lastfm.ArtistGetInfo(apiKey, artist)
if err != nil { if err != nil {

10
server/ctrlsubsonic/handlers_by_tags_test.go
View File

@@ -13,16 +13,16 @@ func TestGetArtists(t *testing.T) {
func TestGetArtist(t *testing.T) { func TestGetArtist(t *testing.T) {
runQueryCases(t, testController.ServeGetArtist, []*queryCase{ runQueryCases(t, testController.ServeGetArtist, []*queryCase{
{url.Values{"id": {"1"}}, "id_one", false}, {url.Values{"id": {"ar-1"}}, "id_one", false},
{url.Values{"id": {"2"}}, "id_two", false}, {url.Values{"id": {"ar-2"}}, "id_two", false},
{url.Values{"id": {"3"}}, "id_three", false}, {url.Values{"id": {"ar-3"}}, "id_three", false},
}) })
} }
func TestGetAlbum(t *testing.T) { func TestGetAlbum(t *testing.T) {
runQueryCases(t, testController.ServeGetAlbum, []*queryCase{ runQueryCases(t, testController.ServeGetAlbum, []*queryCase{
{url.Values{"id": {"2"}}, "without_cover", false}, {url.Values{"id": {"al-2"}}, "without_cover", false},
{url.Values{"id": {"3"}}, "with_cover", false}, {url.Values{"id": {"al-3"}}, "with_cover", false},
}) })
} }

18
server/ctrlsubsonic/handlers_common.go
View File

@@ -38,7 +38,7 @@ func (c *Controller) ServePing(r *http.Request) *spec.Response {
func (c *Controller) ServeScrobble(r *http.Request) *spec.Response { func (c *Controller) ServeScrobble(r *http.Request) *spec.Response {
params := r.Context().Value(CtxParams).(params.Params) params := r.Context().Value(CtxParams).(params.Params)
id, err := params.GetInt("id") id, err := params.GetID("id")
if err != nil { if err != nil {
return spec.NewError(10, "please provide an `id` parameter") return spec.NewError(10, "please provide an `id` parameter")
} }
@@ -52,7 +52,7 @@ func (c *Controller) ServeScrobble(r *http.Request) *spec.Response {
c.DB. c.DB.
Preload("Album"). Preload("Album").
Preload("Artist"). Preload("Artist").
First(track, id) First(track, id.Value)
// scrobble with above info // scrobble with above info
opts := lastfm.ScrobbleOptions{ opts := lastfm.ScrobbleOptions{
Track: track, Track: track,
@@ -251,30 +251,34 @@ func (c *Controller) ServeGetPlayQueue(r *http.Request) *spec.Response {
func (c *Controller) ServeSavePlayQueue(r *http.Request) *spec.Response { func (c *Controller) ServeSavePlayQueue(r *http.Request) *spec.Response {
params := r.Context().Value(CtxParams).(params.Params) params := r.Context().Value(CtxParams).(params.Params)
tracks, err := params.GetIntList("id") tracks, err := params.GetIDList("id")
if err != nil { if err != nil {
return spec.NewError(10, "please provide some `id` parameters") return spec.NewError(10, "please provide some `id` parameters")
} }
trackIDs := make([]int, 0, len(tracks))
for _, id := range tracks {
trackIDs = append(trackIDs, id.Value)
}
user := r.Context().Value(CtxUser).(*db.User) user := r.Context().Value(CtxUser).(*db.User)
queue := &db.PlayQueue{UserID: user.ID} queue := &db.PlayQueue{UserID: user.ID}
c.DB.Where(queue).First(queue) c.DB.Where(queue).First(queue)
queue.Current = params.GetOrInt("current", 0) queue.Current = params.GetOrInt("current", 0)
queue.Position = params.GetOrInt("position", 0) queue.Position = params.GetOrInt("position", 0)
queue.ChangedBy = params.GetOr("c", "") // must exist, middleware checks queue.ChangedBy = params.GetOr("c", "") // must exist, middleware checks
queue.SetItems(tracks) queue.SetItems(trackIDs)
c.DB.Save(queue) c.DB.Save(queue)
return spec.NewResponse() return spec.NewResponse()
} }
func (c *Controller) ServeGetSong(r *http.Request) *spec.Response { func (c *Controller) ServeGetSong(r *http.Request) *spec.Response {
params := r.Context().Value(CtxParams).(params.Params) params := r.Context().Value(CtxParams).(params.Params)
id, err := params.GetInt("id") id, err := params.GetID("id")
if err != nil { if err != nil {
return spec.NewError(10, "provide an `id` parameter") return spec.NewError(10, "provide an `id` parameter")
} }
track := &db.Track{} track := &db.Track{}
err = c.DB. err = c.DB.
Where("id=?", id). Where("id=?", id.Value).
Preload("Album"). Preload("Album").
First(track). First(track).
Error Error
@@ -326,7 +330,7 @@ func (c *Controller) ServeJukebox(r *http.Request) *spec.Response {
} }
for _, id := range ids { for _, id := range ids {
track := &db.Track{} track := &db.Track{}
c.DB.Preload("Album").First(track, id) c.DB.Preload("Album").First(track, id.Value)
if track.ID != 0 { if track.ID != 0 {
tracks = append(tracks, track) tracks = append(tracks, track)
} }

18
server/ctrlsubsonic/handlers_raw.go
View File

@@ -55,14 +55,14 @@ func streamUpdateStats(dbc *db.DB, userID, albumID int) {
func (c *Controller) ServeGetCoverArt(w http.ResponseWriter, r *http.Request) *spec.Response { func (c *Controller) ServeGetCoverArt(w http.ResponseWriter, r *http.Request) *spec.Response {
params := r.Context().Value(CtxParams).(params.Params) params := r.Context().Value(CtxParams).(params.Params)
id, err := params.GetInt("id") id, err := params.GetID("id")
if err != nil { if err != nil {
return spec.NewError(10, "please provide an `id` parameter") return spec.NewError(10, "please provide an `id` parameter")
} }
folder := &db.Album{} folder := &db.Album{}
err = c.DB. err = c.DB.
Select("id, left_path, right_path, cover"). Select("id, left_path, right_path, cover").
First(folder, id). First(folder, id.Value).
Error Error
if gorm.IsRecordNotFoundError(err) { if gorm.IsRecordNotFoundError(err) {
return spec.NewError(10, "could not find a cover with that id") return spec.NewError(10, "could not find a cover with that id")
@@ -86,13 +86,13 @@ func (c *Controller) ServeStream(w http.ResponseWriter, r *http.Request) *spec.R
if err != nil { if err != nil {
return spec.NewError(10, "please provide an `id` parameter") return spec.NewError(10, "please provide an `id` parameter")
} }
track, err := streamGetTrack(c.DB, id) track, err := streamGetTrack(c.DB, id.Value)
if err != nil { if err != nil {
return spec.NewError(70, "media with id `%d` was not found", id) return spec.NewError(70, "media with id `%d` was not found", id.Value)
} }
user := r.Context().Value(CtxUser).(*db.User) user := r.Context().Value(CtxUser).(*db.User)
defer streamUpdateStats(c.DB, user.ID, track.Album.ID) defer streamUpdateStats(c.DB, user.ID, track.Album.ID)
pref := streamGetTransPref(c.DB, user.ID, params.Get("c")) pref := streamGetTransPref(c.DB, user.ID, params.GetOr("c", ""))
trackPath := path.Join(c.MusicPath, track.RelPath()) trackPath := path.Join(c.MusicPath, track.RelPath())
// //
onInvalidProfile := func() error { onInvalidProfile := func() error {
@@ -116,7 +116,7 @@ func (c *Controller) ServeStream(w http.ResponseWriter, r *http.Request) *spec.R
TrackPath: trackPath, TrackPath: trackPath,
CachePath: c.CachePath, CachePath: c.CachePath,
ProfileName: pref.Profile, ProfileName: pref.Profile,
PreferredBitrate: params.GetIntOr("maxBitRate", 0), PreferredBitrate: params.GetOrInt("maxBitRate", 0),
OnInvalidProfile: onInvalidProfile, OnInvalidProfile: onInvalidProfile,
OnCacheHit: onCacheHit, OnCacheHit: onCacheHit,
OnCacheMiss: onCacheMiss, OnCacheMiss: onCacheMiss,
@@ -129,13 +129,13 @@ func (c *Controller) ServeStream(w http.ResponseWriter, r *http.Request) *spec.R
func (c *Controller) ServeDownload(w http.ResponseWriter, r *http.Request) *spec.Response { func (c *Controller) ServeDownload(w http.ResponseWriter, r *http.Request) *spec.Response {
params := r.Context().Value(CtxParams).(params.Params) params := r.Context().Value(CtxParams).(params.Params)
id, err := params.GetInt("id") id, err := params.GetID("id")
if err != nil { if err != nil {
return spec.NewError(10, "please provide an `id` parameter") return spec.NewError(10, "please provide an `id` parameter")
} }
track, err := streamGetTrack(c.DB, id) track, err := streamGetTrack(c.DB, id.Value)
if err != nil { if err != nil {
return spec.NewError(70, "media with id `%d` was not found", id) return spec.NewError(70, "media with id `%s` was not found", id)
} }
log.Printf("serving raw %q\n", track.Filename) log.Printf("serving raw %q\n", track.Filename)
w.Header().Set("Content-Type", track.MIME()) w.Header().Set("Content-Type", track.MIME())