arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Refactor: NewResponse is more explicit

Browse Source
This commit is contained in:
Deluan
2020-01-11 17:18:20 -05:00
parent 23e080bc15
commit bfac3e3c91
8 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/album_lists.go
+6 -6
View File
@@ -64,7 +64,7 @@ func (c *AlbumListController) GetAlbumList(w http.ResponseWriter, r *http.Reques
return nil, NewError(responses.ErrorGeneric, err.Error()) return nil, NewError(responses.ErrorGeneric, err.Error())
} }
response := NewEmpty() response := NewResponse()
response.AlbumList = &responses.AlbumList{Album: ToChildren(albums)} response.AlbumList = &responses.AlbumList{Album: ToChildren(albums)}
return response, nil return response, nil
} }
@@ -75,7 +75,7 @@ func (c *AlbumListController) GetAlbumList2(w http.ResponseWriter, r *http.Reque
return nil, NewError(responses.ErrorGeneric, err.Error()) return nil, NewError(responses.ErrorGeneric, err.Error())
} }
response := NewEmpty() response := NewResponse()
response.AlbumList2 = &responses.AlbumList{Album: ToAlbums(albums)} response.AlbumList2 = &responses.AlbumList{Album: ToAlbums(albums)}
return response, nil return response, nil
} }
@@ -87,7 +87,7 @@ func (c *AlbumListController) GetStarred(w http.ResponseWriter, r *http.Request)
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }
response := NewEmpty() response := NewResponse()
response.Starred = &responses.Starred{} response.Starred = &responses.Starred{}
response.Starred.Album = ToChildren(albums) response.Starred.Album = ToChildren(albums)
response.Starred.Song = ToChildren(mediaFiles) response.Starred.Song = ToChildren(mediaFiles)
@@ -101,7 +101,7 @@ func (c *AlbumListController) GetStarred2(w http.ResponseWriter, r *http.Request
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }
response := NewEmpty() response := NewResponse()
response.Starred2 = &responses.Starred{} response.Starred2 = &responses.Starred{}
response.Starred2.Album = ToAlbums(albums) response.Starred2.Album = ToAlbums(albums)
response.Starred2.Song = ToChildren(mediaFiles) response.Starred2.Song = ToChildren(mediaFiles)
@@ -115,7 +115,7 @@ func (c *AlbumListController) GetNowPlaying(w http.ResponseWriter, r *http.Reque
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }
response := NewEmpty() response := NewResponse()
response.NowPlaying = &responses.NowPlaying{} response.NowPlaying = &responses.NowPlaying{}
response.NowPlaying.Entry = make([]responses.NowPlayingEntry, len(npInfos)) response.NowPlaying.Entry = make([]responses.NowPlayingEntry, len(npInfos))
for i, entry := range npInfos { for i, entry := range npInfos {
@@ -137,7 +137,7 @@ func (c *AlbumListController) GetRandomSongs(w http.ResponseWriter, r *http.Requ
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }
response := NewEmpty() response := NewResponse()
response.RandomSongs = &responses.Songs{} response.RandomSongs = &responses.Songs{}
response.RandomSongs.Songs = make([]responses.Child, len(songs)) response.RandomSongs.Songs = make([]responses.Child, len(songs))
for i, entry := range songs { for i, entry := range songs {
api/browsing.go
+7 -7
View File
@@ -28,7 +28,7 @@ func (c *BrowsingController) GetMusicFolders(w http.ResponseWriter, r *http.Requ
folders[i].Id = f.ID folders[i].Id = f.ID
folders[i].Name = f.Name folders[i].Name = f.Name
} }
response := NewEmpty() response := NewResponse()
response.MusicFolders = &responses.MusicFolders{Folders: folders} response.MusicFolders = &responses.MusicFolders{Folders: folders}
return response, nil return response, nil
} }
@@ -66,7 +66,7 @@ func (c *BrowsingController) GetIndexes(w http.ResponseWriter, r *http.Request)
return nil, err return nil, err
} }
response := NewEmpty() response := NewResponse()
response.Indexes = res response.Indexes = res
return response, nil return response, nil
} }
@@ -77,7 +77,7 @@ func (c *BrowsingController) GetArtists(w http.ResponseWriter, r *http.Request)
return nil, err return nil, err
} }
response := NewEmpty() response := NewResponse()
response.Artist = res response.Artist = res
return response, nil return response, nil
} }
@@ -94,7 +94,7 @@ func (c *BrowsingController) GetMusicDirectory(w http.ResponseWriter, r *http.Re
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }
response := NewEmpty() response := NewResponse()
response.Directory = c.buildDirectory(dir) response.Directory = c.buildDirectory(dir)
return response, nil return response, nil
} }
@@ -111,7 +111,7 @@ func (c *BrowsingController) GetArtist(w http.ResponseWriter, r *http.Request) (
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }
response := NewEmpty() response := NewResponse()
response.ArtistWithAlbumsID3 = c.buildArtist(dir) response.ArtistWithAlbumsID3 = c.buildArtist(dir)
return response, nil return response, nil
} }
@@ -128,7 +128,7 @@ func (c *BrowsingController) GetAlbum(w http.ResponseWriter, r *http.Request) (*
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }
response := NewEmpty() response := NewResponse()
response.AlbumWithSongsID3 = c.buildAlbum(dir) response.AlbumWithSongsID3 = c.buildAlbum(dir)
return response, nil return response, nil
} }
@@ -145,7 +145,7 @@ func (c *BrowsingController) GetSong(w http.ResponseWriter, r *http.Request) (*r
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }
response := NewEmpty() response := NewResponse()
child := ToChild(*song) child := ToChild(*song)
response.Song = &child response.Song = &child
return response, nil return response, nil
api/helpers.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"github.com/cloudsonic/sonic-server/utils" "github.com/cloudsonic/sonic-server/utils"
) )
func NewEmpty() *responses.Subsonic { func NewResponse() *responses.Subsonic {
return &responses.Subsonic{Status: "ok", Version: Version} return &responses.Subsonic{Status: "ok", Version: Version}
} }
api/media_annotation.go
+4 -4
View File
@@ -44,7 +44,7 @@ func (c *MediaAnnotationController) SetRating(w http.ResponseWriter, r *http.Req
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }
return NewEmpty(), nil return NewResponse(), nil
} }
func (c *MediaAnnotationController) getIds(r *http.Request) ([]string, error) { func (c *MediaAnnotationController) getIds(r *http.Request) ([]string, error) {
@@ -74,7 +74,7 @@ func (c *MediaAnnotationController) Star(w http.ResponseWriter, r *http.Request)
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }
return NewEmpty(), nil return NewResponse(), nil
} }
func (c *MediaAnnotationController) Unstar(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) { func (c *MediaAnnotationController) Unstar(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
@@ -93,7 +93,7 @@ func (c *MediaAnnotationController) Unstar(w http.ResponseWriter, r *http.Reques
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }
return NewEmpty(), nil return NewResponse(), nil
} }
func (c *MediaAnnotationController) Scrobble(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) { func (c *MediaAnnotationController) Scrobble(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
@@ -134,5 +134,5 @@ func (c *MediaAnnotationController) Scrobble(w http.ResponseWriter, r *http.Requ
log.Info(r, "Now Playing", "id", id, "title", mf.Title, "timestamp", t) log.Info(r, "Now Playing", "id", id, "title", mf.Title, "timestamp", t)
} }
} }
return NewEmpty(), nil return NewResponse(), nil
} }
api/playlists.go
+5 -5
View File
@@ -34,7 +34,7 @@ func (c *PlaylistsController) GetPlaylists(w http.ResponseWriter, r *http.Reques
playlists[i].Owner = p.Owner playlists[i].Owner = p.Owner
playlists[i].Public = p.Public playlists[i].Public = p.Public
} }
response := NewEmpty() response := NewResponse()
response.Playlists = &responses.Playlists{Playlist: playlists} response.Playlists = &responses.Playlists{Playlist: playlists}
return response, nil return response, nil
} }
@@ -54,7 +54,7 @@ func (c *PlaylistsController) GetPlaylist(w http.ResponseWriter, r *http.Request
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }
response := NewEmpty() response := NewResponse()
response.Playlist = c.buildPlaylist(pinfo) response.Playlist = c.buildPlaylist(pinfo)
return response, nil return response, nil
} }
@@ -73,7 +73,7 @@ func (c *PlaylistsController) CreatePlaylist(w http.ResponseWriter, r *http.Requ
log.Error(r, err) log.Error(r, err)
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }
return NewEmpty(), nil return NewResponse(), nil
} }
func (c *PlaylistsController) DeletePlaylist(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) { func (c *PlaylistsController) DeletePlaylist(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
@@ -86,7 +86,7 @@ func (c *PlaylistsController) DeletePlaylist(w http.ResponseWriter, r *http.Requ
log.Error(r, err) log.Error(r, err)
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }
return NewEmpty(), nil return NewResponse(), nil
} }
func (c *PlaylistsController) UpdatePlaylist(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) { func (c *PlaylistsController) UpdatePlaylist(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
@@ -115,7 +115,7 @@ func (c *PlaylistsController) UpdatePlaylist(w http.ResponseWriter, r *http.Requ
log.Error(r, err) log.Error(r, err)
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }
return NewEmpty(), nil return NewResponse(), nil
} }
func (c *PlaylistsController) buildPlaylist(d *engine.PlaylistInfo) *responses.PlaylistWithSongs { func (c *PlaylistsController) buildPlaylist(d *engine.PlaylistInfo) *responses.PlaylistWithSongs {
api/searching.go
+2 -2
View File
@@ -68,7 +68,7 @@ func (c *SearchingController) Search2(w http.ResponseWriter, r *http.Request) (*
} }
mfs, als, as := c.searchAll(r, sp) mfs, als, as := c.searchAll(r, sp)
response := NewEmpty() response := NewResponse()
searchResult2 := &responses.SearchResult2{} searchResult2 := &responses.SearchResult2{}
searchResult2.Artist = make([]responses.Artist, len(as)) searchResult2.Artist = make([]responses.Artist, len(as))
for i, e := range as { for i, e := range as {
@@ -87,7 +87,7 @@ func (c *SearchingController) Search3(w http.ResponseWriter, r *http.Request) (*
} }
mfs, als, as := c.searchAll(r, sp) mfs, als, as := c.searchAll(r, sp)
response := NewEmpty() response := NewResponse()
searchResult3 := &responses.SearchResult3{} searchResult3 := &responses.SearchResult3{}
searchResult3.Artist = make([]responses.ArtistID3, len(as)) searchResult3.Artist = make([]responses.ArtistID3, len(as))
for i, e := range as { for i, e := range as {
api/system.go
+2 -2
View File
@@ -13,11 +13,11 @@ func NewSystemController() *SystemController {
} }
func (c *SystemController) Ping(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) { func (c *SystemController) Ping(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
return NewEmpty(), nil return NewResponse(), nil
} }
func (c *SystemController) GetLicense(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) { func (c *SystemController) GetLicense(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
response := NewEmpty() response := NewResponse()
response.License = &responses.License{Valid: true} response.License = &responses.License{Valid: true}
return response, nil return response, nil
} }
api/users.go
+2 -2
View File
@@ -6,7 +6,7 @@ import (
"github.com/cloudsonic/sonic-server/api/responses" "github.com/cloudsonic/sonic-server/api/responses"
) )
type UsersController struct{ } type UsersController struct{}
func NewUsersController() *UsersController { func NewUsersController() *UsersController {
return &UsersController{} return &UsersController{}
@@ -18,7 +18,7 @@ func (c *UsersController) GetUser(w http.ResponseWriter, r *http.Request) (*resp
if err != nil { if err != nil {
return nil, err return nil, err
} }
response := NewEmpty() response := NewResponse()
response.User = &responses.User{} response.User = &responses.User{}
response.User.Username = user response.User.Username = user
response.User.StreamRole = true response.User.StreamRole = true