From da2b486b7c26940617c330c41a6961624c8c3032 Mon Sep 17 00:00:00 2001 From: shy Date: Tue, 2 Jan 2024 21:32:56 +0800 Subject: [PATCH] add some --- base/web/stats.go | 24 +++++++++++++----------- misc/git/repos.go | 2 ++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/base/web/stats.go b/base/web/stats.go index eed079de..8dfbfae3 100644 --- a/base/web/stats.go +++ b/base/web/stats.go @@ -6,6 +6,7 @@ import ( "shylinux.com/x/icebergs/base/ctx" "shylinux.com/x/icebergs/base/gdb" "shylinux.com/x/icebergs/base/mdb" + "shylinux.com/x/icebergs/base/nfs" kit "shylinux.com/x/toolkits" ) @@ -19,17 +20,17 @@ func init() { STATS: {Help: "汇总量", Hand: func(m *ice.Message, arg ...string) { defer ctx.DisplayStory(m, "") if m.Option(ice.MSG_USERPOD) == "" { - PushStats(m, kit.Keys(aaa.APPLY, mdb.TOTAL), m.Cmd(aaa.APPLY).Length(), "", "注册总数") - PushStats(m, kit.Keys(aaa.OFFER, mdb.TOTAL), m.Cmd(aaa.OFFER).Length(), "", "邀请总数") + PushStats(m, "", "", "", "注册总数", aaa.APPLY) + PushStats(m, "", "", "", "邀请总数", aaa.OFFER) if ice.Info.Username == ice.Info.Make.Username { - PushStats(m, kit.Keys(aaa.USER, mdb.TOTAL), m.Cmd(aaa.USER).Length()-1, "", "用户总数") + PushStats(m, "", m.Cmd(aaa.USER).Length()-1, "", "用户总数", aaa.USER) } else { - PushStats(m, kit.Keys(aaa.USER, mdb.TOTAL), m.Cmd(aaa.USER).Length()-2, "", "用户总数") + PushStats(m, "", m.Cmd(aaa.USER).Length()-2, "", "用户总数", aaa.USER) } - PushStats(m, kit.Keys(aaa.SESS, mdb.TOTAL), m.Cmd(aaa.SESS).Length(), "", "会话总数") - PushStats(m, kit.Keys(TOKEN, mdb.TOTAL), m.Cmd(TOKEN).Length(), "", "令牌总数") - PushStats(m, kit.Keys(SHARE, mdb.TOTAL), m.Cmd(SHARE).Length(), "", "共享总数") - PushStats(m, kit.Keys(ctx.COMMAND, mdb.TOTAL), m.Cmd(ctx.COMMAND).Length(), "", "命令总数") + PushStats(m, "", "", "", "会话总数", aaa.SESS) + PushStats(m, "", "", "", "令牌总数", TOKEN) + PushStats(m, "", "", "", "共享总数", SHARE) + PushStats(m, "", "", "", "命令总数", ctx.COMMAND) } gdb.Event(m, STATS_TABLES) PushPodCmd(m, "", arg...) @@ -46,9 +47,10 @@ func StatsAction(arg ...string) ice.Actions { }, gdb.EventsAction(STATS_TABLES)) } func PushStats(m *ice.Message, name string, value ice.Any, arg ...string) { - kit.If(name == "", func() { name = kit.Keys(m.CommandKey(), mdb.TOTAL) }) + index := kit.Select(m.PrefixKey(), arg, 2) + kit.If(name == "", func() { name = kit.Keys(kit.Select("", kit.Split(index, nfs.PT), -1), mdb.TOTAL) }) + kit.If(value == "", func() { value = m.Cmd(index).Length() }) kit.If(value != 0, func() { - m.Push(mdb.NAME, name).Push(mdb.VALUE, value).Push(mdb.UNITS, kit.Select("", arg, 0)).Push(ctx.TRANS, kit.Select("", arg, 1)) - m.Push(ctx.INDEX, m.PrefixKey()) + m.Push(mdb.NAME, name).Push(mdb.VALUE, value).Push(mdb.UNITS, kit.Select("", arg, 0)).Push(ctx.TRANS, kit.Select("", arg, 1)).Push(ctx.INDEX, index) }) } diff --git a/misc/git/repos.go b/misc/git/repos.go index e6ce502c..ab44defa 100644 --- a/misc/git/repos.go +++ b/misc/git/repos.go @@ -482,9 +482,11 @@ func init() { case INIT: m.Cmd(web.SPIDE, ice.OptionFields(web.CLIENT_ORIGIN), func(value ice.Maps) { m.Push(arg[0], value[web.CLIENT_ORIGIN]+web.X(path.Base(kit.Path("")))) }) m.Push(arg[0], kit.MergeURL2(web.UserHost(m), web.X(path.Base(kit.Path(""))))) + m.Sort(arg[0]) case INSTEADOF, OAUTH: m.Cmd(web.SPIDE, ice.OptionFields(web.CLIENT_ORIGIN), func(value ice.Maps) { m.Push(arg[0], value[web.CLIENT_ORIGIN]+web.X()) }) m.Push(arg[0], kit.MergeURL2(web.UserHost(m), web.X())) + m.Sort(arg[0]) default: switch arg[0] { case MESSAGE: