From 8648afeebf08ccbe2fe75900b7bf7c90d64e0ae9 Mon Sep 17 00:00:00 2001 From: Arsen Musayelyan Date: Mon, 23 Aug 2021 10:16:03 -0700 Subject: [PATCH] Improve current music status functions --- pkg/player/playerctl.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkg/player/playerctl.go b/pkg/player/playerctl.go index 130f4a6..35d56a2 100644 --- a/pkg/player/playerctl.go +++ b/pkg/player/playerctl.go @@ -95,13 +95,18 @@ func CurrentMetadata(key string) (string, error) { if err != nil { return "", err } - return string(out), nil + data := string(out) + if data == "No player could handle this command" || data == "" { + data = "Unknown " + strings.Title(key) + } + return data, nil } -func CurrentStatus() (string, error) { +func CurrentStatus() (bool, error) { out, err := exec.Command("playerctl", "status").Output() if err != nil { - return "", err + return false, err } - return string(out), nil + data := string(out) + return data == "Playing", nil }