"); arg[0] {
+ list = append(list, "
")
diff --git a/core/wiki/title.go b/core/wiki/title.go
index 548c5bb9..01461524 100644
--- a/core/wiki/title.go
+++ b/core/wiki/title.go
@@ -2,59 +2,29 @@ package wiki
import (
"path"
- "strings"
ice "shylinux.com/x/icebergs"
+ "shylinux.com/x/icebergs/base/lex"
"shylinux.com/x/icebergs/base/mdb"
"shylinux.com/x/icebergs/base/nfs"
kit "shylinux.com/x/toolkits"
)
-func _title_deep(str string) int {
- for i, c := range str {
- if c != ' ' {
- return i
- }
- }
- return 0
-}
-func _title_parse(m *ice.Message, dir string, root map[string]interface{}, list []string) int {
- var last map[string]interface{}
- deep := _title_deep(list[0])
- for i := 0; i < len(list); i++ {
- if d := _title_deep(list[i]); d < deep {
- return i
- } else if d > deep {
- i += _title_parse(m, dir, last, list[i:]) - 1
- continue
- }
-
- ls := kit.Split(list[i])
- switch len(ls) {
- case 0:
- continue
- case 1:
- default:
+func _title_parse(m *ice.Message, dir string, text string) string {
+ return m.Cmdx(lex.SPLIT, "", "name,link", kit.Dict(nfs.CAT_CONTENT, text), func(ls []string, data map[string]interface{}) []string {
+ if len(ls) > 1 {
ls[1] = path.Join(dir, ls[1])
}
-
- meta := kit.Dict(mdb.NAME, kit.Select("", ls, 0), mdb.LINK, kit.Select("", ls, 1))
- for i := 2; i < len(ls); i += 2 {
- meta[ls[i]] = ls[i+1]
- }
- last = kit.Data(meta)
- kit.Value(root, "list.-2", last)
- }
- return len(list)
+ return ls
+ })
}
func _title_show(m *ice.Message, kind, text string, arg ...string) {
switch title, _ := m.Optionv(TITLE).(map[string]int); kind {
case NAVMENU: // 导航目录
_option(m, kind, "", text, arg...)
- data := kit.Data()
- _title_parse(m, path.Dir(m.Option(ice.MSG_SCRIPT)), data, strings.Split(text, ice.NL))
- m.RenderTemplate(kit.Format("", kit.Format(data)))
+ data := _title_parse(m, path.Dir(m.Option(ice.MSG_SCRIPT)), text)
+ m.RenderTemplate(kit.Format("", data))
return
case PREMENU: // 前置目录
@@ -100,7 +70,6 @@ const (
)
const (
- REGEXP = "regexp"
PREFIX = "prefix"
LEVEL = "level"
MENU = "menu"
@@ -111,8 +80,7 @@ func init() {
Index.Merge(&ice.Context{Commands: map[string]*ice.Command{
TITLE: {Name: "title [navmenu|premenu|chapter|section|endmenu] text", Help: "标题", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
if len(arg) == 0 {
- ns := kit.Split(ice.Info.NodeName, "-")
- arg = append(arg, ns[len(ns)-1])
+ arg = append(arg, kit.Slice(kit.Split(ice.Info.NodeName, "-"), -1)[0])
}
switch arg[0] {
case NAVMENU:
diff --git a/core/wiki/wiki.go b/core/wiki/wiki.go
index e50cc494..bb4e178f 100644
--- a/core/wiki/wiki.go
+++ b/core/wiki/wiki.go
@@ -33,8 +33,8 @@ func _wiki_path(m *ice.Message, cmd string, arg ...string) string {
return path.Join(m.Option(ice.MSG_LOCAL), m.Conf(cmd, kit.Keym(nfs.PATH)), path.Join(arg...))
}
func _wiki_link(m *ice.Message, cmd string, text string) string {
- if !strings.HasPrefix(text, "http") && !strings.HasPrefix(text, ice.PS) {
- text = path.Join("/share/local", _wiki_path(m, cmd, text))
+ if !strings.HasPrefix(text, ice.HTTP) && !strings.HasPrefix(text, ice.PS) {
+ text = path.Join(web.SHARE_LOCAL, _wiki_path(m, cmd, text))
}
return text
}
diff --git a/core/wiki/wiki.shy b/core/wiki/wiki.shy
index 688713a7..051cb0c9 100644
--- a/core/wiki/wiki.shy
+++ b/core/wiki/wiki.shy
@@ -9,7 +9,6 @@ order.go
table.go
image.go
video.go
-poems.go
field.go
shell.go
diff --git a/core/wiki/word.go b/core/wiki/word.go
index 0aa1f43f..dbbf97f3 100644
--- a/core/wiki/word.go
+++ b/core/wiki/word.go
@@ -3,6 +3,7 @@ package wiki
import (
ice "shylinux.com/x/icebergs"
"shylinux.com/x/icebergs/base/ctx"
+ "shylinux.com/x/icebergs/base/lex"
"shylinux.com/x/icebergs/base/mdb"
"shylinux.com/x/icebergs/base/nfs"
"shylinux.com/x/icebergs/base/ssh"
@@ -11,13 +12,11 @@ import (
)
func _word_show(m *ice.Message, name string, arg ...string) {
- m.Set(ice.MSG_RESULT)
+ m.SetResult()
m.Option(TITLE, map[string]int{})
- m.Option(MENU, kit.Dict(mdb.LIST, []interface{}{}))
-
- m.Option(ice.MSG_ALIAS, m.Confv(WORD, kit.Keym(mdb.ALIAS)))
- m.Option(nfs.DIR_ROOT, _wiki_path(m, WORD))
- m.Cmdy(ssh.SOURCE, name)
+ m.Option(MENU, kit.Dict(mdb.LIST, kit.List()))
+ m.Option(ice.MSG_ALIAS, m.Configv(mdb.ALIAS))
+ m.Cmdy(ssh.SOURCE, name, kit.Dict(nfs.DIR_ROOT, _wiki_path(m, WORD)))
}
const WORD = "word"
@@ -25,7 +24,7 @@ const WORD = "word"
func init() {
Index.Merge(&ice.Context{Configs: map[string]*ice.Config{
WORD: {Name: WORD, Help: "语言文字", Value: kit.Data(
- nfs.PATH, "", REGEXP, ".*\\.shy", mdb.ALIAS, kit.Dict(
+ nfs.PATH, "", lex.REGEXP, ".*\\.shy", mdb.ALIAS, kit.Dict(
NAVMENU, kit.List(TITLE, NAVMENU),
PREMENU, kit.List(TITLE, PREMENU),
CHAPTER, kit.List(TITLE, CHAPTER),
@@ -36,8 +35,8 @@ func init() {
),
)},
}, Commands: map[string]*ice.Command{
- WORD: {Name: "word path=src/main.shy@key auto play", Help: "语言文字", Meta: kit.Dict(
- ice.Display("/plugin/local/wiki/word.js"),
+ WORD: {Name: "word path=src/main.shy@key auto show", Help: "语言文字", Meta: kit.Dict(
+ ice.DisplayLocal(""),
), Action: ice.MergeAction(map[string]*ice.Action{
mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) {
m.Cmdy(nfs.DIR, "src/", kit.Dict(nfs.DIR_DEEP, ice.TRUE, nfs.DIR_REG, ".*\\.shy"), "path,time")
@@ -45,9 +44,9 @@ func init() {
web.STORY: {Name: "story", Help: "运行", Hand: func(m *ice.Message, arg ...string) {
m.Cmdy(arg[0], ctx.ACTION, ice.RUN, arg[2:])
}},
- "play": {Name: "play", Help: "演示"},
+ ice.SHOW: {Name: "show", Help: "演示"},
}, ctx.CmdAction()), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
- m.Option(nfs.DIR_REG, m.Config(REGEXP))
+ m.Option(nfs.DIR_REG, m.Config(lex.REGEXP))
if m.Option(nfs.DIR_DEEP, ice.TRUE); !_wiki_list(m, cmd, arg...) {
_word_show(m, arg[0])
}
diff --git a/go.sum b/go.sum
index be9b7477..9ef7e68b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,4 @@
+shylinux.com/x/go-qrcode v0.0.1 h1:/eOGqMj1qtgs9Ymd12zTUa1gcJZs9S92kj2lb0QzKsE=
shylinux.com/x/go-qrcode v0.0.1/go.mod h1:KAbtU+KwiiABMZ/CJ0zh9PI2AX82Uf9rRYcQ4ODm4po=
shylinux.com/x/toolkits v0.4.5 h1:e9Ni6wvdEJKi09iBeWTrZqXNNadnHuvii7eTO6FiMv0=
shylinux.com/x/toolkits v0.4.5/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA=
")
+ switch arg[0] {
case SHELL:
- list = append(list, "")
+ list = append(list, web.Format("label", "$ "))
default:
- list = append(list, "")
+ list = append(list, web.Format("label", "> "))
}
- list = append(list, "", l, "")
+ list = append(list, web.Format("span", l))
list = append(list, "
")
}
list = append(list, "