From a1e8ce22c834a0301c94a8659ca2a75148364adb Mon Sep 17 00:00:00 2001 From: shy Date: Sat, 24 Feb 2024 14:30:05 +0800 Subject: [PATCH] add some --- base/web/dream.go | 2 +- base/web/space.go | 2 +- exec.go | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/base/web/dream.go b/base/web/dream.go index dd8b8628..4989e9cf 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -341,7 +341,7 @@ func init() { }}, FOR_FLOW: {Name: "forFlow name 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) { - PushNoticeGrow(m.Options(ice.MSG_COUNT, "0", ice.LOG_DISABLE, ice.TRUE, "space.noecho", ice.TRUE), strings.ReplaceAll(string(buf), lex.NL, "\r\n")) + PushNoticeGrow(m.Options(ice.MSG_COUNT, "0", ice.LOG_DEBUG, ice.FALSE), strings.ReplaceAll(string(buf), lex.NL, "\r\n")) return len(buf), nil }, nil)) msg := m.Spawn(ice.Maps{ice.MSG_DEBUG: ice.FALSE}) diff --git a/base/web/space.go b/base/web/space.go index e239cccf..c6904012 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -188,7 +188,7 @@ func _space_echo(m *ice.Message, source, target []string, c *websocket.Conn) { defer func() { m.WarnNotValid(recover()) }() if m.Options(ice.MSG_SOURCE, source, ice.MSG_TARGET, target[1:]); !m.WarnNotValid(c.WriteMessage(1, []byte(m.FormatMeta()))) { if source != nil { - m.Log(tcp.SEND, "%v->%v %v %v", source, target, m.Detailv(), m.FormatsMeta(nil)) + m.Log(tcp.SEND, "%v->%v %v %v", source, target, kit.ReplaceAll(kit.Format("%v", m.Detailv()), "\r\n", "\\r\\n", "\t", "\\t", "\n", "\\n"), m.FormatsMeta(nil)) } } } diff --git a/exec.go b/exec.go index 156a5af5..529eddd4 100644 --- a/exec.go +++ b/exec.go @@ -118,9 +118,9 @@ func (m *Message) CmdHand(cmd *Command, key string, arg ...string) *Message { return m } if m._target = cmd.FileLines(); key == SELECT { - m.Log(LOG_CMDS, "%s.%s %d %v %v", m.Target().Name, key, len(arg), arg, m.Optionv(MSG_FIELDS), logs.FileLineMeta(m._fileline())) + m.Log(LOG_CMDS, "%s.%s %v %v", m.Target().Name, key, formatArg(arg...), m.Optionv(MSG_FIELDS), logs.FileLineMeta(m._fileline())) } else { - m.Log(LOG_CMDS, "%s.%s %d %v", m.Target().Name, key, len(arg), arg, logs.FileLineMeta(m._fileline())) + m.Log(LOG_CMDS, "%s.%s %v", m.Target().Name, key, formatArg(arg...), logs.FileLineMeta(m._fileline())) } if cmd.Hand != nil { cmd.Hand(m, arg...) @@ -237,10 +237,13 @@ func (c *Context) _action(m *Message, cmd *Command, key string, sub string, h *A } } m._target = kit.Select(logs.FileLine(h.Hand), cmd.FileLines(), cmd.RawHand != nil) - m.Log(LOG_CMDS, "%s.%s %s %d %v", c.Name, key, sub, len(arg), arg, logs.FileLineMeta(m._fileline())) + m.Log(LOG_CMDS, "%s.%s %s %v", c.Name, key, sub, formatArg(arg...), logs.FileLineMeta(m._fileline())) h.Hand(m, arg...) return m } +func formatArg(arg ...string) string { + return kit.Format("%d %v", len(arg), kit.ReplaceAll(kit.Format("%v", arg), "\r\n", "\\r\\n", "\t", "\\t", "\n", "\\n")) +} func (c *Command) FileLines() string { return kit.Join(kit.Slice(kit.Split(c.FileLine(), PS), -3), PS) }