Update: implement auto-tag elimination, and implement after command excecution against fzf result

Author: relastle

shell/pmy.zsh

@@ -1,3 +1,4 @@
+#!/usr/bin/env zsh
 # test environment path variable
 export PATH="${GOPATH}/src/github.com/relastle/pmy:${PATH}"
 export PMY_CONFIG_PATH="${GOPATH}/src/github.com/relastle/pmy/resources/pmy_rules_neo.json"
@@ -10,6 +11,7 @@ pmy-widget() {
 
     # get output from pmy
     local out="$(pmy --bufferLeft=${buffer_left} --bufferRight=${buffer_right} 2>/dev/null)"
+    echo $out
 
     if [[ -z $out  ]] then
         echo "No rule was matched"
@@ -18,7 +20,19 @@ pmy-widget() {
 
         # get result from fzf
         local fzf_res=$(echo "${__pmy_out_sources}" | fzf -0 -1)
-        LBUFFER="${__pmy_out_buffer_left}${fzf_res}"
+        # get tag
+        local tag=$(echo ${fzf_res} | awk '{print $1}')
+        # get rest statement
+        local fzf_res_rest=$(echo ${fzf_res} | awk '{for(i=2;i<NF;i++){printf("%s%s",$i,OFS=" ")}print $NF}')
+        # get after command
+        local after_cmd_variable="__pmy_out_${tag}_after"
+        local after_cmd=$(eval echo \$$after_cmd_variable)
+        echo ${tag}
+        echo ${after_cmd_variable}
+        echo ${fzf_res_rest}
+        echo ${after_cmd}
+        local res=$(echo ${fzf_res_rest} | eval ${after_cmd})
+        LBUFFER="${__pmy_out_buffer_left}${res}"
         RBUFFER="${__pmy_out_buffer_right}"
     fi
     zle reset-prompt

src/cmd.go

@@ -34,6 +34,7 @@ func (cu *CmdUnit) init() error {
 type CmdGroup struct {
 	Tag      string    `json:"tag"`
 	Stmt     string    `json:"stmt"`
+	After    string    `json:"after"`
 	CmdUnits []CmdUnit `json:"cmdUnits"`
 	Lines    []string  `json:"lines"`
 }

src/out.go

@@ -13,25 +13,44 @@ const (
 	shellBufferRightVariableName = "__pmy_out_buffer_right"
 	shellCommandVariableName     = "__pmy_out_command"
 	shellSourcesVariableName     = "__pmy_out_sources"
+	shellAfterVariableName       = "__pmy_out_%s_after"
 )
 
+type afterCmd struct {
+	tag   string
+	after string
+}
+
 // pmyOut represents Output of pmy against zsh routine.
 // This struct has strings exported to shell, whose embedded
 // variables are all expanded.
 type pmyOut struct {
 	BufferLeft  string `json:"bufferLeft"`
 	BufferRight string `json:"bufferRight"`
 	Sources     string `json:"source"`
+	afterCmds   []*afterCmd
 }
 
 // newPmyOutFromRule create new pmyOut from rule
 // which matches query and already has paramMap
 func newPmyOutFromRule(rule *pmyRule) pmyOut {
 	out := pmyOut{}
+	// pass sources
 	out.Sources, _ = rule.CmdGroups.GetSources()
+	// pass resulting buffer informaiton
 	out.BufferLeft = rule.BufferLeft
 	out.BufferRight = rule.BufferRight
+	// expand all parameters
 	out.expandAll(rule.paramMap)
+	// set after commnad
+	out.afterCmds = []*afterCmd{}
+	for _, cg := range rule.CmdGroups {
+		ac := &afterCmd{
+			tag:   cg.Tag,
+			after: cg.After,
+		}
+		out.afterCmds = append(out.afterCmds, ac)
+	}
 	return out
 }
 
@@ -42,6 +61,13 @@ func (out *pmyOut) toShellVariables() string {
 	res += fmt.Sprintf("%v=$'%v';", shellBufferLeftVariableName, utils.Escape(out.BufferLeft, "'"))
 	res += fmt.Sprintf("%v=$'%v';", shellBufferRightVariableName, utils.Escape(out.BufferRight, "'"))
 	res += fmt.Sprintf("%v=$'%v';", shellSourcesVariableName, utils.Escape(out.Sources, "'"))
+	for _, ac := range out.afterCmds {
+		res += fmt.Sprintf(
+			"%v=$'%v';",
+			fmt.Sprintf(shellAfterVariableName, ac.tag),
+			utils.Escape(ac.after, "'"),
+		)
+	}
 	return res
 }