cccb/sanic
cccb/sanic
11
1
Fork 0
Code Issues 5 Pull requests Projects 1 Releases Packages Activity

gui functions nearly done

Browse source
This commit is contained in:
XenGi 2023-12-30 15:02:13 +01:00
parent 114d6ba4da
commit f65918db8b
Signed by: xengi
SSH key fingerprint: SHA256:FGp51kRvGOcWnTHiOI39ImwVO4A3fpvR30nPX3LpV7g
6 changed files with 297 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

24
server.go
View file

@ -107,7 +107,12 @@ func wsServe(c echo.Context) error {
// Connect to MPD server
mpdConn, err := mpd.Dial("tcp", "localhost:6600")
if err != nil {
log.Fatalln(err)
//log.Fatalln(err)
c.Logger().Error(err)
err = websocket.Message.Send(ws, fmt.Sprintf("{\"mpd_error\":\"%s\"}", err.Error()))
if err != nil {
c.Logger().Error(err)
}
}
defer mpdConn.Close()
@ -121,16 +126,23 @@ func wsServe(c echo.Context) error {
} else {
log.Println(msg)
if strings.ToLower(msg) == "#status" {
// TODO: Get current MPD status and return it
status, err := mpdConn.Status()
if err != nil {
log.Fatalln(err)
c.Logger().Error(err)
}
jsonData, err := json.Marshal(status)
currentsong, err := mpdConn.CurrentSong()
if err != nil {
log.Fatalln(err)
c.Logger().Error(err)
}
err = websocket.Message.Send(ws, fmt.Sprintf("{\"mpd_status\":%s}", string(jsonData)))
jsonStatus, err := json.Marshal(status)
if err != nil {
c.Logger().Error(err)
}
jsonCurrentSong, err := json.Marshal(currentsong)
if err != nil {
c.Logger().Error(err)
}
err = websocket.Message.Send(ws, fmt.Sprintf("{\"mpd_status\":%s,\"mpd_current_song\":%s}", string(jsonStatus), string(jsonCurrentSong)))
if err != nil {
c.Logger().Error(err)
}