From 565fe0fb9e41198dd74a0aba05b0aa64e134afe6 Mon Sep 17 00:00:00 2001
From: Joe <rbo@gmx.us>
Date: Wed, 15 May 2024 20:20:20 +0200
Subject: fucking hard
---
src/e_events.go | 41 +++++++++++++++++++++++++++++++++++------
src/e_keys.go | 12 ++++++------
2 files changed, 41 insertions(+), 12 deletions(-)
(limited to 'src')
diff --git a/src/e_events.go b/src/e_events.go
index 9ee5df4..5294351 100644
--- a/src/e_events.go
+++ b/src/e_events.go
@@ -279,23 +279,52 @@ func e_delete_host(data *HardData) error {
return nil
}
-func e_tab_complete(buffer *Buffer) {
- entries, err := os.ReadDir(".")
+func e_tab_complete_get_current_dir(str, home_dir string) string {
+ dir := "./"
+ if len(str) == 0 {
+ return "./"
+ } else if str[0] == '~' {
+ dir = home_dir + str[1:]
+ } else {
+ dir = str
+ }
+ for i := len(dir) - 1; i >= 0; i-- {
+ if dir[i] == '/' {
+ break
+ }
+ dir = dir[:i]
+ }
+ if stat, err := os.Stat(dir);
+ err == nil && dir[len(dir) - 1] == '/' && stat.IsDir() == true {
+ return dir
+ }
+ return "./"
+}
+
+func e_tab_complete(buffer *Buffer, home_dir string) {
+ dir := e_tab_complete_get_current_dir(buffer.str(), home_dir)
+ log.Println("cwd:", dir)
+ entries, err := os.ReadDir(dir)
if err != nil {
return
}
var match []string
for _, v := range entries {
- if len(v.Name()) >= buffer.len() &&
+ log.Println("entry:", v.Name())
+ // TODO: its all here
+ if len(v.Name()) >= buffer.len() - len(dir) &&
v.Name()[:buffer.len()] == buffer.str() {
match = append(match, v.Name())
}
}
- log.Println(match)
+ log.Println("match:", match)
if len(match) == 0 {
return
} else if len(match) == 1 {
buffer.insert(match[0])
+ if stat, err := os.Stat(match[0]); err == nil && stat.IsDir() == true {
+ buffer.insert(match[0] + "/")
+ }
} else {
var common []rune
var shortest int = 1000000000
@@ -324,7 +353,7 @@ func e_tab_complete(buffer *Buffer) {
}
}
-func e_readline(event tcell.EventKey, buffer *Buffer) {
+func e_readline(event tcell.EventKey, buffer *Buffer, home_dir string) {
if buffer.len() > 0 &&
(event.Key() == tcell.KeyBackspace ||
event.Key() == tcell.KeyBackspace2) {
@@ -367,7 +396,7 @@ func e_readline(event tcell.EventKey, buffer *Buffer) {
buffer.cursor += 1
} else if event.Key() == tcell.KeyTab ||
event.Key() == tcell.KeyCtrlI {
- e_tab_complete(buffer)
+ e_tab_complete(buffer, home_dir)
}
if buffer.cursor > buffer.len() {
buffer.cursor = buffer.len()
diff --git a/src/e_keys.go b/src/e_keys.go
index cac2872..07c3c97 100644
--- a/src/e_keys.go
+++ b/src/e_keys.go
@@ -325,7 +325,7 @@ func e_mkdir_events(data *HardData, ui *HardUI, event tcell.EventKey) bool {
ui.mode = NORMAL_MODE
ui.buff.empty()
} else {
- e_readline(event, &ui.buff)
+ e_readline(event, &ui.buff, data.home_dir)
}
return false
}
@@ -360,7 +360,7 @@ func e_insert_events(data *HardData, ui *HardUI, event tcell.EventKey) bool {
data.insert.parent = data.ldirs.head
}
} else {
- e_readline(event, &ui.buff)
+ e_readline(event, &ui.buff, data.home_dir)
}
} else if data.insert != nil {
if data.insert_err != nil {
@@ -655,7 +655,7 @@ func e_insert_events(data *HardData, ui *HardUI, event tcell.EventKey) bool {
ui.drives_buff = ui.buff.str()
ui.buff.empty()
} else {
- e_readline(event, &ui.buff)
+ e_readline(event, &ui.buff, data.home_dir)
}
} else {
if event.Key() == tcell.KeyEnter {
@@ -676,7 +676,7 @@ func e_insert_events(data *HardData, ui *HardUI, event tcell.EventKey) bool {
ui.buff.empty()
ui.s.HideCursor()
} else {
- e_readline(event, &ui.buff)
+ e_readline(event, &ui.buff, data.home_dir)
}
}
case INS_SSH_HOST,
@@ -807,7 +807,7 @@ func e_insert_events(data *HardData, ui *HardUI, event tcell.EventKey) bool {
ui.buff.empty()
ui.s.HideCursor()
} else {
- e_readline(event, &ui.buff)
+ e_readline(event, &ui.buff, data.home_dir)
}
}
}
@@ -826,7 +826,7 @@ func e_rename_events(data *HardData, ui *HardUI, event tcell.EventKey) bool {
return true
}
} else {
- e_readline(event, &ui.buff)
+ e_readline(event, &ui.buff, data.home_dir)
return true
}
ui.s.HideCursor()
--
cgit v1.2.3