x/icebergs
1
0
Fork 1
mirror of https://shylinux.com/x/icebergs synced 2025-04-28 18:22:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt some

Browse Source
This commit is contained in:
shaoying 2022-11-23 00:50:38 +08:00
parent bd503579ad
commit 3eb075be04
2 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
base/ctx/command.go
View File

@ -12,7 +12,7 @@ import (
"shylinux.com/x/toolkits/logs" "shylinux.com/x/toolkits/logs"
) )
func _command_list(m *ice.Message, name string) { func _command_list(m *ice.Message, name string) *ice.Message {
if nfs.ExistsFile(m, path.Join(ice.SRC, name)) { if nfs.ExistsFile(m, path.Join(ice.SRC, name)) {
switch kit.Ext(name) { switch kit.Ext(name) {
case nfs.JS: case nfs.JS:
@ -28,8 +28,7 @@ func _command_list(m *ice.Message, name string) {
} }
} }
if strings.HasPrefix(name, "can.") { if strings.HasPrefix(name, "can.") {
m.Push(mdb.INDEX, name) return m.Push(mdb.INDEX, name)
return
} }
if name == "" { if name == "" {
for k, v := range m.Source().Commands { for k, v := range m.Source().Commands {
@ -38,8 +37,7 @@ func _command_list(m *ice.Message, name string) {
} }
m.Push(mdb.KEY, k).Push(mdb.NAME, v.Name).Push(mdb.HELP, v.Help) m.Push(mdb.KEY, k).Push(mdb.NAME, v.Name).Push(mdb.HELP, v.Help)
} }
m.Sort(mdb.KEY) return m.Sort(mdb.KEY)
return
} }
m.Spawn(m.Source()).Search(name, func(p *ice.Context, s *ice.Context, key string, cmd *ice.Command) { m.Spawn(m.Source()).Search(name, func(p *ice.Context, s *ice.Context, key string, cmd *ice.Command) {
m.Push(mdb.INDEX, kit.Keys(s.Cap(ice.CTX_FOLLOW), key)) m.Push(mdb.INDEX, kit.Keys(s.Cap(ice.CTX_FOLLOW), key))
@ -48,6 +46,7 @@ func _command_list(m *ice.Message, name string) {
m.Push(mdb.META, kit.Format(cmd.Meta)) m.Push(mdb.META, kit.Format(cmd.Meta))
m.Push(mdb.LIST, kit.Format(cmd.List)) m.Push(mdb.LIST, kit.Format(cmd.List))
}) })
return m
} }
func _command_search(m *ice.Message, kind, name, text string) { func _command_search(m *ice.Message, kind, name, text string) {
m.Travel(func(p *ice.Context, s *ice.Context, key string, cmd *ice.Command) { m.Travel(func(p *ice.Context, s *ice.Context, key string, cmd *ice.Command) {
@ -113,9 +112,7 @@ func init() {
var runChecker = []func(*ice.Message, string, string, ...string) bool{} var runChecker = []func(*ice.Message, string, string, ...string) bool{}
func AddRunChecker(cb func(*ice.Message, string, string, ...string) bool) { func AddRunChecker(cb func(*ice.Message, string, string, ...string) bool) { runChecker = append(runChecker, cb) }
runChecker = append(runChecker, cb)
}
func init() { func init() {
AddRunChecker(func(m *ice.Message, cmd, sub string, arg ...string) bool { AddRunChecker(func(m *ice.Message, cmd, sub string, arg ...string) bool {
switch sub { switch sub {
@ -152,9 +149,7 @@ func PodCmd(m *ice.Message, arg ...ice.Any) bool {
} }
return false return false
} }
func CmdHandler(args ...ice.Any) ice.Handler { func CmdHandler(args ...ice.Any) ice.Handler { return func(m *ice.Message, arg ...string) { m.Cmdy(args...) } }
return func(m *ice.Message, arg ...string) { m.Cmdy(args...) }
}
func CmdAction(args ...ice.Any) ice.Actions { func CmdAction(args ...ice.Any) ice.Actions {
return ice.Actions{ice.CTX_INIT: mdb.AutoConfig(args...), return ice.Actions{ice.CTX_INIT: mdb.AutoConfig(args...),
COMMAND: {Hand: func(m *ice.Message, arg ...string) { COMMAND: {Hand: func(m *ice.Message, arg ...string) {
@ -190,12 +185,9 @@ func FileURI(dir string) string {
} }
return dir return dir
} }
func FileCmd(dir string) string { func FileCmd(dir string) string { return FileURI(kit.ExtChange(strings.Split(dir, ice.DF)[0], nfs.GO)) }
return FileURI(kit.ExtChange(strings.Split(dir, ice.DF)[0], nfs.GO)) func AddFileCmd(dir, key string) { ice.Info.File[FileCmd(dir)] = key }
} func IsOrderCmd(key string) { return key[0] == '/' || key[0] == '_' }
func AddFileCmd(dir, key string) {
ice.Info.File[FileCmd(dir)] = key
}
func GetFileCmd(dir string) string { func GetFileCmd(dir string) string {
if strings.HasPrefix(dir, ice.ISH_PLUGED) { if strings.HasPrefix(dir, ice.ISH_PLUGED) {
dir = path.Join(ice.PS, ice.REQUIRE, strings.TrimPrefix(dir, ice.ISH_PLUGED)) dir = path.Join(ice.PS, ice.REQUIRE, strings.TrimPrefix(dir, ice.ISH_PLUGED))
@ -216,23 +208,23 @@ func GetFileCmd(dir string) string {
} }
func GetCmdFile(m *ice.Message, cmds string) (file string) { func GetCmdFile(m *ice.Message, cmds string) (file string) {
m.Search(cmds, func(key string, cmd *ice.Command) { m.Search(cmds, func(key string, cmd *ice.Command) {
if cmd.RawHand == nil { if cmd.RawHand != nil {
file = kit.Split(logs.FileLines(cmd.Hand), ice.DF)[0]
file = strings.TrimPrefix(file, kit.Path("")+ice.PS)
} else {
for k, v := range ice.Info.File { for k, v := range ice.Info.File {
if v == cmds { if v == cmds {
file = strings.Replace(k, "/require/", ice.ISH_PLUGED, 1) file = strings.Replace(k, "/require/", ice.ISH_PLUGED, 1)
break break
} }
} }
} else {
file = kit.Split(logs.FileLines(cmd.Hand), ice.DF)[0]
file = strings.TrimPrefix(file, kit.Path("")+ice.PS)
} }
}) })
return return
} }
func TravelCmd(m *ice.Message, cb func(key, file, line string)) *ice.Message { func TravelCmd(m *ice.Message, cb func(key, file, line string)) *ice.Message {
m.Travel(func(p *ice.Context, s *ice.Context, key string, cmd *ice.Command) { m.Travel(func(p *ice.Context, s *ice.Context, key string, cmd *ice.Command) {
if key[0] == '/' || key[0] == '_' { if IsOrderCmd(key) {
return return
} }
if ls := kit.Split(cmd.GetFileLine(), ice.DF); len(ls) > 1 { if ls := kit.Split(cmd.GetFileLine(), ice.DF); len(ls) > 1 {
@ -242,4 +234,4 @@ func TravelCmd(m *ice.Message, cb func(key, file, line string)) *ice.Message {
} }
}) })
return m return m
} }

32
base/ctx/config.go
View File

@ -64,12 +64,10 @@ func _config_make(m *ice.Message, key string, arg ...string) {
} }
func _config_list(m *ice.Message) { func _config_list(m *ice.Message) {
for k, v := range m.Source().Configs { for k, v := range m.Source().Configs {
if k[0] == '/' || k[0] == '_' { if IsOrderCmd(key) {
continue continue
} }
m.Push(mdb.KEY, k) m.Push(mdb.KEY, k).Push(mdb.NAME, v.Name).Push(mdb.VALUE, kit.Format(v.Value))
m.Push(mdb.NAME, v.Name)
m.Push(mdb.VALUE, kit.Format(v.Value))
} }
m.Sort(mdb.KEY) m.Sort(mdb.KEY)
} }
@ -83,18 +81,14 @@ const CONFIG = "config"
func init() { func init() {
Index.MergeCommands(ice.Commands{ Index.MergeCommands(ice.Commands{
CONFIG: {Name: "config key auto", Help: "配置", Actions: ice.Actions{ CONFIG: {Name: "config key auto", Help: "配置", Actions: ice.Actions{
SAVE: {Hand: func(m *ice.Message, arg ...string) { SAVE: {Hand: func(m *ice.Message, arg ...string) { _config_save(m, arg[0], arg[1:]...) }},
_config_save(m, arg[0], arg[1:]...) LOAD: {Hand: func(m *ice.Message, arg ...string) { _config_load(m, arg[0], arg[1:]...) }},
}},
LOAD: {Hand: func(m *ice.Message, arg ...string) {
_config_load(m, arg[0], arg[1:]...)
}},
"list": {Hand: func(m *ice.Message, arg ...string) { "list": {Hand: func(m *ice.Message, arg ...string) {
list := []ice.Any{} list := []ice.Any{}
for _, v := range arg[2:] { for _, v := range arg[2:] {
list = append(list, v) list = append(list, v)
} }
m.Confv(arg[0], arg[1], kit.List(list...)) m.Confv(arg[0], arg[1], list)
}}, }},
mdb.REMOVE: {Name: "remove key sub", Hand: func(m *ice.Message, arg ...string) { mdb.REMOVE: {Name: "remove key sub", Hand: func(m *ice.Message, arg ...string) {
m.Conf(m.Option("key"), m.Option("sub"), "") m.Conf(m.Option("key"), m.Option("sub"), "")
@ -103,10 +97,10 @@ func init() {
}, Hand: func(m *ice.Message, arg ...string) { }, Hand: func(m *ice.Message, arg ...string) {
if len(arg) == 0 { if len(arg) == 0 {
_config_list(m) _config_list(m)
return } else {
_config_make(m, arg[0], arg[1:]...)
DisplayStoryJSON(m)
} }
_config_make(m, arg[0], arg[1:]...)
DisplayStoryJSON(m)
}}, }},
}) })
} }
@ -139,14 +133,14 @@ func Load(m *ice.Message, arg ...string) *ice.Message {
func ConfAction(args ...ice.Any) ice.Actions { func ConfAction(args ...ice.Any) ice.Actions {
return ice.Actions{ice.CTX_INIT: mdb.AutoConfig(args...)} return ice.Actions{ice.CTX_INIT: mdb.AutoConfig(args...)}
} }
func ConfigFromOption(m *ice.Message, arg ...string) {
for _, k := range arg {
m.Config(k, kit.Select(m.Config(k), m.Option(k)))
}
}
func ConfigAuto(m *ice.Message, arg ...string) { func ConfigAuto(m *ice.Message, arg ...string) {
if cs := m.Target().Configs; cs[m.CommandKey()] == nil { if cs := m.Target().Configs; cs[m.CommandKey()] == nil {
cs[m.CommandKey()] = &ice.Config{Value: kit.Data()} cs[m.CommandKey()] = &ice.Config{Value: kit.Data()}
ice.Info.Load(m, m.CommandKey()) ice.Info.Load(m, m.CommandKey())
} }
} }
func ConfigFromOption(m *ice.Message, arg ...string) {
for _, k := range arg {
m.Config(k, kit.Select(m.Config(k), m.Option(k)))
}
}