Set/Get in `prompt` mode is now working properly when moving the cursor

cli/cmd/prompt.go

@@ -47,7 +47,7 @@ import (
 
 // PromptCompleter provides completion for a device
 type PromptCompleter struct {
-	//NOTE: not too sure about this but for now it should be sufficient
+	//NOTE: should be removed
 	deviceID               uuid.UUID
 	yangSchemaCompleterMap map[uuid.UUID]*completer.YangSchemaCompleter
 }
@@ -113,7 +113,7 @@ func (pc *PromptCompleter) cstmCompleter(d prompt.Document) []prompt.Suggest {
 		currCmd = c
 	}
 
-	return completionBasedOnCmd(pc, currCmd, inputSplit, inputFlags, d)
+	return completionBasedOnCmd(pc, currCmd, inputSplitFiltered, inputFlags, d)
 }
 
 func filterFlagSlice(input []string) (commandSlice []string, flagSlice []string) {
@@ -128,33 +128,44 @@ func filterFlagSlice(input []string) (commandSlice []string, flagSlice []string)
 }
 
 func deviceGetCompletion(c *PromptCompleter, d prompt.Document, inputSplit []string) []prompt.Suggest {
-	inputLen := len(inputSplit)
-	if inputLen == 2 || inputLen == 3 {
-		if id, err := uuid.Parse(inputSplit[inputLen-1]); err == nil {
+	switch inputLen := len(inputSplit); inputLen {
+	case 2:
+		return devicePrompt(d)
+	case 3:
+		id, err := uuid.Parse(inputSplit[inputLen-1])
+		if err != nil {
+			return devicePrompt(d)
+		}
 		if c, ok := c.yangSchemaCompleterMap[id]; ok {
 			return c.Complete(d)
 		}
-			dev, err := pndAdapter.GetDevice(id.String())
+		schemaTree, err := getSchemaTreeForDeviceID(id.String())
 		if err != nil {
 			return []prompt.Suggest{}
 		}
-			sid, err := uuid.Parse(dev[0].GetSbi().GetId())
-			if err != nil {
+		c.yangSchemaCompleterMap[id] = completer.NewYangSchemaCompleter(schemaTree["Device"], true)
+		if yc, ok := c.yangSchemaCompleterMap[id]; ok {
+			c.deviceID = id
+			return yc.Complete(d)
+		}
+	case 4:
+		if d.GetWordBeforeCursor() == "" || d.GetWordAfterCursor() != "" {
 			return []prompt.Suggest{}
 		}
-			schemaTree, err := pndAdapter.GetSbiSchemaTree(sid)
+		_, err := uuid.Parse(inputSplit[inputLen-2])
 		if err != nil {
-				return []prompt.Suggest{}
+			return devicePrompt(d)
 		}
-			c.yangSchemaCompleterMap[id] = completer.NewYangSchemaCompleter(schemaTree["Device"], true)
-			if yc, ok := c.yangSchemaCompleterMap[id]; ok {
-				c.deviceID = id
+		if yc, ok := c.yangSchemaCompleterMap[c.deviceID]; ok {
 			return yc.Complete(d)
 		}
-
+	default:
+		return []prompt.Suggest{}
+	}
 	return []prompt.Suggest{}
 }
-		if inputLen == 2 || (inputLen == 3 && !(d.GetWordBeforeCursor() == "")) {
+
+func devicePrompt(d prompt.Document) []prompt.Suggest {
 	spinner, _ := pterm.DefaultSpinner.Start("Requesting devices from controller.")
 	devices, err := getDevices()
 	if err != nil {
@@ -164,14 +175,6 @@ func deviceGetCompletion(c *PromptCompleter, d prompt.Document, inputSplit []str
 	spinner.Success()
 	return prompt.FilterHasPrefix(devices, d.GetWordBeforeCursor(), true)
 }
-	} else {
-		if yc, ok := c.yangSchemaCompleterMap[c.deviceID]; ok {
-			return yc.Complete(d)
-		}
-		return []prompt.Suggest{}
-	}
-	return []prompt.Suggest{}
-}
 
 func cobraCommandCompletion(currCmd *cobra.Command, d prompt.Document, inputFlags []string, loaded []prompt.Suggest) []prompt.Suggest {
 	if currCmd.HasAvailableFlags() {

cli/cmd/utils.go

@@ -39,6 +39,8 @@ import (
 	"code.fbi.h-da.de/danet/gosdn/cli/completer"
 	"code.fbi.h-da.de/danet/gosdn/controller/api"
 	"github.com/c-bata/go-prompt"
+	"github.com/google/uuid"
+	"github.com/openconfig/goyang/pkg/yang"
 	"github.com/spf13/viper"
 )
 
@@ -69,6 +71,18 @@ func getDevices() ([]prompt.Suggest, error) {
 	return completer.SortSuggestionByText(s), nil
 }
 
+func getSchemaTreeForDeviceID(id string) (map[string]*yang.Entry, error) {
+	dev, err := pndAdapter.GetDevice(id)
+	if err != nil {
+		return nil, err
+	}
+	sid, err := uuid.Parse(dev[0].GetSbi().GetId())
+	if err != nil {
+		return nil, err
+	}
+	return pndAdapter.GetSbiSchemaTree(sid)
+}
+
 func getPnds() []prompt.Suggest {
 	resp, err := api.GetIds(viper.GetString("controllerAPIEndpoint"))
 	if err != nil {