.github/workflows/go.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: "1.18"
+        go-version: "1.23"
 
     - name: Build
       run: go build -v ./...
@@ -31,7 +31,7 @@ jobs:
 
     - uses: dominikh/staticcheck-action@v1.3.1
       with:
-        version: "2022.1.3"
+        version: "2024.1.1"
         install-go: false
 
   cross-compile:
@@ -44,7 +44,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: "1.18"
+        go-version: "1.23"
 
     - name: Cross-compile on all supported platforms
       run: gen/xbuild.sh
@@ -59,7 +59,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: "1.18"
+        go-version: "1.23"
 
     - name: Test `go fmt` creates no diffs
       run: go fmt && git diff --exit-code

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: "1.18"
+        go-version: "1.23"
 
     - name: Build
       run: gen/xbuild.sh

README.md

@@ -9,7 +9,7 @@
 [![Go Build](https://github.com/gokcehan/lf/actions/workflows/go.yml/badge.svg)](https://github.com/gokcehan/lf/actions/workflows/go.yml)
 [![Go Report Card](https://goreportcard.com/badge/github.com/gokcehan/lf)](https://goreportcard.com/report/github.com/gokcehan/lf)
 
-`lf` (as in "list files") is a terminal file manager written in Go with a heavy inspiration from ranger file manager.
+`lf` (as in "list files") is a terminal file manager written in Go with a heavy inspiration from [`ranger`](https://github.com/ranger/ranger) file manager.
 See [faq](https://github.com/gokcehan/lf/wiki/FAQ) for more information and [tutorial](https://github.com/gokcehan/lf/wiki/Tutorial) for a gentle introduction with screencasts.
 
 ![multicol-screenshot](http://i.imgur.com/DaTUenu.png)

app.go

@@ -35,6 +35,7 @@ type app struct {
 	menuCompInd    int
 	selectionOut   []string
 	watch          *watch
+	quitting       bool
 }
 
 func newApp(ui *ui, nav *nav) *app {
@@ -66,6 +67,14 @@ func newApp(ui *ui, nav *nav) *app {
 }
 
 func (app *app) quit() {
+	// Using synchronous shell commands for `on-quit` can cause this to be
+	// called again, so a guard variable is introduced here to prevent an
+	// infinite loop.
+	if app.quitting {
+		return
+	}
+	app.quitting = true
+
 	onQuit(app)
 
 	if gOpts.history {
@@ -418,7 +427,7 @@ func (app *app) loop() {
 				}
 			}
 
-			app.setWatchPaths()
+			app.watchDir(d)
 
 			app.ui.draw(app.nav)
 		case r := <-app.nav.regChan:
@@ -433,12 +442,7 @@ func (app *app) loop() {
 
 			app.ui.draw(app.nav)
 		case f := <-app.nav.fileChan:
-			dirs := app.nav.dirs
-			if app.ui.dirPrev != nil {
-				dirs = append(dirs, app.ui.dirPrev)
-			}
-
-			for _, dir := range dirs {
+			for _, dir := range app.nav.dirCache {
 				if dir.path != filepath.Dir(f.path) {
 					continue
 				}
@@ -463,6 +467,11 @@ func (app *app) loop() {
 		case path := <-app.nav.delChan:
 			delete(app.nav.dirCache, path)
 			delete(app.nav.regCache, path)
+
+			delete(app.nav.selections, path)
+			if len(app.nav.selections) == 0 {
+				app.nav.selectionInd = 0
+			}
 		case ev := <-app.ui.evChan:
 			e := app.ui.readEvent(ev, app.nav)
 			if e == nil {
@@ -629,21 +638,17 @@ func (app *app) runShell(s string, args []string, prefix string) {
 	}
 }
 
-func (app *app) setWatchPaths() {
-	if !gOpts.watch || len(app.nav.dirs) == 0 {
+func (app *app) watchDir(dir *dir) {
+	if !gOpts.watch {
 		return
 	}
 
-	paths := make(map[string]bool)
-	for _, dir := range app.nav.dirs {
-		paths[dir.path] = true
-	}
+	app.watch.add(dir.path)
 
-	for _, file := range app.nav.currDir().allFiles {
+	// ensure dircounts are updated for child directories
+	for _, file := range dir.allFiles {
 		if file.IsDir() {
-			paths[file.path] = true
+			app.watch.add(file.path)
 		}
 	}
-
-	app.watch.set(paths)
 }

client.go

@@ -117,7 +117,7 @@ func readExpr() <-chan expr {
 	ch := make(chan expr)
 
 	go func() {
-		duration := 1 * time.Second
+		duration := 100 * time.Millisecond
 
 		c, err := net.Dial(gSocketProt, gSocketPath)
 		for err != nil {
@@ -130,6 +130,7 @@ func readExpr() <-chan expr {
 		fmt.Fprintf(c, "conn %d\n", gClientID)
 
 		ch <- &callExpr{"sync", nil, 1}
+		ch <- &callExpr{"on-init", nil, 1}
 
 		s := bufio.NewScanner(c)
 		for s.Scan() {

colors.go

@@ -98,82 +98,116 @@ func parseEscapeSequence(s string) tcell.Style {
 func applyAnsiCodes(s string, st tcell.Style) tcell.Style {
 	toks := strings.Split(s, ";")
 
-	var nums []int
-	for _, tok := range toks {
-		if tok == "" {
-			nums = append(nums, 0)
-			continue
-		}
-		n, err := strconv.Atoi(tok)
-		if err != nil {
-			log.Printf("converting escape code: %s", err)
-			continue
-		}
-		nums = append(nums, n)
-	}
-
 	// ECMA-48 details the standard
 	// TODO: should we support turning off attributes?
 	//    Probably because this is used for previewers too
-	for i := 0; i < len(nums); i++ {
-		n := nums[i]
-		switch {
-		case n == 0:
+	tokslen := len(toks)
+	for i := 0; i < tokslen; i++ {
+		switch strings.TrimLeft(toks[i], "0") {
+		case "":
 			st = tcell.StyleDefault
-		case n == 1:
+		case "1":
 			st = st.Bold(true)
-		case n == 2:
+		case "2":
 			st = st.Dim(true)
-		case n == 3:
+		case "3":
 			st = st.Italic(true)
-		case n == 4:
+		case "4:0":
+			st = st.Underline(false)
+		case "4", "4:1":
 			st = st.Underline(true)
-		case n == 5 || n == 6:
+		case "4:2":
+			st = st.Underline(tcell.UnderlineStyleDouble)
+		case "4:3":
+			st = st.Underline(tcell.UnderlineStyleCurly)
+		case "4:4":
+			st = st.Underline(tcell.UnderlineStyleDotted)
+		case "4:5":
+			st = st.Underline(tcell.UnderlineStyleDashed)
+		case "5", "6":
 			st = st.Blink(true)
-		case n == 7:
+		case "7":
 			st = st.Reverse(true)
-		case n == 8:
+		case "8":
 			// TODO: tcell PR for proper conceal
 			_, bg, _ := st.Decompose()
 			st = st.Foreground(bg)
-		case n == 9:
+		case "9":
 			st = st.StrikeThrough(true)
-		case n >= 30 && n <= 37:
+		case "30", "31", "32", "33", "34", "35", "36", "37":
+			n, _ := strconv.Atoi(toks[i])
 			st = st.Foreground(tcell.PaletteColor(n - 30))
-		case n >= 90 && n <= 97:
+		case "90", "91", "92", "93", "94", "95", "96", "97":
+			n, _ := strconv.Atoi(toks[i])
 			st = st.Foreground(tcell.PaletteColor(n - 82))
-		case n == 38:
-			if i+3 <= len(nums) && nums[i+1] == 5 {
-				st = st.Foreground(tcell.PaletteColor(nums[i+2]))
+		case "38":
+			if toks[i+1] == "5" && i+2 < tokslen {
+				n, err := strconv.Atoi(toks[i+2])
+				if err != nil {
+					log.Printf("unknown ansi code: %s", toks[i+2])
+					continue
+				}
+				st = st.Foreground(tcell.PaletteColor(n))
 				i += 2
-			} else if i+5 <= len(nums) && nums[i+1] == 2 {
-				st = st.Foreground(tcell.NewRGBColor(
-					int32(nums[i+2]),
-					int32(nums[i+3]),
-					int32(nums[i+4])))
+			} else if toks[i+1] == "2" && i+4 < tokslen {
+				r, err := strconv.Atoi(toks[i+2])
+				if err != nil {
+					log.Printf("unknown ansi code: %s", toks[i+2])
+					continue
+				}
+				g, err := strconv.Atoi(toks[i+3])
+				if err != nil {
+					log.Printf("unknown ansi code: %s", toks[i+3])
+					continue
+				}
+				b, err := strconv.Atoi(toks[i+4])
+				if err != nil {
+					log.Printf("unknown ansi code: %s", toks[i+4])
+					continue
+				}
+				st = st.Foreground(tcell.NewRGBColor(int32(r), int32(g), int32(b)))
 				i += 4
 			} else {
-				log.Printf("unknown ansi code or incorrect form: %d", n)
+				log.Printf("unknown ansi code or incorrect form: %s", toks[i])
 			}
-		case n >= 40 && n <= 47:
+		case "40", "41", "42", "43", "44", "45", "46", "47":
+			n, _ := strconv.Atoi(toks[i])
 			st = st.Background(tcell.PaletteColor(n - 40))
-		case n >= 100 && n <= 107:
+		case "100", "101", "102", "103", "104", "105", "106", "107":
+			n, _ := strconv.Atoi(toks[i])
 			st = st.Background(tcell.PaletteColor(n - 92))
-		case n == 48:
-			if i+3 <= len(nums) && nums[i+1] == 5 {
-				st = st.Background(tcell.PaletteColor(nums[i+2]))
+		case "48":
+			if toks[i+1] == "5" && i+2 < tokslen {
+				n, err := strconv.Atoi(toks[i+2])
+				if err != nil {
+					log.Printf("unknown ansi code: %s", toks[i+2])
+					continue
+				}
+				st = st.Background(tcell.PaletteColor(n))
 				i += 2
-			} else if i+5 <= len(nums) && nums[i+1] == 2 {
-				st = st.Background(tcell.NewRGBColor(
-					int32(nums[i+2]),
-					int32(nums[i+3]),
-					int32(nums[i+4])))
+			} else if toks[i+1] == "2" && i+4 < tokslen {
+				r, err := strconv.Atoi(toks[i+2])
+				if err != nil {
+					log.Printf("unknown ansi code: %s", toks[i+2])
+					continue
+				}
+				g, err := strconv.Atoi(toks[i+3])
+				if err != nil {
+					log.Printf("unknown ansi code: %s", toks[i+3])
+					continue
+				}
+				b, err := strconv.Atoi(toks[i+4])
+				if err != nil {
+					log.Printf("unknown ansi code: %s", toks[i+4])
+					continue
+				}
+				st = st.Background(tcell.NewRGBColor(int32(r), int32(g), int32(b)))
 				i += 4
 			} else {
-				log.Printf("unknown ansi code or incorrect form: %d", n)
+				log.Printf("unknown ansi code or incorrect form: %s", toks[i])
 			}
 		default:
-			log.Printf("unknown ansi code: %d", n)
+			log.Printf("unknown ansi code: %s", toks[i])
 		}
 	}
 

colors_test.go

@@ -35,6 +35,14 @@ func TestApplyAnsiCodes(t *testing.T) {
 		{"4", none.Bold(true), none.Bold(true).Underline(true)},
 		{"4", none.Foreground(tcell.ColorMaroon).Bold(true), none.Foreground(tcell.ColorMaroon).Bold(true).Underline(true)},
 
+		{"4:0", none, none},
+		{"4:0", none.Underline(true), none},
+		{"4:1", none, none.Underline(true)},
+		{"4:2", none, none.Underline(tcell.UnderlineStyleDouble)},
+		{"4:3", none, none.Underline(tcell.UnderlineStyleCurly)},
+		{"4:4", none, none.Underline(tcell.UnderlineStyleDotted)},
+		{"4:5", none, none.Underline(tcell.UnderlineStyleDashed)},
+
 		{"31", none, none.Foreground(tcell.ColorMaroon)},
 		{"31", none.Foreground(tcell.ColorGreen), none.Foreground(tcell.ColorMaroon)},
 		{"31", none.Foreground(tcell.ColorGreen).Bold(true), none.Foreground(tcell.ColorMaroon).Bold(true)},
@@ -45,6 +53,9 @@ func TestApplyAnsiCodes(t *testing.T) {
 		{"1;31", none, none.Foreground(tcell.ColorMaroon).Bold(true)},
 		{"1;31", none.Foreground(tcell.ColorGreen), none.Foreground(tcell.ColorMaroon).Bold(true)},
 
+		{"01;31", none, none.Foreground(tcell.ColorMaroon).Bold(true)},
+		{"01;31", none.Foreground(tcell.ColorGreen), none.Foreground(tcell.ColorMaroon).Bold(true)},
+
 		{"38;5;0", none, none.Foreground(tcell.ColorBlack)},
 		{"38;5;1", none, none.Foreground(tcell.ColorMaroon)},
 		{"38;5;8", none, none.Foreground(tcell.ColorGray)},

complete.go

@@ -116,7 +116,7 @@ var (
 
 func getOptWords(opts any) (optWords []string) {
 	t := reflect.TypeOf(opts)
-	for i := 0; i < t.NumField(); i++ {
+	for i := range t.NumField() {
 		field := t.Field(i)
 		switch field.Type.Kind() {
 		case reflect.Map:
@@ -134,9 +134,9 @@ func getOptWords(opts any) (optWords []string) {
 
 func getLocalOptWords(localOpts any) (localOptWords []string) {
 	t := reflect.TypeOf(localOpts)
-	for i := 0; i < t.NumField(); i++ {
+	for i := range t.NumField() {
 		field := t.Field(i)
-		name := strings.TrimSuffix(field.Name, "s")
+		name := field.Name
 		if field.Type.Kind() != reflect.Map {
 			continue
 		}
@@ -215,9 +215,9 @@ func matchExec(s string) (matches []string, longest []rune) {
 		}
 	}
 
-	sort.Strings(words)
-
 	if len(words) > 0 {
+		sort.Strings(words)
+
 		uniq := words[:1]
 		for i := 1; i < len(words); i++ {
 			if words[i] != words[i-1] {
@@ -294,7 +294,8 @@ func matchFile(s string) (matches []string, longest []rune) {
 }
 
 func matchCmd(s string) (matches []string, longest []rune) {
-	words := gCmdWords
+	words := make([]string, 0, len(gCmdWords)+len(gOpts.cmds))
+	words = append(words, gCmdWords...)
 	for c := range gOpts.cmds {
 		words = append(words, c)
 	}