From 42b45ba0b7dbe71f584e1d40eb4510db5d8ab8b4 Mon Sep 17 00:00:00 2001 From: shy Date: Thu, 15 Feb 2024 16:37:17 +0800 Subject: [PATCH] add some --- base/cli/runtime.go | 7 +------ base/web/dream.go | 4 ++-- base/web/space.go | 5 ++++- conf.go | 1 + misc/git/status.go | 9 ++++++++- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/base/cli/runtime.go b/base/cli/runtime.go index 7f64cc7b..e548af73 100644 --- a/base/cli/runtime.go +++ b/base/cli/runtime.go @@ -180,7 +180,7 @@ const RUNTIME = "runtime" func init() { Index.MergeCommands(ice.Commands{ - RUNTIME: {Name: "runtime info=bootinfo,ifconfig,diskinfo,hostinfo,userinfo,bootinfo,role,api,cli,cmd,mod,env,path,chain auto upgrade reboot stash lock", Icon: "Infomation.png", Help: "运行环境", Actions: ice.MergeActions(ice.Actions{ + RUNTIME: {Name: "runtime info=bootinfo,ifconfig,diskinfo,hostinfo,userinfo,bootinfo,role,api,cli,cmd,mod,env,path,chain auto upgrade reboot lock", Icon: "Infomation.png", Help: "运行环境", Actions: ice.MergeActions(ice.Actions{ ice.CTX_INIT: {Hand: func(m *ice.Message, arg ...string) { _runtime_init(m); aaa.White(m, ice.LICENSE) }}, IFCONFIG: {Hand: func(m *ice.Message, arg ...string) { m.Cmdy(tcp.HOST) }}, DISKINFO: {Hand: func(m *ice.Message, arg ...string) { _runtime_diskinfo(m) }}, @@ -245,11 +245,6 @@ func init() { REBOOT: {Help: "重启", Icon: "bi bi-bootstrap-reboot", Hand: func(m *ice.Message, arg ...string) { m.Go(func() { m.Sleep30ms(ice.EXIT, 1) }) }}, - STASH: {Help: "清空", Icon: "bi bi-trash", Hand: func(m *ice.Message, arg ...string) { - m.Cmd(SYSTEM, "git", STASH) - m.Cmd(SYSTEM, "git", "checkout", ".") - m.Go(func() { m.Sleep30ms(ice.QUIT, 1) }) - }}, "lock": {Help: "锁屏", Icon: "bi bi-file-lock", Hand: func(m *ice.Message, arg ...string) { switch runtime.GOOS { case DARWIN: diff --git a/base/web/dream.go b/base/web/dream.go index 2dfee5a3..6eacdd67 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -310,8 +310,8 @@ func init() { }) }}, cli.BUILD: {Name: "build name", Hand: func(m *ice.Message, arg ...string) { + m.Option(ice.MSG_TITLE, kit.Keys(m.Option(ice.MSG_USERPOD0), m.Option(ice.MSG_USERPOD), m.CommandKey(), m.ActionKey())) compile := cli.SystemFind(m, "go") != "" - m.Option(ice.MSG_TITLE, kit.Keys(m.Option(ice.MSG_USERPOD), m.CommandKey(), m.ActionKey())) m.Cmd("", FOR_FLOW, m.Option(mdb.NAME), kit.JoinWord(cli.SH, ice.ETC_MISS_SH), func(p string) bool { if compile && nfs.Exists(m, path.Join(p, ice.SRC_MAIN_GO)) { return false @@ -323,7 +323,7 @@ func init() { kit.If(m.Option(mdb.NAME) == "", func() { m.Sleep3s().Cmdy(ROUTE, cli.BUILD).ProcessInner() }) }}, PUBLISH: {Name: "publish name", Help: "发布", Icon: "bi bi-send-check", Hand: func(m *ice.Message, arg ...string) { - m.Option(ice.MSG_TITLE, kit.Keys(m.Option(ice.MSG_USERPOD), m.CommandKey(), m.ActionKey())) + m.Option(ice.MSG_TITLE, kit.Keys(m.Option(ice.MSG_USERPOD0), m.Option(ice.MSG_USERPOD), m.CommandKey(), m.ActionKey())) defer ToastProcess(m)() list := []string{cli.LINUX, cli.DARWIN, cli.WINDOWS} msg := m.Spawn(ice.Maps{ice.MSG_DAEMON: ""}) diff --git a/base/web/space.go b/base/web/space.go index 6ed94bb4..d677a135 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -205,7 +205,10 @@ func _space_send(m *ice.Message, name string, arg ...string) (h string) { if target := kit.Split(name, nfs.PT, nfs.PT); !mdb.HashSelectDetail(m, target[0], func(value ice.Map) { if c, ok := value[mdb.TARGET].(*websocket.Conn); !m.WarnNotValid(!ok, mdb.TARGET) { kit.If(kit.Format(value[mdb.TYPE]) == MASTER, func() { - m.Options(ice.MSG_USERWEB, value[mdb.TEXT], ice.MSG_USERPOD, "", ice.MSG_USERHOST, "") + m.Options(ice.MSG_USERWEB, value[mdb.TEXT], + ice.MSG_USERPOD, "", + ice.MSG_USERPOD0, name, + ice.MSG_USERHOST, "") }) kit.For([]string{ice.MSG_USERROLE, ice.LOG_TRACEID}, func(k string) { m.Optionv(k, m.Optionv(k)) }) kit.For(m.Optionv(ice.MSG_OPTS), func(k string) { m.Optionv(k, m.Optionv(k)) }) diff --git a/conf.go b/conf.go index 4ded58bf..9615177b 100644 --- a/conf.go +++ b/conf.go @@ -210,6 +210,7 @@ const ( // MSG MSG_USERUA = "user.ua" MSG_USERWEB = "user.web" MSG_USERPOD = "user.pod" + MSG_USERPOD0 = "user.pod0" MSG_USERHOST = "user.host" MSG_USERADDR = "user.addr" MSG_USERDATA = "user.data" diff --git a/misc/git/status.go b/misc/git/status.go index 36c4b872..e8e50dfd 100644 --- a/misc/git/status.go +++ b/misc/git/status.go @@ -23,6 +23,8 @@ const ( DIFF = "diff" INSTEADOF = "insteadof" OAUTH = "oauth" + STASH = "stash" + CHECKOUT = "checkout" ) const STATUS = "status" @@ -81,6 +83,11 @@ func init() { m.Cmd(CONFIGS, mdb.CREATE, "credential.helper", "store") m.ProcessClose() }}, + STASH: {Help: "清空", Icon: "bi bi-trash", Hand: func(m *ice.Message, arg ...string) { + m.Cmd(cli.SYSTEM, GIT, STASH) + m.Cmd(cli.SYSTEM, GIT, CHECKOUT, ".") + m.Go(func() { m.Sleep30ms(ice.QUIT, 1) }) + }}, }, web.DevTokenAction(web.ORIGIN, web.ORIGIN), ctx.ConfAction(ctx.TOOLS, "xterm,compile"), Prefix(REPOS)), Hand: func(m *ice.Message, arg ...string) { if len(arg) > 0 && arg[0] == ctx.ACTION { m.Cmdy(REPOS, arg) @@ -90,7 +97,7 @@ func init() { m.EchoInfoButton(nfs.Template(m, "init.html"), INIT) } else if len(arg) == 0 { kit.If(config != nil, func() { m.Option(aaa.EMAIL, kit.Select(mdb.Config(m, aaa.EMAIL), config.User.Email)) }) - m.Cmdy(REPOS, STATUS).Action(PULL, PUSH, INSTEADOF, mdb.DEV_REQUEST, ctx.CONFIG) + m.Cmdy(REPOS, STATUS).Action(PULL, PUSH, INSTEADOF, mdb.DEV_REQUEST, ctx.CONFIG, STASH) kit.If(!m.IsCliUA(), func() { m.Cmdy(code.PUBLISH, ice.CONTEXTS, ice.DEV) }) ctx.Toolkit(m) } else {