liubin/icebergs
1
0
Fork 0
forked from x/icebergs
Code Pull Requests Activity

opt alpha

Browse Source
This commit is contained in:
shaoying 2020-04-08 18:24:04 +08:00
parent 1bd6af5738
commit cb79a8068b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/web/web.go
View File

@ -876,7 +876,6 @@ var Index = &ice.Context{Name: "web", Help: "网络模块",
m.Optionv(k, m.Optionv(k)) m.Optionv(k, m.Optionv(k))
} }
} }
m.Option("_option", m.Optionv("_option"))
// 构造路由 // 构造路由
id := kit.Format(c.ID()) id := kit.Format(c.ID())
@ -1133,8 +1132,7 @@ var Index = &ice.Context{Name: "web", Help: "网络模块",
m.Info("routine %v", favor) m.Info("routine %v", favor)
m.Gos(m, func(m *ice.Message) { m.Gos(m, func(m *ice.Message) {
m.Grows(ice.WEB_FAVOR, kit.Keys(kit.MDB_HASH, key), "", "", func(index int, value map[string]interface{}) { m.Grows(ice.WEB_FAVOR, kit.Keys(kit.MDB_HASH, key), "", "", func(index int, value map[string]interface{}) {
if strings.Contains(favor, arg[1]) || strings.Contains(kit.Format(value["name"]), arg[1]) || strings.Contains(kit.Format(value["text"]), arg[1]) {
if strings.Contains(kit.Format(value["name"]), arg[1]) || strings.Contains(kit.Format(value["text"]), arg[1]) {
m.Push("pod", strings.Join(kit.Simple(m.Optionv("user.pod")), ".")) m.Push("pod", strings.Join(kit.Simple(m.Optionv("user.pod")), "."))
m.Push("favor", favor) m.Push("favor", favor)
m.Push("", value, []string{"id", "type", "name", "text"}) m.Push("", value, []string{"id", "type", "name", "text"})

2
misc/alpha/alpha.go
View File

@ -92,7 +92,7 @@ var Index = &ice.Context{Name: "alpha", Help: "英汉词典",
m.Cmdy("list", "ecdict", count-rand.Intn(count), 1) m.Cmdy("list", "ecdict", count-rand.Intn(count), 1)
} }
}}, }},
"search": {Name: "search [word [method]]", Help: "查找词汇", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { "trans": {Name: "trans [word [method]]", Help: "查找词汇", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
if len(arg) == 0 { if len(arg) == 0 {
// 收藏列表 // 收藏列表
m.Cmdy(ice.WEB_FAVOR, "alpha.word") m.Cmdy(ice.WEB_FAVOR, "alpha.word")

5
misc/zsh/zsh.go
View File

@ -50,6 +50,11 @@ var Index = &ice.Context{Name: "zsh", Help: "命令行",
switch arg[0] { switch arg[0] {
case "history": case "history":
vs := strings.SplitN(strings.TrimSpace(m.Option("arg")), " ", 4) vs := strings.SplitN(strings.TrimSpace(m.Option("arg")), " ", 4)
if strings.Contains(m.Option("SHELL"), "zsh") {
vs = []string{vs[0], "", "", strings.Join(vs[1:], " ")}
}
cmds := []string{ice.WEB_FAVOR, m.Conf("zsh", "meta.history"), ice.TYPE_SHELL, vs[0], kit.Select("", vs, 3), cmds := []string{ice.WEB_FAVOR, m.Conf("zsh", "meta.history"), ice.TYPE_SHELL, vs[0], kit.Select("", vs, 3),
"sid", m.Option("sid"), "pwd", m.Option("pwd"), "time", vs[1] + " " + vs[2]} "sid", m.Option("sid"), "pwd", m.Option("pwd"), "time", vs[1] + " " + vs[2]}