Arav/dwelling-radio
1
0
Fork 0
Code Releases 25 Activity

In Status handler: added missing Content-Type; Added most listened song; Removed with-list query, just return everything; Added http.Error().

Browse Source
This commit is contained in:
Alexander Andreev 2023-10-02 02:22:14 +04:00
parent 1b38c5d86c
commit 8322d2a7a8
Signed by: Arav
GPG Key ID: D22A817D95815393
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
internal/http/dj_handlers.go
View File

@ -94,18 +94,21 @@ func (dj *DJHandlers) Songs(w http.ResponseWriter, r *http.Request) {
} }
func (dj *DJHandlers) Status(w http.ResponseWriter, r *http.Request) { func (dj *DJHandlers) Status(w http.ResponseWriter, r *http.Request) {
withList := r.URL.Query().Has("with-list") w.Header().Add("Content-Type", "application/json")
if withList { err := json.NewEncoder(w).Encode(&struct {
err := json.NewEncoder(w).Encode(&struct { Current *radio.Song_ `json:"current_song,omitempty"`
Current *radio.Song_ `json:"current_song,omitempty"` Listeners *radio.ListenerCounter `json:"listeners"`
Listeners *radio.ListenerCounter `json:"listeners"` List []radio.Song_ `json:"last_songs,omitempty"`
List []radio.Song_ `json:"last_songs,omitempty"` Mls *radio.MostListenedSong `json:"most_listened_song,omitempty"`
}{ }{
Current: songList.Current(), Current: songList.Current(),
Listeners: dj.listeners, Listeners: dj.listeners,
List: songList.List()}) List: songList.List(),
if err != nil { Mls: radio.MostListened()})
log.Println("DJHandlers.Status-withList:", err) if err != nil {
} log.Println("DJHandlers.Status:", err)
http.Error(w, "status parsing failed", http.StatusInternalServerError)
}
}
} }
} }