Merge branch 'feature/onlineCommandExecution' into develop

Author: relastle

resources/pmy_rules_neo.json

@@ -56,7 +56,7 @@
       "regexpLeft": "^cd +(?P<path>.*)$",
       "cmdGroups": [
         {
-          "tag": "directory",
+          "tag": "",
           "stmt":  "command ls ${PMY_LS_OPTION} -1 <path> | egrep '/$'",
           "after": "awk '{print $0}'"
         }

shell/pmy.zsh

@@ -17,19 +17,26 @@ pmy-widget() {
     else
         eval ${out}
 
-        # get result from fzf
-        local fzf_res=$(echo "${__pmy_out_sources}" | fzf -0 -1)
-        # get tag
-        local tag="$(echo -n ${fzf_res} | awk 'BEGIN{ORS = ""}{print $1}' | base64)"
-        tag=${tag/\//a_a} # original escape of base64 `/`
-        tag=${tag/+/b_b} # original escape of base64 `+`
-        tag=${tag/=/c_c} # original escape of base64 `+`
-        # 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)
-        local res=$(echo ${fzf_res_rest} | eval ${after_cmd})
+        if [[ -z ${__pmy_out_imm_cmd} ]] then
+            # get result from fzf
+            local fzf_res=$(echo -n "${__pmy_out_sources}" | fzf -0 -1)
+            # get tag
+            local tag="$(echo -n ${fzf_res} | awk 'BEGIN{ORS = ""}{print $1}' | base64)"
+            tag=${tag//\//a_a} # original escape of base64 `/`
+            tag=${tag//+/b_b} # original escape of base64 `+`
+            tag=${tag//=/c_c} # original escape of base64 `+`
+            # 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)
+            local res=$(echo ${fzf_res_rest} | eval ${after_cmd})
+        else
+            # get result from fzf
+            local fzf_res=$(eval "${__pmy_out_imm_cmd}" | fzf -0 -1)
+            local after_cmd=${__pmy_out_imm_after_cmd}
+            local res=$(echo ${fzf_res} | eval ${after_cmd})
+        fi
         LBUFFER="${__pmy_out_buffer_left}${res}"
         RBUFFER="${__pmy_out_buffer_right}"
     fi

src/cmd.go

@@ -47,7 +47,7 @@ func (cg *CmdGroup) toPipeLine() []([]string) {
 }
 
 func (cg *CmdGroup) setLines(out []byte) {
-	strList := strings.Split(strings.TrimSuffix(string(out), "\n"), "\n")
+	strList := strings.Split(strings.Trim(string(out), "\n"), "\n")
 	cg.Lines = strList
 	return
 }
@@ -82,6 +82,13 @@ func (cgs CmdGroups) getMaxTagLen() int {
 	return maxLen
 }
 
+func (cgs CmdGroups) getImmCmdGroup() (*CmdGroup, bool) {
+	if len(cgs) == 1 && cgs[0].Tag == "" {
+		return cgs[0], true
+	}
+	return nil, false
+}
+
 func (cgs CmdGroups) organizeLines() string {
 	resString := ""
 	maxTagLen := cgs.getMaxTagLen()

src/out.go

@@ -15,6 +15,8 @@ const (
 	shellCommandVariableName     = "__pmy_out_command"
 	shellSourcesVariableName     = "__pmy_out_sources"
 	shellAfterVariableName       = "__pmy_out_%s_after"
+	shellImmCmdVariableName      = "__pmy_out_imm_cmd"
+	shellImmAfterCmdVariableName = "__pmy_out_imm_after_cmd"
 )
 
 type afterCmd struct {
@@ -30,6 +32,8 @@ type pmyOut struct {
 	bufferRight string
 	cmdGroups   CmdGroups
 	sources     string
+	immCmd      string
+	immAfterCmd string
 }
 
 // newPmyOutFromRule create new pmyOut from rule
@@ -44,7 +48,13 @@ func newPmyOutFromRule(rule *pmyRule) pmyOut {
 	// expand all parameters
 	out.expandAll(rule.paramMap)
 	// get sources
-	out.sources, _ = out.cmdGroups.GetSources()
+	if immCmdGroup, ok := out.cmdGroups.getImmCmdGroup(); ok {
+		out.immCmd = immCmdGroup.Stmt
+		out.immAfterCmd = immCmdGroup.After
+	} else {
+		out.sources, _ = out.cmdGroups.GetSources()
+	}
+	// get sources
 	return out
 }
 
@@ -65,6 +75,8 @@ 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, "'"))
+	res += fmt.Sprintf("%v=$'%v';", shellImmCmdVariableName, utils.Escape(out.immCmd, "'"))
+	res += fmt.Sprintf("%v=$'%v';", shellImmAfterCmdVariableName, utils.Escape(out.immAfterCmd, "'"))
 	for _, cg := range out.cmdGroups {
 		res += fmt.Sprintf(
 			"%v=$'%v';",