From ed8a41785169c94b906ecef2efa8557eb5b36276 Mon Sep 17 00:00:00 2001
From: shylinux <shylinux@163.com>
Date: Sat, 22 Jul 2023 16:55:08 +0800
Subject: [PATCH] opt some

---
 base/cli/procinfo.go | 4 ++--
 core/code/compile.go | 6 +++++-
 misc.go              | 7 ++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/base/cli/procinfo.go b/base/cli/procinfo.go
index 19fd4787..b1a910f9 100644
--- a/base/cli/procinfo.go
+++ b/base/cli/procinfo.go
@@ -12,14 +12,14 @@ import (
 
 func init() {
 	Index.MergeCommands(ice.Commands{
-		PROCINFO: {Name: "procinfo PID auto filter:text monitor docker", Help: "进程列表", Actions: ice.MergeActions(ice.Actions{
+		PROCINFO: {Name: "procinfo PID auto filter:text terminal monitor docker", Help: "进程列表", Actions: ice.MergeActions(ice.Actions{
 			PROCKILL:   {Help: "结束进程", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(gdb.SIGNAL, gdb.STOP, m.Option("PID")).ProcessRefresh() }},
 			"terminal": {Help: "终端", Hand: func(m *ice.Message, arg ...string) { Opens(m, "Terminal.app") }},
 			"monitor":  {Help: "监控", Hand: func(m *ice.Message, arg ...string) { Opens(m, "Activity Monitor.app") }},
 			"docker":   {Help: "容器", Hand: func(m *ice.Message, arg ...string) { Opens(m, "Docker Desktop.app") }},
 		}), Hand: func(m *ice.Message, arg ...string) {
 			if len(arg) == 0 || arg[0] == "" {
-				m.Split(m.Cmdx(SYSTEM, "ps", "u")).PushAction(PROCKILL).Sort("COMMAND").StatusTimeCount(m.Cmd(RUNTIME, HOSTINFO).AppendSimple("nCPU,MemTotal,MemFree"))
+				m.Split(m.Cmdx(SYSTEM, "ps", "u")).Sort("COMMAND").PushAction(PROCKILL).StatusTimeCount(m.Cmd(RUNTIME, HOSTINFO).AppendSimple("nCPU,MemTotal,MemFree"))
 				return
 			}
 			m.OptionFields(mdb.DETAIL)
diff --git a/core/code/compile.go b/core/code/compile.go
index a906de7f..5f2c0707 100644
--- a/core/code/compile.go
+++ b/core/code/compile.go
@@ -80,7 +80,11 @@ func init() {
 			kit.If(runtime.GOOS == cli.WINDOWS, func() { env = append(env, "GOPATH", kit.HomePath(GO), "GOCACHE", kit.HomePath("go/go-build")) })
 			m.Options(cli.CMD_ENV, env).Cmd(AUTOGEN, VERSION)
 			defer m.StatusTime(VERSION, strings.TrimPrefix(m.Cmdx(cli.SYSTEM, GO, VERSION), "go version"))
-			kit.If(!strings.Contains(m.Cmdx(nfs.CAT, ice.GO_MOD), "shylinux.com/x/ice"), func() { m.Cmd(cli.SYSTEM, GO, "get", "shylinux.com/x/ice") })
+			kit.For([]string{"shylinux.com/x/ice"}, func(p string) {
+				kit.If(!strings.Contains(m.Cmdx(nfs.CAT, ice.GO_MOD), p), func() {
+					m.Cmd(cli.SYSTEM, GO, "get", p)
+				})
+			})
 			if msg := m.Cmd(cli.SYSTEM, GO, cli.BUILD, "-ldflags", "-w -s", "-o", file, main, ice.SRC_VERSION_GO, ice.SRC_BINPACK_GO); !cli.IsSuccess(msg) {
 				m.Copy(msg)
 				return
diff --git a/misc.go b/misc.go
index e31aab84..d6b3ecfe 100644
--- a/misc.go
+++ b/misc.go
@@ -33,18 +33,19 @@ func (m *Message) Split(str string, arg ...string) *Message {
 					}
 				}
 			}
+			kit.For(fields, func(i int, v string) { fields[i] = strings.TrimPrefix(strings.TrimSpace(v), "%") })
 			continue
 		}
 		if len(indexs) > 0 {
 			for i, v := range indexs {
 				if v >= len(l) {
-					m.Push(strings.TrimSpace(kit.Select(SP, fields, i)), "")
+					m.Push(kit.Select(SP, fields, i), "")
 					continue
 				}
 				if i == len(indexs)-1 {
-					m.Push(strings.TrimSpace(kit.Select(SP, fields, i)), strings.TrimSpace(l[v:]))
+					m.Push(kit.Select(SP, fields, i), strings.TrimSpace(l[v:]))
 				} else {
-					m.Push(strings.TrimSpace(kit.Select(SP, fields, i)), strings.TrimSpace(l[v:indexs[i+1]]))
+					m.Push(kit.Select(SP, fields, i), strings.TrimSpace(l[v:indexs[i+1]]))
 				}
 			}
 			continue