diff --git a/base/web/option.go b/base/web/option.go
index 78b33f60..dda54840 100644
--- a/base/web/option.go
+++ b/base/web/option.go
@@ -12,16 +12,22 @@ import (
"shylinux.com/x/icebergs/base/ctx"
"shylinux.com/x/icebergs/base/gdb"
"shylinux.com/x/icebergs/base/mdb"
+ "shylinux.com/x/icebergs/base/nfs"
"shylinux.com/x/icebergs/base/tcp"
kit "shylinux.com/x/toolkits"
"shylinux.com/x/toolkits/file"
)
func Upload(m *ice.Message) *ice.Message {
- if up := kit.Simple(m.Optionv(ice.MSG_UPLOAD)); len(up) < 2 {
- m.Cmdy(CACHE, UPLOAD)
+ if up := kit.Simple(m.Optionv(ice.MSG_UPLOAD)); len(up) == 0 {
+ return m
+ } else if len(up) < 2 {
+ msg := m.Cmd(CACHE, UPLOAD)
+ m.Option(ice.MSG_UPLOAD, msg.Append(mdb.HASH), msg.Append(mdb.NAME), msg.Append(nfs.SIZE))
+ return msg
+ } else {
+ return m.Cmd(CACHE, up[0])
}
- return m
}
func PushNotice(m *ice.Message, arg ...ice.Any) {
if m.Option(ice.MSG_DAEMON) == "" {
diff --git a/base/web/render.go b/base/web/render.go
index bc86ef17..65315201 100644
--- a/base/web/render.go
+++ b/base/web/render.go
@@ -166,9 +166,8 @@ func RenderCmd(m *ice.Message, cmd string, arg ...ice.Any) {
var _main_template = `
-
-
- volcanos
+
+ volcanos
@@ -183,7 +182,7 @@ var _main_template = `
var _cmd_template = `
-
+ volcanos
diff --git a/core/chat/action.go b/core/chat/action.go
index f87eee89..e12c8e4a 100644
--- a/core/chat/action.go
+++ b/core/chat/action.go
@@ -5,7 +5,6 @@ import (
"shylinux.com/x/icebergs/base/aaa"
"shylinux.com/x/icebergs/base/ctx"
"shylinux.com/x/icebergs/base/mdb"
- "shylinux.com/x/icebergs/base/nfs"
"shylinux.com/x/icebergs/base/web"
kit "shylinux.com/x/toolkits"
)
@@ -22,10 +21,7 @@ func _action_exec(m *ice.Message, river, storm, index string, arg ...string) {
}).Length() == 0, ice.ErrNotRight, index, arg) {
return
}
- if m.Option(ice.MSG_UPLOAD) != "" {
- _action_upload(m)
- }
- if !ctx.PodCmd(m, index, arg) {
+ if web.Upload(m); !ctx.PodCmd(m, index, arg) {
m.Cmdy(index, arg)
}
}
@@ -62,16 +58,10 @@ func _action_share(m *ice.Message, arg ...string) {
m.Cmdy(ctx.COMMAND, msg.Append(mdb.NAME))
break
}
- if arg[1] = msg.Append(mdb.NAME); m.Option(ice.MSG_UPLOAD) != "" {
- _action_upload(m)
- }
- m.Cmdy(arg[1:])
+ web.Upload(m)
+ m.Cmdy(msg.Append(mdb.NAME), arg[2:])
}
}
-func _action_upload(m *ice.Message) {
- msg := m.Cmdy(web.CACHE, web.UPLOAD)
- m.Option(ice.MSG_UPLOAD, msg.Append(mdb.HASH), msg.Append(mdb.NAME), msg.Append(nfs.SIZE))
-}
const ACTION = "action"
diff --git a/core/chat/chat.shy b/core/chat/chat.shy
index fc8a360a..1ee0f812 100644
--- a/core/chat/chat.shy
+++ b/core/chat/chat.shy
@@ -6,23 +6,22 @@ search.go
action.go
river.go
storm.go
-
-pod.go
-cmd.go
grant.go
sso.go
+pod.go
+cmd.go
favor.go
iframe.go
keyboard.go
+location.go
+location.shy
div.go
topic.go
website.go
template.go
-location.go
-location.shy
trans.go
-room.go
meet.go
+room.go
oauth
diff --git a/core/chat/favor.go b/core/chat/favor.go
index 0d8874ee..442f811f 100644
--- a/core/chat/favor.go
+++ b/core/chat/favor.go
@@ -50,20 +50,21 @@ func init() {
"getClipboardData": {Name: "favor create", Help: "粘贴"},
"getLocation": {Name: "favor create", Help: "定位"},
"scanQRCode": {Name: "favor create", Help: "扫码"},
- "record1": {Name: "favor upload", Help: "截图"},
- "record2": {Name: "favor upload", Help: "录屏"},
+ "record1": {Name: "favor upload", Help: "截图"},
+ "record2": {Name: "favor upload", Help: "录屏"},
mdb.CREATE: {Hand: func(m *ice.Message, arg ...string) {
m.OptionDefault(mdb.TYPE, mdb.LINK, mdb.NAME, kit.ParseURL(m.Option(mdb.TEXT)).Host)
mdb.HashCreate(m, m.OptionSimple())
}},
web.UPLOAD: {Hand: func(m *ice.Message, arg ...string) {
- web.Upload(m).Cmd("", mdb.CREATE, m.AppendSimple(mdb.TYPE, mdb.NAME, mdb.TEXT))
+ msg := web.Upload(m)
+ m.Cmd("", mdb.CREATE, msg.AppendSimple(mdb.TYPE, mdb.NAME, mdb.TEXT))
}},
web.DOWNLOAD: {Hand: func(m *ice.Message, arg ...string) {
ctx.ProcessOpen(m, web.MergeURL2(m, web.SHARE_LOCAL+m.Option(mdb.TEXT), "filename", m.Option(mdb.NAME)))
}},
web.DISPLAY: {Help: "预览", Hand: func(m *ice.Message, arg ...string) {
- if link := web.SHARE_LOCAL+m.Option(mdb.TEXT); _favor_is_image(m, m.Option(mdb.NAME), m.Option(mdb.TYPE)) {
+ if link := web.SHARE_LOCAL + m.Option(mdb.TEXT); _favor_is_image(m, m.Option(mdb.NAME), m.Option(mdb.TYPE)) {
m.EchoImages(link)
} else if _favor_is_video(m, m.Option(mdb.NAME), m.Option(mdb.TYPE)) {
m.EchoVideos(link)
diff --git a/core/chat/keyboard.go b/core/chat/keyboard.go
index dd4c2b81..9787cbd2 100644
--- a/core/chat/keyboard.go
+++ b/core/chat/keyboard.go
@@ -27,7 +27,7 @@ func init() {
func KeyboardAction() ice.Actions {
return ice.Actions{
- KEYBOARD: {Help: "远程控制", Hand: func(m *ice.Message, arg ...string) {
+ KEYBOARD: {Hand: func(m *ice.Message, arg ...string) {
hash := m.Cmdx("web.chat.keyboard", mdb.CREATE, web.SPACE, m.Option(ice.MSG_DAEMON), ctx.INDEX, m.Option(ctx.INDEX), "input", "")
link := tcp.ReplaceLocalhost(m, web.MergePodCmd(m, "", "web.chat.keyboard", mdb.HASH, hash))
m.Push(mdb.NAME, link).PushQRCode(mdb.TEXT, link)
diff --git a/core/code/code.shy b/core/code/code.shy
index 1e7e931e..ea47ebf9 100644
--- a/core/code/code.shy
+++ b/core/code/code.shy
@@ -1,8 +1,5 @@
-chapter "源码"
code.go
code.shy
-
-section "流程"
install.go
upgrade.go
webpack.go
@@ -11,7 +8,6 @@ autogen.go
compile.go
publish.go
-section "工具"
favor.go
xterm.go
xterm.shy
@@ -22,7 +18,6 @@ bench.go
oauth.go
case.go
-section "语言"
c.go
sh.go
py.go
diff --git a/core/team/team.shy b/core/team/team.shy
index 865aa753..b97368c8 100644
--- a/core/team/team.shy
+++ b/core/team/team.shy
@@ -1,6 +1,6 @@
-chapter "团队"
-
-field web.team.todo
-field web.team.epic
-field web.team.task
-field web.team.plan
+team.shy
+team.go
+plan.go
+task.go
+todo.go
+epic.go