diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/c_defs.go | 2 | ||||
| -rw-r--r-- | src/c_fuzz.go | 24 | ||||
| -rw-r--r-- | src/c_hardflip.go | 4 |
4 files changed, 23 insertions, 9 deletions
@@ -27,7 +27,7 @@ DEST := /usr .DEFAULT_GOAL := ${TARGET} run: ${SRC} - go run ${SRC_DIR} + go run ${SRC_DIR} -s ${TARGET}: ${SRC} go build -o ${TARGET} ${SRC_DIR} diff --git a/src/c_defs.go b/src/c_defs.go index 82ddd5c..480cf66 100644 --- a/src/c_defs.go +++ b/src/c_defs.go @@ -56,7 +56,7 @@ const ( STYLE_FILE_NAME = "colors.yml" CONF_DIR_NAME = "hf" DATA_DIR_NAME = "hf" - VERSION = "v1.0.2" + VERSION = "v1.0.3" VERSION_NAME = "wheelbite" ) diff --git a/src/c_fuzz.go b/src/c_fuzz.go index fb230e1..68976bd 100644 --- a/src/c_fuzz.go +++ b/src/c_fuzz.go @@ -92,9 +92,11 @@ func c_fuzz_find_item(str_out string, litems *ItemsList) (*ItemsNode) { } func c_fuzz(data *HardData, ui *HardUI) { - if err := ui.s.Suspend(); err != nil { - c_error_mode("screen", err, ui) - return + if ui.s != nil { + if err := ui.s.Suspend(); err != nil { + c_error_mode("screen", err, ui) + return + } } search := exec.Command("fzf") stdin, stdout := c_fuzz_init_pipes(ui, search) @@ -103,7 +105,9 @@ func c_fuzz(data *HardData, ui *HardUI) { } if err := search.Start(); err != nil { c_error_mode("fzf", err, ui) - c_resume_or_die(ui) + if ui.s != nil { + c_resume_or_die(ui) + } return } go func() { @@ -117,15 +121,21 @@ func c_fuzz(data *HardData, ui *HardUI) { }() output, err := io.ReadAll(stdout) if err != nil { - ui.s.Fini() + if ui.s != nil { + ui.s.Fini() + } c_die("search stdout", err) } str_out := strings.TrimSuffix(string(output), "\n") - c_resume_or_die(ui) + if ui.s != nil { + c_resume_or_die(ui) + } if len(str_out) > 0 { item := c_fuzz_find_item(str_out, data.litems) if item == nil { - c_error_mode("item not found", nil, ui) + if ui.s != nil { + c_error_mode("item not found", nil, ui) + } return } data.litems.curr = item diff --git a/src/c_hardflip.go b/src/c_hardflip.go index 948a7f9..a50a9ae 100644 --- a/src/c_hardflip.go +++ b/src/c_hardflip.go @@ -80,5 +80,9 @@ func main() { } data_dir := c_get_data_dir(nil) data := c_init_hard(data_dir, n_arg, s_arg) + if s_arg == true { + c_fuzz(data, &data.ui) + // TODO: exec instantly here + } i_ui(data) } |