fix history key bind

Author: djcas9

komanda/command/help.go

@@ -28,6 +28,14 @@ func (e *HelpCmd) Exec(args []string) error {
 			metadata := command.Metadata()
 			client.StatusMessage(v, fmt.Sprintf("/%s %s - %s",
 				metadata.Name(), metadata.Args(), metadata.Description()))
+
+			// client.StatusMessage(v,
+			// fmt.Sprintf("\t Aliases: %s", strings.Join(metadata.Aliases(), ", ")),
+			// )
+
+			// for _, a := range metadata.Aliases() {
+			// client.StatusMessage(v, fmt.Sprintf("\t - /%s", a))
+			// }
 		}
 
 		client.StatusMessage(v, "==================== HELP COMMANDS ====================\n")

komanda/share/history/history.go

@@ -1,12 +1,19 @@
 package history
 
-import "github.com/mephux/komanda-cli/komanda/logger"
+import (
+	"sync"
+
+	"github.com/davecgh/go-spew/spew"
+	"github.com/mephux/komanda-cli/komanda/logger"
+)
 
 // History struct
 type History struct {
 	Max   int
 	Data  []string
 	Index int
+
+	mu sync.Mutex
 }
 
 // New history struct
@@ -20,11 +27,19 @@ func New() *History {
 
 // Add line to history
 func (h *History) Add(line string) {
+	h.mu.Lock()
+	defer h.mu.Unlock()
+
 	logger.Logger.Print("in Add\n")
 
-	if len(h.Data) >= h.Max {
+	prev := h.Prev()
+
+	if line == prev {
+		return
+	}
+
+	if len(h.Data) > h.Max {
 		h.Data = append(h.Data[:0], h.Data[1:]...)
-		h.Index = len(h.Data) - 1
 	}
 
 	h.Data = append(h.Data, line)
@@ -33,6 +48,17 @@ func (h *History) Add(line string) {
 	logger.Logger.Printf("ADD %s %d\n", h.Data, h.Index)
 }
 
+// HasLine will check is the history buffer contains the given string
+func (h *History) HasLine(line string) bool {
+	for _, l := range h.Data {
+		if line == l {
+			return true
+		}
+	}
+
+	return false
+}
+
 // Get history at index
 func (h *History) Get(index int) string {
 	return h.Data[index]
@@ -49,21 +75,27 @@ func (h *History) Empty() bool {
 
 // Prev returns the previous history line fvrom the current index
 func (h *History) Prev() string {
-	logger.Logger.Print("Prev\n")
+	logger.Logger.Printf("Prev from %d %d\n", h.Index, len(h.Data)-1)
 
 	h.Index--
 
 	if h.Index < 0 {
-		h.Index = len(h.Data) - 1
+		h.Index = 0
 	}
 
+	// if h.Index == -1 {
+	// h.Index = 0
+	// } else if h.Index < -1 {
+	// h.Index = len(h.Data) - 1
+	// }
+
 	logger.Logger.Printf("Set Prev Index %d\n", h.Index)
 
 	if h.Empty() {
 		return ""
 	}
 
-	logger.Logger.Printf("PREV %s\n", h.Data[h.Index])
+	logger.Logger.Printf("PREV %s\n", spew.Sdump(h.Data))
 
 	return h.Data[h.Index]
 }
@@ -75,7 +107,7 @@ func (h *History) Next() string {
 	h.Index++
 
 	if h.Index >= len(h.Data) {
-		h.Index = 0
+		h.Index = len(h.Data) - 1
 	}
 
 	logger.Logger.Printf("Set Next Index %d\n", h.Index)
@@ -90,8 +122,6 @@ func (h *History) Next() string {
 }
 
 // Current history line
-func (h *History) Current() string {
-
-	h.Index = len(h.Data) - 1
-	return h.Data[h.Index]
+func (h *History) Current() {
+	h.Index = len(h.Data)
 }

komanda/ui/handlers.go

@@ -78,7 +78,7 @@ func BindHandlers() {
 	})
 
 	Server.Client.HandleFunc("NOTICE", func(conn *irc.Conn, line *irc.Line) {
-		logger.Logger.Println("NOTICE -----------------------------", spew.Sdump(line))
+		// logger.Logger.Println("NOTICE -----------------------------", spew.Sdump(line))
 
 		var channel = line.Nick
 		var noticeChannel bool

komanda/util.go

@@ -166,6 +166,9 @@ func simpleEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) {
 				c.Autoscroll = true
 			}
 		}
+
+		InputHistory.Current()
+
 		// v.EditNewLine()
 		// v.Rewind()
 
@@ -178,16 +181,22 @@ func simpleEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) {
 
 		if line := InputHistory.Next(); len(line) > 0 {
 			v.Clear()
+			v.SetCursor(0, 0)
+			v.SetOrigin(0, 0)
+
 			fmt.Fprint(v, line)
-			v.SetCursor(len(v.Buffer()), 0)
+			v.SetCursor(len(v.Buffer())-1, 0)
 		}
 	case key == gocui.KeyArrowUp:
 		inHistroy = true
 
 		if line := InputHistory.Prev(); len(line) > 0 {
 			v.Clear()
+			v.SetCursor(0, 0)
+			v.SetOrigin(0, 0)
+
 			fmt.Fprint(v, line)
-			v.SetCursor(len(v.Buffer()), 0)
+			v.SetCursor(len(v.Buffer())-1, 0)
 		}
 	case key == gocui.KeyArrowLeft:
 		v.MoveCursor(-1, 0, false)