diff --git a/base/web/dream.go b/base/web/dream.go index 6cdb21c9..873d0814 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -245,7 +245,7 @@ func init() { DREAM_TABLES: {Hand: func(m *ice.Message, arg ...string) { kit.Switch(m.Option(mdb.TYPE), []string{WORKER, SERVER}, func() { m.PushButton(OPEN, ice.MAIN) }) }}, - }, DreamAction(), mdb.ImportantHashAction(mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,icon,repos,binary,template")), Hand: func(m *ice.Message, arg ...string) { + }, DreamAction(), mdb.ImportantHashAction(ctx.TOOLS, "web.space,web.route,web.code.git.search", mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,icon,repos,binary,template")), Hand: func(m *ice.Message, arg ...string) { if len(arg) == 0 { _dream_list(m).RewriteAppend(func(value, key string, index int) string { if key == mdb.ICON { diff --git a/base/web/route.go b/base/web/route.go index 68b0ed03..3563fa0e 100644 --- a/base/web/route.go +++ b/base/web/route.go @@ -2,6 +2,7 @@ package web import ( "regexp" + "runtime" ice "shylinux.com/x/icebergs" "shylinux.com/x/icebergs/base/cli" @@ -107,7 +108,9 @@ func init() { case "md5": m.Push(key, ice.Info.Hash) case nfs.SIZE: - m.Push(key, kit.Format("%s/%s", ice.Info.Size, m.Cmdx(nfs.DIR, nfs.SIZE))) + var stats runtime.MemStats + runtime.ReadMemStats(&stats) + m.Push(key, kit.Format("%s/%s/%s", kit.FmtSize(int64(stats.Sys)), ice.Info.Size, m.Cmdx(nfs.DIR, nfs.SIZE))) case mdb.TYPE: m.Push(key, ice.Info.NodeType) case nfs.PATH: @@ -137,9 +140,10 @@ func init() { } else { m.OptionFields("") list := m.CmdMap(SPACE, mdb.NAME) - size, stat := 0, map[string]int{} + mem, disk, stat := 0, 0, map[string]int{} m.Table(func(value ice.Maps) { - size += kit.Int(kit.Select("", kit.Split(value[nfs.SIZE], nfs.PS), 1)) + disk += kit.Int(kit.Select("", kit.Split(value[nfs.SIZE], nfs.PS), 2)) + mem += kit.Int(kit.Select("", kit.Split(value[nfs.SIZE], nfs.PS), 0)) if _, ok := list[value[SPACE]]; ok { m.Push(mdb.STATUS, ONLINE) stat[ONLINE]++ @@ -147,7 +151,7 @@ func init() { m.Push(mdb.STATUS, OFFLINE) stat[OFFLINE]++ } - }).Sort("status,space", ice.STR_R, ice.STR).StatusTimeCount(stat, nfs.SIZE, kit.FmtSize(size)).Options(ice.MSG_ACTION, "") + }).Sort("status,space", ice.STR_R, ice.STR).StatusTimeCount(stat, nfs.SIZE, kit.Format("%s/%s", kit.FmtSize(mem), kit.FmtSize(disk))).Options(ice.MSG_ACTION, "") } }}, })