fix variable length emoji bug

Author: Brian Strauch

internal/back/back_test.go

@@ -37,7 +37,7 @@ func TestBackCommand(t *testing.T) {
 	api.On("Back").Return(nil)
 
 	status, err := back(api)
-	require.Equal(t, "🎵 Song\n🎤 Artist\n▶️  0:00 [                ] 0:01\n", status)
+	require.Equal(t, "   Song\r🎵\n   Artist\r🎤\n   0:00 [                ] 0:01\r▶️\n", status)
 	require.NoError(t, err)
 }
 

internal/next/next_test.go

@@ -36,7 +36,7 @@ func TestNextCommand(t *testing.T) {
 	api.On("Next").Return(nil)
 
 	status, err := next(api)
-	require.Equal(t, "🎵 Song\n🎤 Artist\n▶️  0:00 [                ] 0:01\n", status)
+	require.Equal(t, "   Song\r🎵\n   Artist\r🎤\n   0:00 [                ] 0:01\r▶️\n", status)
 	require.NoError(t, err)
 }
 

internal/p/p_test.go

@@ -35,7 +35,7 @@ func TestPCommandPlay(t *testing.T) {
 	api.On("Play", "").Return(nil)
 
 	status, err := p(api)
-	require.Equal(t, "🎵 Song\n🎤 Artist\n▶️  0:00 [                ] 0:01\n", status)
+	require.Equal(t, "   Song\r🎵\n   Artist\r🎤\n   0:00 [                ] 0:01\r▶️\n", status)
 	require.NoError(t, err)
 }
 
@@ -64,7 +64,7 @@ func TestPCommandPause(t *testing.T) {
 	api.On("Pause").Return(nil)
 
 	status, err := p(api)
-	require.Equal(t, "🎵 Song\n🎤 Artist\n⏸  0:00 [                ] 0:01\n", status)
+	require.Equal(t, "   Song\r🎵\n   Artist\r🎤\n   0:00 [                ] 0:01\r⏸\n", status)
 	require.NoError(t, err)
 }
 

internal/pause/pause_test.go

@@ -36,7 +36,7 @@ func TestPauseCommand(t *testing.T) {
 	api.On("Pause").Return(nil)
 
 	status, err := Pause(api)
-	require.Equal(t, "🎵 Song\n🎤 Artist\n⏸  0:00 [                ] 0:01\n", status)
+	require.Equal(t, "   Song\r🎵\n   Artist\r🎤\n   0:00 [                ] 0:01\r⏸\n", status)
 	require.NoError(t, err)
 }
 

internal/play/play_test.go

@@ -36,7 +36,7 @@ func TestPlayCommand(t *testing.T) {
 	api.On("Play", "").Return(nil)
 
 	status, err := Play(api, "")
-	require.Equal(t, "🎵 Song\n🎤 Artist\n▶️  0:00 [                ] 0:01\n", status)
+	require.Equal(t, "   Song\r🎵\n   Artist\r🎤\n   0:00 [                ] 0:01\r▶️\n", status)
 	require.NoError(t, err)
 }
 

internal/status/status.go

@@ -46,22 +46,26 @@ func status(api spotify.APIInterface) (string, error) {
 }
 
 func Show(playback *model.Playback) string {
-	status := fmt.Sprintf("🎵 %s\n", playback.Item.Name)
-
+	var artistLine string
 	switch playback.Item.Type {
 	case "track":
-		status += fmt.Sprintf("🎤 %s\n", joinArtists(playback.Item.Artists))
+		artistLine = joinArtists(playback.Item.Artists)
 	case "episode":
-		status += fmt.Sprintf("🎤 %s\n", playback.Item.Show.Name)
+		artistLine = playback.Item.Show.Name
 	}
 
+	var isPlayingEmoji string
 	if playback.IsPlaying {
-		status += "▶️  "
+		isPlayingEmoji = "▶️"
 	} else {
-		status += "⏸  "
+		isPlayingEmoji = "⏸"
 	}
 
-	status += showProgressBar(playback.ProgressMs, playback.Item.DurationMs)
+	progressBar := showProgressBar(playback.ProgressMs, playback.Item.DurationMs)
+
+	status := prefixLineWithEmoji("🎵", playback.Item.Name)
+	status += prefixLineWithEmoji("🎤", artistLine)
+	status += prefixLineWithEmoji(isPlayingEmoji, progressBar)
 
 	return status
 }
@@ -85,7 +89,7 @@ func showProgressBar(progress, duration int) string {
 	for i := bars; i < length; i++ {
 		status += " "
 	}
-	status += fmt.Sprintf("] %s\n", formatTime(duration))
+	status += fmt.Sprintf("] %s", formatTime(duration))
 
 	return status
 }
@@ -94,3 +98,8 @@ func formatTime(ms int) string {
 	s := ms / 1000
 	return fmt.Sprintf("%d:%02d", s/60, s%60)
 }
+
+func prefixLineWithEmoji(emoji, line string) string {
+	// Carriage return jumps to start of line because emojis can have variable widths
+	return fmt.Sprintf("   %s\r%s\n", line, emoji)
+}

internal/status/status_test.go

@@ -28,7 +28,7 @@ func TestStatusCommand(t *testing.T) {
 	api.On("Status").Return(playback, nil)
 
 	status, err := status(api)
-	require.Equal(t, "🎵 Song\n🎤 Artist\n▶️  0:00 [                ] 0:01\n", status)
+	require.Equal(t, "   Song\r🎵\n   Artist\r🎤\n   0:00 [                ] 0:01\r▶️\n", status)
 	require.NoError(t, err)
 }
 
@@ -52,7 +52,7 @@ func TestMultipleArtists(t *testing.T) {
 	api.On("Status").Return(playback, nil)
 
 	status, err := status(api)
-	require.Equal(t, "🎵 Song\n🎤 Artist 1, Artist 2\n▶️  0:00 [                ] 0:01\n", status)
+	require.Equal(t, "   Song\r🎵\n   Artist 1, Artist 2\r🎤\n   0:00 [                ] 0:01\r▶️\n", status)
 	require.NoError(t, err)
 }
 
@@ -75,7 +75,7 @@ func TestPodcast(t *testing.T) {
 	api.On("Status").Return(playback, nil)
 
 	status, err := status(api)
-	require.Equal(t, "🎵 Episode\n🎤 Podcast\n▶️  0:00 [                ] 0:01\n", status)
+	require.Equal(t, "   Episode\r🎵\n   Podcast\r🎤\n   0:00 [                ] 0:01\r▶️\n", status)
 	require.NoError(t, err)
 }
 

main.go

@@ -31,7 +31,7 @@ func main() {
 	root := &cobra.Command{
 		Use:               "spotify",
 		Short:             "Spotify for the terminal 🎵",
-		Version:           "1.5.1",
+		Version:           "1.5.2",
 		PersistentPreRunE: promptUpdate,
 	}