add keyboard shortcut for copying share string

nimblebun · Feb 17, 2022 · 06cccf8 · 06cccf8
1 parent 08e203d
commit 06cccf8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/common/types.go b/common/types.go
@@ -43,7 +43,7 @@ func (ls LetterState) String() string {
 	case LetterStateContainedMatch:
 		return "🟨"
 	case LetterStateNoMatch:
-		return "⬜"
+		return "🔳" // fix console display in certain fonts
 	default:
 		return ""
 	}

diff --git a/game/blocks.go b/game/blocks.go
@@ -107,7 +107,7 @@ func (m *AppModel) renderStatisticsBlock() string {
 		output = append(output, m.getDistributionProgressBar(maxDistribution, i))
 	}
 
-	output = append(output, "\n\nPress ← to view game summary.\nPress Ctrl+C to exit.")
+	output = append(output, "\n\nPress ← to view game summary.\nPress Ctrl+S to copy the share string.\nPress Ctrl+C to exit.")
 
 	statistics := lipgloss.JoinVertical(lipgloss.Left, output...)
 
@@ -132,7 +132,7 @@ func (m *AppModel) renderFinalMessageBlock() string {
 		message += "Press Ctrl+N to start a new game.\n"
 	}
 
-	message += "Press Ctrl+C to exit."
+	message += "Press Ctrl+S to copy the share string.\nPress Ctrl+C to exit."
 
 	return lipgloss.NewStyle().
 		Padding(1, 2).

diff --git a/game/model.go b/game/model.go
@@ -11,7 +11,6 @@ import (
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"pkg.nimblebun.works/clipboard"
 	"pkg.nimblebun.works/wordle-cli/common"
 	"pkg.nimblebun.works/wordle-cli/common/save"
 )
@@ -84,9 +83,7 @@ func (m *AppModel) View() string {
 	grid := m.renderGrid()
 
 	if m.GameState != common.GameStateRunning {
-		if m.NewGame {
-			_ = clipboard.WriteAll(m.getShareString())
-		}
+		m.copyShareString(true)
 
 		var finalBlock string
 
@@ -121,6 +118,8 @@ func (m *AppModel) handleKeyDown(t tea.KeyType, r []rune) (tea.Model, tea.Cmd) {
 		return m, m.displayGameSummary()
 	case tea.KeyCtrlN:
 		return m, m.new()
+	case tea.KeyCtrlS:
+		return m, m.copyShareString(false)
 	case tea.KeyRunes:
 		if len(r) != 1 {
 			return m, nil

diff --git a/game/utils.go b/game/utils.go
@@ -12,6 +12,7 @@ import (
 	"unicode"
 
 	tea "github.com/charmbracelet/bubbletea"
+	"pkg.nimblebun.works/clipboard"
 	"pkg.nimblebun.works/wordle-cli/common"
 	"pkg.nimblebun.works/wordle-cli/common/save"
 	"pkg.nimblebun.works/wordle-cli/words"
@@ -224,6 +225,21 @@ func (m *AppModel) getShareString() string {
 	return strings.Join(rows, "\n")
 }
 
+func (m *AppModel) copyShareString(automatic bool) tea.Cmd {
+	if m.GameState == common.GameStateRunning {
+		return nil
+	}
+
+	if automatic && !m.NewGame {
+		return nil
+	}
+
+	str := strings.ReplaceAll(m.getShareString(), "🔳", "⬜")
+	_ = clipboard.WriteAll(str)
+
+	return nil
+}
+
 func (m *AppModel) save() {
 	m.SaveData.LastGameID = m.ID
 	m.SaveData.LastGameGrid = m.Grid