From fa158fa9ac9437ce79b4ab3780e49bb59c3bdb9e Mon Sep 17 00:00:00 2001 From: shy Date: Sun, 7 Jan 2024 17:46:10 +0800 Subject: [PATCH] opt some --- base/web/dream.go | 13 +++++++------ core/code/vimer.go | 2 +- misc/ssh/relay/relay.go | 12 ++++++++++-- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/base/web/dream.go b/base/web/dream.go index 8a0425d7..e78f6a71 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -233,15 +233,16 @@ func init() { PUBLISH: {Name: "publish name", Help: "发布", Icon: "bi bi-send-check", Hand: func(m *ice.Message, arg ...string) { defer ToastProcess(m)() m.Cmd(CODE_AUTOGEN, "binpack") + list := []string{cli.LINUX, cli.DARWIN, cli.WINDOWS} msg := m.Spawn(ice.Maps{ice.MSG_DAEMON: ""}) - PushNoticeRich(m, mdb.NAME, ice.Info.NodeName, msg.Cmd(CODE_COMPILE, cli.LINUX, cli.AMD64).AppendSimple()) - PushNoticeRich(m, mdb.NAME, ice.Info.NodeName, msg.Cmd(CODE_COMPILE, cli.DARWIN, cli.AMD64).AppendSimple()) - PushNoticeRich(m, mdb.NAME, ice.Info.NodeName, msg.Cmd(CODE_COMPILE, cli.WINDOWS, cli.AMD64).AppendSimple()) + kit.For(list, func(goos string) { + PushNoticeRich(m, mdb.NAME, ice.Info.NodeName, msg.Cmd(CODE_COMPILE, goos, cli.AMD64).AppendSimple()) + }) DreamEach(m, m.Option(mdb.NAME), "", func(name string) { m.Cmd(SPACE, name, CODE_AUTOGEN, "binpack") - PushNoticeRich(m, mdb.NAME, name, msg.Cmd(SPACE, name, CODE_COMPILE, cli.LINUX, cli.AMD64).AppendSimple()) - PushNoticeRich(m, mdb.NAME, name, msg.Cmd(SPACE, name, CODE_COMPILE, cli.DARWIN, cli.AMD64).AppendSimple()) - PushNoticeRich(m, mdb.NAME, name, msg.Cmd(SPACE, name, CODE_COMPILE, cli.WINDOWS, cli.AMD64).AppendSimple()) + kit.For(list, func(goos string) { + PushNoticeRich(m, mdb.NAME, name, msg.Cmd(SPACE, name, CODE_COMPILE, goos, cli.AMD64).AppendSimple()) + }) }) m.ProcessHold() }}, diff --git a/core/code/vimer.go b/core/code/vimer.go index 6098e335..f0a320f1 100644 --- a/core/code/vimer.go +++ b/core/code/vimer.go @@ -214,7 +214,7 @@ func init() { }, chat.FavorAction(), ctx.ConfAction(ctx.TOOLS, "xterm,compile,runtime")), Hand: func(m *ice.Message, arg ...string) { if m.Cmdy(INNER, arg); arg[0] != ctx.ACTION { if web.IsLocalHost(m) { - m.Action(nfs.SAVE, COMPILE, mdb.SHOW, cli.EXEC, ice.APP) + m.Action(nfs.SAVE, COMPILE, mdb.SHOW, ice.APP) } else { m.Action(nfs.SAVE, COMPILE, mdb.SHOW) } diff --git a/misc/ssh/relay/relay.go b/misc/ssh/relay/relay.go index 611a68fd..c0e7a347 100644 --- a/misc/ssh/relay/relay.go +++ b/misc/ssh/relay/relay.go @@ -294,13 +294,21 @@ func (s relay) Install(m *ice.Message, arg ...string) { } func (s relay) Upgrade(m *ice.Message, arg ...string) { if len(arg) == 0 && (m.Option(MACHINE) == "" || strings.Contains(m.Option(MACHINE), ",")) { - s.ForFlow(m.Options(ice.CMD, m.Template(UPGRADE_SH), cli.INTERVAL, "3s")) + s.foreach(m, func(msg *ice.Message, cmd []string) { + ssh.PushShell(msg.Message, strings.Split(msg.Template(UPGRADE_SH), lex.NL), func(res string) { + web.PushNoticeGrow(m.Options(ctx.DISPLAY, web.PLUGIN_XTERM).Message, res) + }) + }) } else { s.shell(m, m.Template(UPGRADE_SH), arg...) } } func (s relay) Version(m *ice.Message, arg ...string) { - s.ForFlow(m.Options(ice.CMD, m.Template(VERSION_SH))) + s.foreach(m, func(msg *ice.Message, cmd []string) { + ssh.PushShell(msg.Message, strings.Split(msg.Template(VERSION_SH), lex.NL), func(res string) { + web.PushNoticeGrow(m.Options(ctx.DISPLAY, web.PLUGIN_XTERM).Message, res) + }) + }) } func (s relay) AdminCmd(m *ice.Message, arg ...string) { s.shell(m, s.admins(m, m.Option(ice.CMD)), arg...)