diff --git a/base/ctx/config.go b/base/ctx/config.go index bdbf7afb..301a1382 100644 --- a/base/ctx/config.go +++ b/base/ctx/config.go @@ -127,12 +127,12 @@ func init() { ice.Info.Save = Save; ice.Info.Load = Load } func Save(m *ice.Message, arg ...string) *ice.Message { kit.If(len(arg) == 0, func() { arg = kit.SortedKey(m.Target().Configs) }) kit.For(arg, func(i int, k string) { arg[i] = strings.Replace(m.Prefix(k), nfs.PS, "", 1) }) - return m.Cmd(CONFIG, nfs.SAVE, m.Prefix(nfs.JSON), arg) + return m.Cmd(prefix(CONFIG), nfs.SAVE, m.Prefix(nfs.JSON), arg) } func Load(m *ice.Message, arg ...string) *ice.Message { kit.If(len(arg) == 0, func() { arg = kit.SortedKey(m.Target().Configs) }) kit.For(arg, func(i int, k string) { arg[i] = strings.Replace(m.Prefix(k), nfs.PS, "", 1) }) - return m.Cmd(CONFIG, nfs.LOAD, m.Prefix(nfs.JSON), arg) + return m.Cmd(prefix(CONFIG), nfs.LOAD, m.Prefix(nfs.JSON), arg) } func ConfAction(arg ...ice.Any) ice.Actions { return ice.Actions{ice.CTX_INIT: mdb.AutoConfig(arg...)} diff --git a/base/ctx/ctx.go b/base/ctx/ctx.go index d6996081..c251eb78 100644 --- a/base/ctx/ctx.go +++ b/base/ctx/ctx.go @@ -2,6 +2,7 @@ package ctx import ( ice "shylinux.com/x/icebergs" + kit "shylinux.com/x/toolkits" ) const CTX = "ctx" @@ -9,3 +10,5 @@ const CTX = "ctx" var Index = &ice.Context{Name: CTX, Help: "标准模块"} func init() { ice.Index.Register(Index, nil, CONTEXT, COMMAND, CONFIG) } + +func prefix(arg ...string) string { return kit.Keys(CTX, arg) } diff --git a/data.go b/data.go index b7f142fc..9b19ffb3 100644 --- a/data.go +++ b/data.go @@ -58,7 +58,7 @@ func SaveImportant(m *Message, arg ...string) { if Info.Important != true || len(arg) == 0 { return } - kit.For(arg, func(i int, v string) { kit.If(v == "" || strings.Contains(v, SP), func() { arg[i] = "\"" + v + "\"" }) }) + kit.For(arg, func(v string, i int) { arg[i] = kit.Format("%q", v) }) defer _important.Lock()() m.Cmd("nfs.push", VAR_DATA_IMPORTANT, kit.Join(arg, SP), NL) }