From da00105d340d2904f9724a4561f89c5e406e110d Mon Sep 17 00:00:00 2001 From: shaoying Date: Wed, 25 Mar 2020 22:31:49 +0800 Subject: [PATCH] opt some --- go.sum | 2 ++ misc/vim/vim.go | 6 +++--- misc/zsh/zsh.go | 21 +++++++-------------- template.sh | 12 ++++++------ 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/go.sum b/go.sum index d45f1445..11d0ea3b 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,8 @@ github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvK github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/shylinux/toolkits v0.1.3 h1:bqxmbPFBKkOpv9uEb4bbeeovowsiBK7zDrPrQMUDlSc= github.com/shylinux/toolkits v0.1.3/go.mod h1:Y68Ot6xOmo1bun67YvqC3chDGeU2gDxtsUnvVDGJm4g= +github.com/shylinux/toolkits v0.1.4 h1:GW7rRFOSww56x+rUfH0/tho3+FaErxz5+5RwlA8oWnk= +github.com/shylinux/toolkits v0.1.4/go.mod h1:Y68Ot6xOmo1bun67YvqC3chDGeU2gDxtsUnvVDGJm4g= github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086 h1:RYiqpb2ii2Z6J4x0wxK46kvPBbFuZcdhS+CIztmYgZs= github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086/go.mod h1:PLPIyL7ikehBD1OAjmKKiOEhbvWyHGaNDjquXMcYABo= golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ= diff --git a/misc/vim/vim.go b/misc/vim/vim.go index 47635b2c..dd497c63 100644 --- a/misc/vim/vim.go +++ b/misc/vim/vim.go @@ -25,7 +25,7 @@ var Index = &ice.Context{Name: "vim", Help: "编辑器", } } - m.Option("you", "") + m.Option("you", "tmux") m.Richs("login", nil, m.Option("sid"), func(key string, value map[string]interface{}) { // 查找空间 m.Option("you", value["you"]) @@ -50,7 +50,7 @@ var Index = &ice.Context{Name: "vim", Help: "编辑器", cmds := []string{ice.WEB_FAVOR, m.Conf("vim", "meta.history"), "vimrc", arg[0], kit.Select(m.Option("arg"), m.Option("sub")), "sid", m.Option("sid"), "pwd", m.Option("pwd"), "buf", m.Option("buf"), "row", m.Option("row"), "col", m.Option("col")} if m.Cmd(cmds); m.Option("you") != "" { - m.Cmd(ice.WEB_SPACE, m.Option("you"), cmds) + m.Cmd(ice.WEB_PROXY, m.Option("you"), cmds) } default: m.Richs("login", nil, m.Option("sid"), func(key string, value map[string]interface{}) { @@ -94,7 +94,7 @@ var Index = &ice.Context{Name: "vim", Help: "编辑器", } // 查看收藏 - m.Cmd(ice.WEB_SPACE, m.Option("you"), ice.WEB_FAVOR, m.Option("tab"), "extra", "extra.pwd", "extra.buf", "extra.row", "extra.col").Table(func(index int, value map[string]string, head []string) { + m.Cmd(ice.WEB_PROXY, m.Option("you"), ice.WEB_FAVOR, m.Option("tab"), "extra", "extra.pwd", "extra.buf", "extra.row", "extra.col").Table(func(index int, value map[string]string, head []string) { switch value["type"] { case ice.TYPE_VIMRC: m.Echo("%v\n", m.Option("tab")).Echo("%v:%v:%v:(%v): %v\n", diff --git a/misc/zsh/zsh.go b/misc/zsh/zsh.go index e7393f07..7a55a96f 100644 --- a/misc/zsh/zsh.go +++ b/misc/zsh/zsh.go @@ -26,18 +26,11 @@ var Index = &ice.Context{Name: "zsh", Help: "命令行", } } - m.Option("you", "") + m.Option("you", "tmux") m.Richs("login", nil, m.Option("sid"), func(key string, value map[string]interface{}) { // 查找空间 m.Option("you", value["you"]) }) - if m.Option("you") == "" { - m.Cmd("web.code.tmux.session").Table(func(index int, value map[string]string, head []string) { - if value["tag"] == "1" { - m.Option("you", value["session"]) - } - }) - } m.Info("%s %s cmd: %v sub: %v", m.Option("you"), m.Option(ice.MSG_USERURL), m.Optionv("cmds"), m.Optionv("sub")) m.Option(ice.MSG_OUTPUT, ice.RENDER_RESULT) @@ -61,7 +54,7 @@ var Index = &ice.Context{Name: "zsh", Help: "命令行", "sid", m.Option("sid"), "pwd", m.Option("pwd"), "time", vs[1] + " " + vs[2]} if m.Cmd(cmds); m.Option("you") != "" { - m.Cmd(ice.WEB_SPACE, m.Option("you"), cmds) + m.Cmd(ice.WEB_PROXY, m.Option("you"), cmds) } default: m.Richs("login", nil, m.Option("sid"), func(key string, value map[string]interface{}) { @@ -168,13 +161,13 @@ var Index = &ice.Context{Name: "zsh", Help: "命令行", if m.Option("tab") == "" { // 收藏列表 - m.Cmdy(ice.WEB_SPACE, m.Option("you"), ice.WEB_FAVOR) + m.Cmdy(ice.WEB_PROXY, m.Option("you"), ice.WEB_FAVOR) m.Table() return } m.Echo("#/bin/sh\n\n") - m.Cmd(ice.WEB_SPACE, m.Option("you"), ice.WEB_FAVOR, m.Option("tab")).Table(func(index int, value map[string]string, head []string) { + m.Cmd(ice.WEB_PROXY, m.Option("you"), ice.WEB_FAVOR, m.Option("tab")).Table(func(index int, value map[string]string, head []string) { switch value["type"] { case ice.TYPE_SHELL: // 查看收藏 @@ -188,7 +181,7 @@ var Index = &ice.Context{Name: "zsh", Help: "命令行", "/download": {Name: "/download", Help: "下载", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { if len(arg) == 0 || arg[0] == "" { // 文件列表 - m.Cmdy(ice.WEB_SPACE, m.Option("you"), ice.WEB_STORY) + m.Cmdy(ice.WEB_PROXY, m.Option("you"), ice.WEB_STORY) m.Table() return } @@ -196,7 +189,7 @@ var Index = &ice.Context{Name: "zsh", Help: "命令行", // 查找文件 if m.Cmdy(ice.WEB_STORY, "index", arg[0]).Append("text") == "" && m.Option("you") != "" { // 上发文件 - m.Cmd(ice.WEB_SPACE, m.Option("you"), ice.WEB_STORY, "push", arg[0], "dev", arg[0]) + m.Cmd(ice.WEB_PROXY, m.Option("you"), ice.WEB_STORY, "push", arg[0], "dev", arg[0]) m.Cmdy(ice.WEB_STORY, "index", arg[0]) } @@ -214,7 +207,7 @@ var Index = &ice.Context{Name: "zsh", Help: "命令行", if m.Option("you") != "" { // 下发文件 - m.Cmd(ice.WEB_SPACE, m.Option("you"), ice.WEB_STORY, ice.STORY_PULL, msg.Append("name"), "dev", msg.Append("name")) + m.Cmd(ice.WEB_PROXY, m.Option("you"), ice.WEB_STORY, ice.STORY_PULL, msg.Append("name"), "dev", msg.Append("name")) } }}, }, diff --git a/template.sh b/template.sh index c5cebcde..35d80913 100755 --- a/template.sh +++ b/template.sh @@ -16,13 +16,13 @@ title "${ice_mod}" field "自动化" favor -field "启动流程" favor args `[ 启动流程 ]` -field "请求响应" favor args `[ 请求响应 ]` -field "服务集群" favor args `[ 服务集群 ]` +field "启动流程" favor args "启动流程" +field "请求响应" favor args "请求响应" +field "服务集群" favor args "服务集群" -field "数据结构" favor args `[ 数据结构 ]` -field "系统架构" favor args `[ 系统架构 ]` -field "编译原理" favor args `[ 编译原理 ]` +field "数据结构" favor args "数据结构" +field "系统架构" favor args "系统架构" +field "编译原理" favor args "编译原理" END [ -d src ] || mkdir src