Skip to content

Fix Backspace bug and broken build #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KawaiiFiveO wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix Backspace bug and broken build #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13a1e4a
fix backspace bug by changing help key to Ctrl-A
KawaiiFiveO May 30, 2026
06e7f5e
fix build by adding makefile rule to generate glosses.gob
KawaiiFiveO May 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ INSTALL_DIR ?= /usr/local/bin
.PHONY: all clean install

# Now all depends on generating words.txt, the output dir, the DB, and the Go builds
all: words.txt $(OUTPUT_DIR) $(DB) build-all
all: words.txt glosses.gob $(OUTPUT_DIR) $(DB) build-all

# Rule to generate glosses.gob
glosses.gob: glosses.jsonl buildglossgob.go
@echo "Generating glosses.gob..."
go run buildglossgob.go

# Generate words.txt from glosses.jsonl before building
words.txt: glosses.jsonl
Expand Down Expand Up @@ -55,5 +60,5 @@ install: all
cp $(OUTPUT_DIR)/tsk_$(shell go env GOOS)_$(shell go env GOARCH)_$(VERSION) $(INSTALL_DIR)/tsk

clean:
rm -rf $(OUTPUT_DIR) $(DB)
rm -rf $(OUTPUT_DIR) $(DB) glosses.gob

4 changes: 2 additions & 2 deletions tsk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const helpText = `[gray]
[yellow]Control-S[gray] = [yellow]Mark[gray]/unmark words. All marked words will be saved upon Esc to a text file.
[green]Control-L[gray] = [green]List[gray] marked words.
[cyan]Control-F[gray] = [cyan]Reverse-find[gray] words by searching their English definitions.
[pink]Control-H[gray] = Show this [pink]help[gray] text again.
[pink]Control-A[gray] = Show this [pink]help[gray] text again.

[red]Control-R[gray] = [red]Report a bug[gray] on GitHub.com. [red]Opens your web browser[gray] to

Expand Down Expand Up @@ -1478,7 +1478,7 @@ func main() {
textView.SetText(buf.String())

return nil
case tcell.KeyCtrlH:
case tcell.KeyCtrlA:
textView.SetTitle("Word Details (Tab/Shift-Tab to scroll, Ctrl-S to mark)")
textView.SetBorderColor(tcell.ColorWhite)
textView.SetTitleColor(tcell.ColorWhite)
Expand Down