diff --git a/base/cli/mirrors.go b/base/cli/mirrors.go index 7ee3a04a..8efc3a3a 100644 --- a/base/cli/mirrors.go +++ b/base/cli/mirrors.go @@ -59,7 +59,7 @@ func init() { kit.If(m.Option("proxy"), func(p string) { m.Cmd(nfs.SAVE, ETC_APK_REPOS, strings.ReplaceAll(m.Cmdx(nfs.CAT, ETC_APK_REPOS), "dl-cdn.alpinelinux.org", p)) }) - m.Cmdy(SYSTEM, "apk", "update").StatusTime() + m.Cmdy(SYSTEM, "apk", "update") } }}, ALPINE: {Name: "alpine cli cmd", Hand: func(m *ice.Message, arg ...string) { IsAlpine(m, arg...) }}, diff --git a/base/cli/procstat.go b/base/cli/procstat.go index e333f804..388e2dab 100644 --- a/base/cli/procstat.go +++ b/base/cli/procstat.go @@ -90,7 +90,7 @@ func init() { m.OptionDefault(mdb.CACHE_LIMIT, mdb.Config(m, mdb.LEAST)) if mdb.PageListSelect(m, arg...); (len(arg) == 0 || arg[0] == "") && m.Length() > 0 { m.SortInt(mdb.ID).Display("/plugin/story/trend.js", "view", "折线图", "min", "0", "max", "1000", COLOR, "yellow,cyan,red,green,blue,purple,purple") - m.Status("from", m.Append(mdb.TIME), "span", kit.FmtDuration(time.Duration(kit.Time(m.Time())-kit.Time(m.Append(mdb.TIME)))), m.AppendSimple(mdb.Config(m, mdb.FIELD)), "cursor", "0") + m.StatusTime(mdb.TIME, m.Append(mdb.TIME), "span", kit.FmtDuration(time.Duration(kit.Time(m.Time())-kit.Time(m.Append(mdb.TIME)))), m.AppendSimple(mdb.Config(m, mdb.FIELD)), "cursor", "0") } }}, }) diff --git a/base/cli/runtime.go b/base/cli/runtime.go index f8030476..a4aabae6 100644 --- a/base/cli/runtime.go +++ b/base/cli/runtime.go @@ -262,7 +262,7 @@ func init() { }}, }, ctx.ConfAction("")), Hand: func(m *ice.Message, arg ...string) { kit.If(len(arg) > 0 && arg[0] == BOOTINFO, func() { arg = arg[1:] }) - m.Cmdy(ctx.CONFIG, RUNTIME, arg).Status(mdb.TIME, ice.Info.Make.Time, + m.Cmdy(ctx.CONFIG, RUNTIME, arg).StatusTime(mdb.TIME, ice.Info.Make.Time, mdb.HASH, kit.Cut(ice.Info.Hash, 6), nfs.SIZE, ice.Info.Size, mdb.NAME, ice.Info.NodeName, nfs.VERSION, ice.Info.Make.Versions(), ).Option(ice.MSG_ACTION, "") diff --git a/base/cli/system.go b/base/cli/system.go index 38a898b2..1823cd01 100644 --- a/base/cli/system.go +++ b/base/cli/system.go @@ -98,8 +98,7 @@ func _system_exec(m *ice.Message, cmd *exec.Cmd) { if e := cmd.Run(); !m.Warn(e, ice.ErrNotValid, cmd.Args) { m.Cost(CODE, _system_code(cmd), EXEC, cmd.Args) } - m.Push(mdb.TIME, m.Time()).Push(CODE, _system_code(cmd)) - m.StatusTime() + m.Push(mdb.TIME, m.Time()).Push(CODE, _system_code(cmd)).StatusTime() } func _system_code(cmd *exec.Cmd) string { return kit.Select("1", "0", cmd.ProcessState != nil && cmd.ProcessState.Success()) diff --git a/base/mdb/hash.go b/base/mdb/hash.go index a18fb993..e33bbb1a 100644 --- a/base/mdb/hash.go +++ b/base/mdb/hash.go @@ -230,7 +230,7 @@ func HashSelect(m *ice.Message, arg ...string) *ice.Message { func HashPrunes(m *ice.Message, cb func(Map) bool) *ice.Message { expire := kit.Select(m.Time("-"+kit.Select(DAYS, Config(m, EXPIRE))), m.Option("before")) m.OptionCB(PRUNES, func(key string, value Map) bool { return kit.Format(value[TIME]) < expire && (cb == nil || cb(value)) }) - return m.Cmdy(PRUNES, m.PrefixKey(), "", HASH, ice.OptionFields(HashField(m))).StatusTimeCount() + return m.Cmdy(PRUNES, m.PrefixKey(), "", HASH, ice.OptionFields(HashField(m))) } func HashExport(m *ice.Message, arg ...Any) *ice.Message { return m.Cmdy(EXPORT, m.PrefixKey(), "", HASH, arg) diff --git a/base/nfs/dir.go b/base/nfs/dir.go index 2ea77472..cc2c54de 100644 --- a/base/nfs/dir.go +++ b/base/nfs/dir.go @@ -201,10 +201,9 @@ func init() { } m.Logs(FIND, DIR_ROOT, root, PATH, dir, m.OptionSimple(DIR_TYPE, DIR_REG)) fields := kit.Split(kit.Select(kit.Select(DIR_DEF_FIELDS, m.OptionFields()), kit.Join(kit.Slice(arg, 1)))) - size, _ := _dir_list(m, root, dir, 0, m.Option(DIR_DEEP) == ice.TRUE, kit.Select(TYPE_BOTH, m.Option(DIR_TYPE)), regexp.MustCompile(m.Option(DIR_REG)), fields) - // m.Status(mdb.TIME, last, mdb.COUNT, kit.Split(m.FormatSize())[0], SIZE, kit.FmtSize(size), m.OptionSimple(DIR_ROOT), kit.MDB_COST, m.FormatCost()) + size, last := _dir_list(m, root, dir, 0, m.Option(DIR_DEEP) == ice.TRUE, kit.Select(TYPE_BOTH, m.Option(DIR_TYPE)), regexp.MustCompile(m.Option(DIR_REG)), fields) kit.If(m.Option(DIR_ROOT), func() { m.Option(DIR_ROOT, path.Join(m.Option(DIR_ROOT))+PS) }) - m.StatusTimeCount(SIZE, kit.FmtSize(size), m.OptionSimple(DIR_ROOT)) + m.StatusTimeCount(mdb.TIME, last, SIZE, kit.FmtSize(size), m.OptionSimple(DIR_ROOT)) }}, }) } diff --git a/base/nfs/hex.go b/base/nfs/hex.go index d546e208..06e17ce2 100644 --- a/base/nfs/hex.go +++ b/base/nfs/hex.go @@ -37,7 +37,7 @@ func init() { m.Push(kit.Format(i%8), hex.EncodeToString(buf[i:i+1])) kit.If(i%8 == 7, func() { m.Push(mdb.TEXT, string(buf[i-7:i+1])) }) }) - m.Status(mdb.TIME, s.ModTime().Format(ice.MOD_TIME), FILE, arg[0], SIZE, kit.FmtSize(s.Size())) + m.StatusTime(mdb.TIME, s.ModTime().Format(ice.MOD_TIME), FILE, arg[0], SIZE, kit.FmtSize(s.Size())) }) }}}) } diff --git a/core/code/inner.go b/core/code/inner.go index ea909577..b531b594 100644 --- a/core/code/inner.go +++ b/core/code/inner.go @@ -120,7 +120,7 @@ func init() { if ctx.DisplayLocal(m, ""); !strings.HasPrefix(arg[0], ice.USR_INSTALL) { m.Option(REPOS, kit.Join(m.Cmd(REPOS, ice.OptionFields(nfs.PATH)).Sort(nfs.PATH).Appendv(nfs.PATH))) } - m.Status(mdb.TIME, ice.Info.Make.Time, nfs.FILE, arg[1], nfs.LINE, kit.Select("1", arg, 2), cli.BACK, "0") + m.StatusTime(mdb.TIME, ice.Info.Make.Time, nfs.FILE, arg[1], nfs.LINE, kit.Select("1", arg, 2), cli.BACK, "0") } }}, }) diff --git a/core/code/sh.go b/core/code/sh.go index 1fd48dc9..46d1c231 100644 --- a/core/code/sh.go +++ b/core/code/sh.go @@ -39,7 +39,7 @@ func init() { }}, mdb.ENGINE: {Hand: func(m *ice.Message, arg ...string) { cmds, text := _sh_cmds(m, path.Join(arg[2], arg[1])) - m.Cmdy(cli.SYSTEM, cmds, "-c", text).Status(ssh.SHELL, strings.ReplaceAll(text, lex.NL, "; ")) + m.Cmdy(cli.SYSTEM, cmds, "-c", text).StatusTime(ssh.SHELL, strings.ReplaceAll(text, lex.NL, "; ")) }}, TEMPLATE: {Hand: func(m *ice.Message, arg ...string) { m.Echo(nfs.Template(m, DEMO_SH)) }}, NAVIGATE: {Hand: func(m *ice.Message, arg ...string) { _c_tags(m, CTAGS, "-a", "-R", nfs.PWD) }}, diff --git a/misc/git/repos.go b/misc/git/repos.go index 74104878..17296af1 100644 --- a/misc/git/repos.go +++ b/misc/git/repos.go @@ -534,10 +534,9 @@ func init() { if u, ok := list[kit.ParseURL(remote).Host]; ok { password, _ = u.User.Password() } - m.Sort("repos,status,file").Status(mdb.TIME, last, + m.Sort("repos,status,file").StatusTimeCount(mdb.TIME, last, REMOTE, remote, VERSION, ice.Info.Make.Versions(), kit.Select(aaa.TECH, aaa.VOID, password == ""), m.Option(aaa.EMAIL), - kit.MDB_COUNT, kit.Split(m.FormatSize())[0], kit.MDB_COST, m.FormatCost(), ) } }}, diff --git a/misc/input/input.go b/misc/input/input.go index a3539385..ef72956c 100644 --- a/misc/input/input.go +++ b/misc/input/input.go @@ -101,5 +101,5 @@ func (s input) List(m *ice.Message, arg ...string) { m.Push(mdb.ID, line[3]).Push(CODE, line[2]).Push(TEXT, line[4]).Push(WEIGHT, line[6]) } } - m.StatusTimeCount().SortIntR(WEIGHT) + m.SortIntR(WEIGHT) } diff --git a/misc/tmux/session.go b/misc/tmux/session.go index b5b8f449..7c8e1f11 100644 --- a/misc/tmux/session.go +++ b/misc/tmux/session.go @@ -184,7 +184,7 @@ func init() { } m.Table(func(value ice.Maps) { kit.If(value["tag"] == "1", func() { m.PushButton("") }, func() { m.PushButton(code.XTERM, mdb.SELECT, mdb.REMOVE) }) - }).StatusTimeCount() + }) }}, WINDOW: {Hand: func(m *ice.Message, arg ...string) { m.Split(m.Cmdx(cli.SYSTEM, TMUX, LIST_WINDOWS, "-t", kit.Select("", arg, 0), "-F", mdb.Config(m, FORMAT)), mdb.Config(m, FIELDS), mdb.FS, lex.NL)