From bf3847e4360dfea28d1c9edd0a8c9f36883e6f41 Mon Sep 17 00:00:00 2001 From: harveyshao Date: Sat, 8 Jan 2022 11:51:45 +0800 Subject: [PATCH] opt some --- base/nfs/tar.go | 1 + base/ssh/scripts.go | 2 +- base/web/dream.go | 7 +++++-- core/code/autogen.go | 2 +- core/code/js.go | 2 ++ data.go | 3 +++ misc.go | 6 +++--- misc/tmux/session.go | 2 +- type.go | 1 + 9 files changed, 18 insertions(+), 8 deletions(-) diff --git a/base/nfs/tar.go b/base/nfs/tar.go index 5e52f4f8..7bfa4016 100644 --- a/base/nfs/tar.go +++ b/base/nfs/tar.go @@ -17,6 +17,7 @@ func init() { Index.Merge(&ice.Context{Commands: map[string]*ice.Command{ TAR: {Name: "tar file path auto", Help: "打包", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Option("cmd_dir", m.Option(DIR_ROOT)) + m.Debug("cmd_dir: %v", m.Option("cmd_dir")) m.Cmdy("cli.system", "tar", "zcvf", arg) return diff --git a/base/ssh/scripts.go b/base/ssh/scripts.go index 937ffaea..ac8ce550 100644 --- a/base/ssh/scripts.go +++ b/base/ssh/scripts.go @@ -116,7 +116,7 @@ func (f *Frame) parse(m *ice.Message, line string) string { } msg.Render("", kit.List()) - if msg.Cmdy(ls[0], ls[1:]); m.IsErrNotFound() { + if msg.Cmdy(ls[0], ls[1:]); msg.IsErrNotFound() { msg.SetResult().Cmdy(cli.SYSTEM, ls) } diff --git a/base/web/dream.go b/base/web/dream.go index d3fe383b..1bb98d01 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -15,8 +15,8 @@ import ( kit "shylinux.com/x/toolkits" ) -func _dream_list(m *ice.Message) { - m.Cmdy(nfs.DIR, m.Config(nfs.PATH), "time,size,name").Table(func(index int, value map[string]string, head []string) { +func _dream_list(m *ice.Message) *ice.Message { + return m.Cmdy(nfs.DIR, m.Config(nfs.PATH), "time,size,name").Table(func(index int, value map[string]string, head []string) { if m.Richs(SPACE, nil, value[mdb.NAME], func(key string, value map[string]interface{}) { m.Push(mdb.TYPE, value[mdb.TYPE]) m.Push(cli.STATUS, cli.START) @@ -103,6 +103,9 @@ func init() { cli.STOP: {Name: "stop", Help: "停止", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(SPACE, m.Option(mdb.NAME), "exit", "0") }}, + mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) { + _dream_list(m).Cut("name,status,time") + }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { if len(arg) == 0 { _dream_list(m) diff --git a/core/code/autogen.go b/core/code/autogen.go index 6e16d757..80116c05 100644 --- a/core/code/autogen.go +++ b/core/code/autogen.go @@ -40,7 +40,7 @@ func (h {{.Option "name"}}) List(m *ice.Message, arg ...string) { func init() { ice.Cmd("{{.Option "key"}}", {{.Option "name"}}{}) } `, m) - m.Cmd(nfs.SAVE, dir, string(buf)) + m.Cmd(nfs.DEFS, dir, string(buf)) } func _autogen_import(m *ice.Message, main string, ctx string, mod string) (list []string) { m.Cmd(nfs.DEFS, main, `package main diff --git a/core/code/js.go b/core/code/js.go index d34c3813..441ef7cc 100644 --- a/core/code/js.go +++ b/core/code/js.go @@ -9,6 +9,7 @@ import ( kit "shylinux.com/x/toolkits" ) +const TS = "ts" const JS = "js" const CSS = "css" const HTML = "html" @@ -23,6 +24,7 @@ func init() { m.Cmd(cmd, mdb.CREATE, JSON, m.Prefix(JS)) m.Cmd(cmd, mdb.CREATE, VUE, m.Prefix(JS)) m.Cmd(cmd, mdb.CREATE, JS, m.Prefix(JS)) + m.Cmd(cmd, mdb.CREATE, TS, m.Prefix(JS)) } LoadPlug(m, JS) }}, diff --git a/data.go b/data.go index 422c1c95..980fa552 100644 --- a/data.go +++ b/data.go @@ -8,6 +8,9 @@ import ( "shylinux.com/x/toolkits/miss" ) +func (m *Message) ActionKey() string { + return strings.TrimSuffix(strings.TrimPrefix(m._sub, PS), PS) +} func (m *Message) CommandKey() string { return strings.TrimSuffix(strings.TrimPrefix(m._key, PS), PS) } diff --git a/misc.go b/misc.go index f2bc263a..9119816b 100644 --- a/misc.go +++ b/misc.go @@ -251,14 +251,14 @@ func (c *Context) cmd(m *Message, cmd *Command, key string, arg ...string) *Mess } return m } -func (c *Context) _cmd(m *Message, cmd *Command, key string, k string, h *Action, arg ...string) *Message { +func (c *Context) _cmd(m *Message, cmd *Command, key string, sub string, h *Action, arg ...string) *Message { if h.Hand == nil { m.Cmdy(kit.Split(h.Name), arg) return m } - m.Log(LOG_CMDS, "%s.%s %s %d %v %s", c.Name, key, k, len(arg), arg, kit.FileLine(h.Hand, 3)) - if len(h.List) > 0 && k != "search" { + m.Log(LOG_CMDS, "%s.%s %s %d %v %s", c.Name, key, sub, len(arg), arg, kit.FileLine(h.Hand, 3)) + if m._sub = sub; len(h.List) > 0 && sub != "search" { order := false for i, v := range h.List { name := kit.Format(kit.Value(v, kit.MDB_NAME)) diff --git a/misc/tmux/session.go b/misc/tmux/session.go index aeef5ff5..4d41eec4 100644 --- a/misc/tmux/session.go +++ b/misc/tmux/session.go @@ -90,7 +90,7 @@ func init() { m.Cmdy(cli.SYSTEM, TMUX, "split-window", "-t", kit.Keys(name, "2"), "-h") m.Cmd(cli.SYSTEM, TMUX, "send-keys", "-t", kit.Keys(name, "3"), "ish_miss_log", "Enter") - m.Cmd(cli.SYSTEM, TMUX, "send-keys", "-t", kit.Keys(name, "2"), "ish_miss_space dev ops") + m.Cmd(cli.SYSTEM, TMUX, "send-keys", "-t", kit.Keys(name, "2"), "ish_miss_space", "Enter") m.Cmd(cli.SYSTEM, TMUX, "send-keys", "-t", kit.Keys(name, "1"), "vi etc/miss.sh", "Enter") m.Cmdy(cli.SYSTEM, TMUX, "link-window", "-s", name, "-t", "miss:") diff --git a/type.go b/type.go index afced762..e6aa2623 100644 --- a/type.go +++ b/type.go @@ -251,6 +251,7 @@ type Message struct { target *Context _cmd *Command _key string + _sub string cb func(*Message) *Message W http.ResponseWriter