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

Since SongList.Current() now return a copy then this code is no longer needed.

Browse Source
This commit is contained in:
Alexander Andreev 2023-10-08 23:55:55 +04:00
parent e63f0aead3
commit f960d8516a
Signed by: Arav
GPG Key ID: D22A817D95815393
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/http/dj_handlers.go
View File

@ -100,18 +100,13 @@ func (dj *DJHandlers) PlaylistNext(w http.ResponseWriter, _ *http.Request) {
func (dj *DJHandlers) Status(w http.ResponseWriter, r *http.Request) { func (dj *DJHandlers) Status(w http.ResponseWriter, r *http.Request) {
w.Header().Add("Content-Type", "application/json") w.Header().Add("Content-Type", "application/json")
var curSong *radio.Song = nil
if dj.songList.Current() != nil {
curSong = &radio.Song{}
*curSong = *dj.songList.Current()
}
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"` Mls *radio.MostListenedSong `json:"most_listened_song,omitempty"`
}{ }{
Current: curSong, Current: dj.songList.Current(),
Listeners: dj.listeners, Listeners: dj.listeners,
List: dj.songList.List(), List: dj.songList.List(),
Mls: dj.mostLSong.Get()}) Mls: dj.mostLSong.Get()})