From b16071324cadec6ab739e6428e24a0cb901f583a Mon Sep 17 00:00:00 2001 From: harveyshao Date: Fri, 6 Aug 2021 22:20:38 +0800 Subject: [PATCH] opt some --- base/ctx/command.go | 2 +- core/chat/cmd.go | 10 +++++----- core/chat/pod.go | 16 +++++----------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/base/ctx/command.go b/base/ctx/command.go index 866db0dc..73e5a28b 100644 --- a/base/ctx/command.go +++ b/base/ctx/command.go @@ -25,7 +25,7 @@ func _command_list(m *ice.Message, name string) { // 命令详情 m.Spawn(m.Source()).Search(name, func(p *ice.Context, s *ice.Context, key string, cmd *ice.Command) { - m.Push(kit.MDB_INDEX, s.Cap(ice.CTX_FOLLOW)) + m.Push(kit.MDB_INDEX, kit.Keys(s.Cap(ice.CTX_FOLLOW), key)) m.Push(kit.MDB_NAME, kit.Format(cmd.Name)) m.Push(kit.MDB_HELP, kit.Format(cmd.Help)) m.Push(kit.MDB_META, kit.Formats(cmd.Meta)) diff --git a/core/chat/cmd.go b/core/chat/cmd.go index 2abb5542..c12febfb 100644 --- a/core/chat/cmd.go +++ b/core/chat/cmd.go @@ -13,7 +13,7 @@ import ( ) func _cmd_render(m *ice.Message, cmd string, args ...interface{}) { - list := []interface{}{kit.Dict("index", cmd, "args", args)} + list := []interface{}{kit.Dict("index", cmd, "args", kit.Simple(args))} m.RenderResult(kit.Format(m.Conf(CMD, kit.Keym(kit.MDB_TEMPLATE)), kit.Format(list))) } @@ -36,24 +36,24 @@ func init() { }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { if strings.HasSuffix(m.R.URL.Path, "/") { - m.RenderIndex(web.SERVE, ice.VOLCANOS) + m.RenderIndex(web.SERVE, ice.VOLCANOS, "page/cmd.html") return // 目录 } if msg := m.Cmd(ctx.COMMAND, arg[0]); msg.Append("meta") != "" { - _cmd_render(m, arg[0]) + _cmd_render(m, arg[0], arg[1:]) return // 命令 } switch p := path.Join(m.Conf(CMD, kit.META_PATH), path.Join(arg...)); kit.Ext(p) { case "svg": _cmd_render(m, "web.wiki.draw", path.Dir(p)+"/", path.Base(p)) + case "csv": + _cmd_render(m, "web.wiki.data", p) case "json": _cmd_render(m, "web.wiki.json", p) case "shy": _cmd_render(m, "web.wiki.word", p) - case "csv": - _cmd_render(m, "web.wiki.data", p) case "go", "mod", "sum": _cmd_render(m, "web.code.inner", path.Dir(p)+"/", path.Base(p)) default: diff --git a/core/chat/pod.go b/core/chat/pod.go index 97e76130..66180b65 100644 --- a/core/chat/pod.go +++ b/core/chat/pod.go @@ -26,21 +26,15 @@ func init() { m.Cmdy(arg) }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + if kit.Select("", arg, 0) == "" { + _cmd_render(m, web.ROUTE) + return + } m.RenderIndex(web.SERVE, ice.VOLCANOS) }}, }, Configs: map[string]*ice.Config{ - POD: {Name: POD, Help: "节点", Value: kit.Data( - kit.MDB_PATH, "./", kit.MDB_INDEX, "page/cmd.html", kit.MDB_TEMPLATE, ` - - - - - - - -`, - )}, + POD: {Name: POD, Help: "节点", Value: kit.Data()}, }, }) }