From 307c1edb5dc1de5dd51e4e974194a5dc75b55d46 Mon Sep 17 00:00:00 2001 From: shy Date: Fri, 5 Jan 2024 14:26:23 +0800 Subject: [PATCH] opt some --- base/web/dream.go | 17 ++++++++++------- base/web/option.go | 6 ++---- misc/git/repos.go | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/base/web/dream.go b/base/web/dream.go index 8709ed93..830a3155 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -73,7 +73,7 @@ func _dream_start(m *ice.Message, name string) { cli.CTX_OPS, Domain(tcp.LOCALHOST, m.Cmdv(SERVE, tcp.PORT)), cli.CTX_LOG, ice.VAR_LOG_BOOT_LOG, cli.CTX_PID, ice.VAR_LOG_ICE_PID, cli.CTX_ROOT, kit.Path(""), cli.PATH, cli.BinPath(p, ""), cli.USER, ice.Info.Username, )...), cli.CMD_OUTPUT, path.Join(p, ice.VAR_LOG_BOOT_LOG), mdb.CACHE_CLEAR_ONEXIT, ice.TRUE) - gdb.Event(m, DREAM_CREATE, m.OptionSimple(mdb.NAME, mdb.TYPE)) + gdb.Event(m, DREAM_CREATE, m.OptionSimple(mdb.NAME, mdb.TYPE, cli.CMD_DIR)) // if m.Option(nfs.BINARY) == "" && os.Getenv(cli.CTX_DEV) != "" && os.Getenv(cli.CTX_POD) != "" { // m.Option(nfs.BINARY, os.Getenv(cli.CTX_DEV)+S(os.Getenv(cli.CTX_POD))) // } @@ -234,20 +234,23 @@ func init() { m.Sleep3s().Cmdy(ROUTE, cli.BUILD).ProcessInner() }}, 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") - PushNoticeRich(m, mdb.NAME, ice.Info.NodeName, m.Cmd(CODE_COMPILE, cli.LINUX, cli.AMD64).AppendSimple()) - PushNoticeRich(m, mdb.NAME, ice.Info.NodeName, m.Cmd(CODE_COMPILE, cli.DARWIN, cli.AMD64).AppendSimple()) - PushNoticeRich(m, mdb.NAME, ice.Info.NodeName, m.Cmd(CODE_COMPILE, cli.WINDOWS, cli.AMD64).AppendSimple()) + 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()) DreamEach(m, m.Option(mdb.NAME), "", func(name string) { m.Cmd(SPACE, name, CODE_AUTOGEN, "binpack") - PushNoticeRich(m, mdb.NAME, name, m.Cmd(SPACE, name, CODE_COMPILE, cli.LINUX, cli.AMD64).AppendSimple()) - PushNoticeRich(m, mdb.NAME, name, m.Cmd(SPACE, name, CODE_COMPILE, cli.DARWIN, cli.AMD64).AppendSimple()) - PushNoticeRich(m, mdb.NAME, name, m.Cmd(SPACE, name, CODE_COMPILE, cli.WINDOWS, cli.AMD64).AppendSimple()) + 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()) }) m.ProcessHold() }}, FOR_FLOW: {Name: "forFlow cmd*='sh etc/miss.sh'", Help: "流程", Icon: "bi bi-terminal", Hand: func(m *ice.Message, arg ...string) { m.Options(ctx.DISPLAY, PLUGIN_XTERM, cli.CMD_OUTPUT, nfs.NewWriteCloser(func(buf []byte) (int, error) { + m.Option(ice.MSG_COUNT, "0") PushNoticeGrow(m, strings.ReplaceAll(string(buf), lex.NL, "\r\n")) return len(buf), nil }, func() error { return nil })) diff --git a/base/web/option.go b/base/web/option.go index d4ca5289..6fd00868 100644 --- a/base/web/option.go +++ b/base/web/option.go @@ -91,13 +91,11 @@ func PushImages(m *ice.Message, name string) { } func PushNotice(m *ice.Message, arg ...ice.Any) { opts := ice.Map{ice.MSG_OPTION: []string{}, ice.MSG_OPTS: []string{}} - kit.For([]string{ctx.DISPLAY, ctx.STYLE, "delay", ice.LOG_DEBUG, ice.LOG_TRACEID}, func(key string) { + kit.For([]string{ctx.DISPLAY, ctx.STYLE, cli.DELAY, ice.LOG_DEBUG, ice.LOG_TRACEID}, func(key string) { opts[ice.MSG_OPTION] = kit.Simple(opts[ice.MSG_OPTION], key) opts[key] = m.Option(key) }) - if m.Option(ice.MSG_DAEMON) == "" { - return - } else { + if m.Option(ice.MSG_DAEMON) != "" { m.Cmd(SPACE, m.Option(ice.MSG_DAEMON), arg, opts) } } diff --git a/misc/git/repos.go b/misc/git/repos.go index e942d80c..cbc4ee44 100644 --- a/misc/git/repos.go +++ b/misc/git/repos.go @@ -612,7 +612,7 @@ func init() { kit.If(m.Option(REPOS), func(p string) { p = strings.Split(p, mdb.QS)[0] kit.If(!strings.Contains(p, "://"), func() { p = kit.MergeURL2(web.UserHost(m), web.X(p)) }) - kit.If(ice.Info.System == cli.LINUX, func() { p = strings.Replace(p, ice.HTTPS, ice.HTTP, 1) }) + // kit.If(ice.Info.System == cli.LINUX, func() { p = strings.Replace(p, ice.HTTPS, ice.HTTP, 1) }) m.Cmd("", CLONE, ORIGIN, p, nfs.PATH, m.Option(cli.CMD_DIR), ice.Maps{cli.CMD_DIR: ""}) }) }},