mirror of
https://shylinux.com/x/icebergs
synced 2025-04-26 01:24:05 +08:00
opt some
This commit is contained in:
shaoying
parent
bd503579ad
commit
3eb075be04
@ -12,7 +12,7 @@ import (
|
||||
"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)) {
|
||||
switch kit.Ext(name) {
|
||||
case nfs.JS:
|
||||
@ -28,8 +28,7 @@ func _command_list(m *ice.Message, name string) {
|
||||
}
|
||||
}
|
||||
if strings.HasPrefix(name, "can.") {
|
||||
m.Push(mdb.INDEX, name)
|
||||
return
|
||||
return m.Push(mdb.INDEX, name)
|
||||
}
|
||||
if name == "" {
|
||||
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.Sort(mdb.KEY)
|
||||
return
|
||||
return m.Sort(mdb.KEY)
|
||||
}
|
||||
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))
|
||||
@ -48,6 +46,7 @@ func _command_list(m *ice.Message, name string) {
|
||||
m.Push(mdb.META, kit.Format(cmd.Meta))
|
||||
m.Push(mdb.LIST, kit.Format(cmd.List))
|
||||
})
|
||||
return m
|
||||
}
|
||||
func _command_search(m *ice.Message, kind, name, text string) {
|
||||
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{}
|
||||
|
||||
func AddRunChecker(cb func(*ice.Message, string, string, ...string) bool) {
|
||||
runChecker = append(runChecker, cb)
|
||||
}
|
||||
func AddRunChecker(cb func(*ice.Message, string, string, ...string) bool) { runChecker = append(runChecker, cb) }
|
||||
func init() {
|
||||
AddRunChecker(func(m *ice.Message, cmd, sub string, arg ...string) bool {
|
||||
switch sub {
|
||||
@ -152,9 +149,7 @@ func PodCmd(m *ice.Message, arg ...ice.Any) bool {
|
||||
}
|
||||
return false
|
||||
}
|
||||
func CmdHandler(args ...ice.Any) ice.Handler {
|
||||
return func(m *ice.Message, arg ...string) { m.Cmdy(args...) }
|
||||
}
|
||||
func CmdHandler(args ...ice.Any) ice.Handler { return func(m *ice.Message, arg ...string) { m.Cmdy(args...) } }
|
||||
func CmdAction(args ...ice.Any) ice.Actions {
|
||||
return ice.Actions{ice.CTX_INIT: mdb.AutoConfig(args...),
|
||||
COMMAND: {Hand: func(m *ice.Message, arg ...string) {
|
||||
@ -190,12 +185,9 @@ func FileURI(dir string) string {
|
||||
}
|
||||
return dir
|
||||
}
|
||||
func FileCmd(dir string) string {
|
||||
return FileURI(kit.ExtChange(strings.Split(dir, ice.DF)[0], nfs.GO))
|
||||
}
|
||||
func AddFileCmd(dir, key string) {
|
||||
ice.Info.File[FileCmd(dir)] = key
|
||||
}
|
||||
func FileCmd(dir string) string { 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 GetFileCmd(dir string) string {
|
||||
if strings.HasPrefix(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) {
|
||||
m.Search(cmds, func(key string, cmd *ice.Command) {
|
||||
if cmd.RawHand == nil {
|
||||
file = kit.Split(logs.FileLines(cmd.Hand), ice.DF)[0]
|
||||
file = strings.TrimPrefix(file, kit.Path("")+ice.PS)
|
||||
} else {
|
||||
if cmd.RawHand != nil {
|
||||
for k, v := range ice.Info.File {
|
||||
if v == cmds {
|
||||
file = strings.Replace(k, "/require/", ice.ISH_PLUGED, 1)
|
||||
break
|
||||
}
|
||||
}
|
||||
} else {
|
||||
file = kit.Split(logs.FileLines(cmd.Hand), ice.DF)[0]
|
||||
file = strings.TrimPrefix(file, kit.Path("")+ice.PS)
|
||||
}
|
||||
})
|
||||
return
|
||||
}
|
||||
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) {
|
||||
if key[0] == '/' || key[0] == '_' {
|
||||
if IsOrderCmd(key) {
|
||||
return
|
||||
}
|
||||
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
|
||||
}
|
||||
}
|
||||
@ -64,12 +64,10 @@ func _config_make(m *ice.Message, key string, arg ...string) {
|
||||
}
|
||||
func _config_list(m *ice.Message) {
|
||||
for k, v := range m.Source().Configs {
|
||||
if k[0] == '/' || k[0] == '_' {
|
||||
if IsOrderCmd(key) {
|
||||
continue
|
||||
}
|
||||
m.Push(mdb.KEY, k)
|
||||
m.Push(mdb.NAME, v.Name)
|
||||
m.Push(mdb.VALUE, kit.Format(v.Value))
|
||||
m.Push(mdb.KEY, k).Push(mdb.NAME, v.Name).Push(mdb.VALUE, kit.Format(v.Value))
|
||||
}
|
||||
m.Sort(mdb.KEY)
|
||||
}
|
||||
@ -83,18 +81,14 @@ const CONFIG = "config"
|
||||
func init() {
|
||||
Index.MergeCommands(ice.Commands{
|
||||
CONFIG: {Name: "config key auto", Help: "配置", Actions: ice.Actions{
|
||||
SAVE: {Hand: func(m *ice.Message, arg ...string) {
|
||||
_config_save(m, arg[0], arg[1:]...)
|
||||
}},
|
||||
LOAD: {Hand: func(m *ice.Message, arg ...string) {
|
||||
_config_load(m, arg[0], arg[1:]...)
|
||||
}},
|
||||
SAVE: {Hand: func(m *ice.Message, arg ...string) { _config_save(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 := []ice.Any{}
|
||||
for _, v := range arg[2:] {
|
||||
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) {
|
||||
m.Conf(m.Option("key"), m.Option("sub"), "")
|
||||
@ -103,10 +97,10 @@ func init() {
|
||||
}, Hand: func(m *ice.Message, arg ...string) {
|
||||
if len(arg) == 0 {
|
||||
_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 {
|
||||
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) {
|
||||
if cs := m.Target().Configs; cs[m.CommandKey()] == nil {
|
||||
cs[m.CommandKey()] = &ice.Config{Value: kit.Data()}
|
||||
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)))
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user