Turns out that controls work in bluetooth as well

hilli · Feb 25, 2024 · 84fd21f · 84fd21f
1 parent 0e27b14
commit 84fd21f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 26 deletions.
diff --git a/cmd/kefw2/cmd/next_track.go b/cmd/kefw2/cmd/next_track.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hilli/go-kef-w2/kefw2"
 	"github.com/spf13/cobra"
 )
 
@@ -15,13 +14,13 @@ var nextTrackCmd = &cobra.Command{
 	Long:  `Play next track when on WiFi source`,
 	Args:  cobra.MaximumNArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
-		currentSource, err := currentSpeaker.Source()
+		canControlPlayback, err := currentSpeaker.CanControlPlayback()
 		if err != nil {
-			fmt.Println(err)
+			fmt.Printf("Can't query source: %s\n", err.Error())
 			os.Exit(1)
 		}
-		if currentSource != kefw2.SourceWiFi {
-			fmt.Println("Not on WiFi source, not resuming playback")
+		if !canControlPlayback {
+			fmt.Println("Not on WiFi/BT source.")
 			os.Exit(0)
 		}
 		err = currentSpeaker.NextTrack()

diff --git a/cmd/kefw2/cmd/pause.go b/cmd/kefw2/cmd/pause.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hilli/go-kef-w2/kefw2"
 	"github.com/spf13/cobra"
 )
 
@@ -15,13 +14,13 @@ var pauseCmd = &cobra.Command{
 	Long:  `Pause playback when on WiFi source`,
 	Args:  cobra.MaximumNArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
-		currentSource, err := currentSpeaker.Source()
+		canControlPlayback, err := currentSpeaker.CanControlPlayback()
 		if err != nil {
-			fmt.Println(err)
+			fmt.Printf("Can't query source: %s\n", err.Error())
 			os.Exit(1)
 		}
-		if currentSource != kefw2.SourceWiFi {
-			fmt.Println("Not on WiFi source, not resuming playback")
+		if !canControlPlayback {
+			fmt.Println("Not on WiFi/BT source.")
 			os.Exit(0)
 		}
 		if isPlaying, err := currentSpeaker.IsPlaying(); err != nil {

diff --git a/cmd/kefw2/cmd/play.go b/cmd/kefw2/cmd/play.go
@@ -4,24 +4,23 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hilli/go-kef-w2/kefw2"
 	"github.com/spf13/cobra"
 )
 
 // muteCmd toggles the mute state of the speakers
 var playCmd = &cobra.Command{
 	Use:   "play",
-	Short: "Resume playback when on WiFi source if paused",
-	Long:  `Resume playback when on WiFi source if paused`,
+	Short: "Resume playback when on WiFi/BT source if paused",
+	Long:  `Resume playback when on WiFi/BT source if paused`,
 	Args:  cobra.MaximumNArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
-		currentSource, err := currentSpeaker.Source()
+		canControlPlayback, err := currentSpeaker.CanControlPlayback()
 		if err != nil {
-			fmt.Println(err)
+			fmt.Printf("Can't query source: %s\n", err.Error())
 			os.Exit(1)
 		}
-		if currentSource != kefw2.SourceWiFi {
-			fmt.Println("Not on WiFi source, not resuming playback")
+		if !canControlPlayback {
+			fmt.Println("Not on WiFi/BT source.")
 			os.Exit(0)
 		}
 		err = currentSpeaker.PlayPause()

diff --git a/cmd/kefw2/cmd/prevous_track.go b/cmd/kefw2/cmd/prevous_track.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hilli/go-kef-w2/kefw2"
 	"github.com/spf13/cobra"
 )
 
@@ -16,13 +15,13 @@ var previousTrackCmd = &cobra.Command{
 	Long:    `Play previous track when on WiFi source`,
 	Args:    cobra.MaximumNArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
-		currentSource, err := currentSpeaker.Source()
+		canControlPlayback, err := currentSpeaker.CanControlPlayback()
 		if err != nil {
-			fmt.Println(err)
+			fmt.Printf("Can't query source: %s\n", err.Error())
 			os.Exit(1)
 		}
-		if currentSource != kefw2.SourceWiFi {
-			fmt.Println("Not on WiFi source, not resuming playback")
+		if !canControlPlayback {
+			fmt.Println("Not on WiFi/BT source.")
 			os.Exit(0)
 		}
 		err = currentSpeaker.PreviousTrack()

diff --git a/cmd/kefw2/cmd/status.go b/cmd/kefw2/cmd/status.go
@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/hilli/go-kef-w2/kefw2"
 	"github.com/qeesung/image2ascii/convert"
 	"github.com/spf13/cobra"
 )
@@ -26,8 +25,12 @@ var statusCmd = &cobra.Command{
 			fmt.Println(err)
 			os.Exit(1)
 		}
-
-		if source == kefw2.SourceWiFi {
+		canControlPlayback, err := currentSpeaker.CanControlPlayback()
+		if err != nil {
+			fmt.Printf("Can't query source: %s\n", err.Error())
+			os.Exit(1)
+		}
+		if canControlPlayback {
 			pd, err := currentSpeaker.PlayerData()
 			if err != nil {
 				fmt.Println(err)
@@ -44,7 +47,11 @@ var statusCmd = &cobra.Command{
 					fmt.Println("Artist:", pd.TrackRoles.MediaData.MetaData.Artist)
 					fmt.Println("Album:", pd.TrackRoles.MediaData.MetaData.Album)
 					fmt.Println("Track:", pd.TrackRoles.Title)
-					fmt.Printf("Duration: %s/%s\n", playTime, pd.Status)
+					if pd.Status.Duration == 0 {
+						fmt.Printf("Duration: %s\n", playTime)
+					} else {
+						fmt.Printf("Duration: %s/%s\n", playTime, pd.Status)
+					}
 					// Not so minimalistic output
 					if minimal, _ := cmd.Flags().GetBool("minimal"); !minimal {
 						fmt.Print(imageArt2ASCII(pd.TrackRoles.Icon))