1
0
mirror of https://shylinux.com/x/icebergs synced 2025-04-26 17:44:05 +08:00
This commit is contained in:
harveyshao 2022-11-03 14:21:30 +08:00
parent e7721f1c6c
commit e2549d0f82
3 changed files with 17 additions and 14 deletions

View File

@ -11,12 +11,12 @@ import (
kit "shylinux.com/x/toolkits" kit "shylinux.com/x/toolkits"
) )
func _css_stat(m *ice.Message, stats map[string]int) { func _css_stat(m *ice.Message, block string, stats map[string]int) {
msg := m.Spawn() msg := m.Spawn()
for k, v := range stats { for k, v := range stats {
msg.Push("name", k) msg.Push("name", k)
msg.Push("value", v) msg.Push("value", v)
msg.Push("block", "stats") msg.Push("block", block)
} }
msg.SortIntR("value") msg.SortIntR("value")
m.Copy(msg) m.Copy(msg)
@ -51,8 +51,8 @@ func _css_show(m *ice.Message, arg ...string) {
default: default:
} }
}) })
_css_stat(m, stats_key) _css_stat(m, "stats.key", stats_key)
_css_stat(m, stats_value) _css_stat(m, "stats.value", stats_value)
m.StatusTimeCount() m.StatusTimeCount()
} }
func _css_exec(m *ice.Message, arg ...string) { func _css_exec(m *ice.Message, arg ...string) {

View File

@ -28,7 +28,7 @@ func _plan_scope(m *ice.Message, arg ...string) (begin_time, end_time time.Time)
begin_time = begin_time.AddDate(0, 0, -begin_time.YearDay()+1).AddDate(-5, 0, 0) begin_time = begin_time.AddDate(0, 0, -begin_time.YearDay()+1).AddDate(-5, 0, 0)
end_time = begin_time.AddDate(10, 0, 0) end_time = begin_time.AddDate(10, 0, 0)
} }
m.Logs(mdb.SELECT, "begin_time", begin_time.Format(ice.MOD_TIME), "end_time", end_time.Format(ice.MOD_TIME)) m.Logs(mdb.SELECT, "begin_time", begin_time, "end_time", end_time)
return begin_time, end_time return begin_time, end_time
} }
func _plan_list(m *ice.Message, begin_time, end_time string) { func _plan_list(m *ice.Message, begin_time, end_time string) {

21
logs.go
View File

@ -23,17 +23,20 @@ func (m *Message) join(arg ...Any) (string, []Any) {
i-- i--
continue continue
} }
if key := strings.TrimSpace(kit.Format(arg[i])); i == len(arg)-1 { key := strings.TrimSpace(kit.Format(arg[i]))
if i == len(arg)-1 {
list = append(list, key) list = append(list, key)
} else { continue
switch v := arg[i+1].(type) {
case logs.Meta:
list = append(list, key)
meta = append(meta, v)
continue
}
list = append(list, key+kit.Select("", DF, !strings.HasSuffix(key, DF)), kit.Format(kit.Select("", kit.Simple(arg[i+1]), 0)))
} }
switch v := arg[i+1].(type) {
case logs.Meta:
list = append(list, key)
meta = append(meta, v)
continue
case time.Time:
arg[i+1] = v.Format(MOD_TIME)
}
list = append(list, key+kit.Select("", DF, !strings.HasSuffix(key, DF)), kit.Format(kit.Select("", kit.Simple(arg[i+1]), 0)))
} }
return kit.Join(list, SP), meta return kit.Join(list, SP), meta
} }