x/icebergs
1
0
Fork 1
mirror of https://shylinux.com/x/icebergs synced 2025-04-26 17:44:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt some

Browse Source
This commit is contained in:
harveyshao 2022-11-16 21:29:46 +08:00
parent 3d8fd432dc
commit a85e701e5b
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
base/web/render.go
View File

@ -11,7 +11,6 @@ import (
ice "shylinux.com/x/icebergs" ice "shylinux.com/x/icebergs"
"shylinux.com/x/icebergs/base/aaa" "shylinux.com/x/icebergs/base/aaa"
"shylinux.com/x/icebergs/base/ctx" "shylinux.com/x/icebergs/base/ctx"
"shylinux.com/x/icebergs/base/lex"
"shylinux.com/x/icebergs/base/mdb" "shylinux.com/x/icebergs/base/mdb"
"shylinux.com/x/icebergs/base/nfs" "shylinux.com/x/icebergs/base/nfs"
"shylinux.com/x/icebergs/base/tcp" "shylinux.com/x/icebergs/base/tcp"
@ -76,13 +75,11 @@ func Render(m *ice.Message, cmd string, args ...ice.Any) bool {
for _, k := range []string{"sessid", "cmds", "fields", "_option", "_handle", "_output"} { for _, k := range []string{"sessid", "cmds", "fields", "_option", "_handle", "_output"} {
m.Set(k) m.Set(k)
} }
if cmd != "" && cmd != ice.RENDER_RAW {
if cmd != "" && cmd != ice.RENDER_RAW { // [str [arg...]]
m.Echo(kit.Format(cmd, args...)) m.Echo(kit.Format(cmd, args...))
} }
RenderType(m.W, nfs.JSON, "") RenderType(m.W, nfs.JSON, "")
fmt.Fprint(m.W, m.FormatsMeta()) fmt.Fprint(m.W, m.FormatMeta())
// fmt.Fprint(m.W, m.FormatMeta())
} }
return true return true
} }
@ -149,11 +146,11 @@ func RenderIndex(m *ice.Message, repos string, file ...string) *ice.Message {
} }
return m.RenderDownload(path.Join(m.Conf(SERVE, kit.Keym(repos, nfs.PATH)), kit.Select(m.Conf(SERVE, kit.Keym(repos, INDEX)), path.Join(file...)))) return m.RenderDownload(path.Join(m.Conf(SERVE, kit.Keym(repos, nfs.PATH)), kit.Select(m.Conf(SERVE, kit.Keym(repos, INDEX)), path.Join(file...))))
} }
func RenderWebsite(m *ice.Message, pod string, dir string, arg ...string) *ice.Message { func RenderMain(m *ice.Message, pod, index string, arg ...ice.Any) *ice.Message {
return m.Echo(m.Cmdx(Space(m, pod), "web.chat.website", lex.PARSE, dir, arg)).RenderResult() if script := m.Cmdx(Space(m, pod), nfs.CAT, kit.Select(ice.SRC_MAIN_JS, index)); script != "" {
} return m.Echo(kit.Format(_main_template, script)).RenderResult()
func RenderCmd(m *ice.Message, cmd string, arg ...ice.Any) { }
RenderPodCmd(m, "", cmd, arg...) return RenderIndex(m, ice.VOLCANOS)
} }
func RenderPodCmd(m *ice.Message, pod, cmd string, arg ...ice.Any) { func RenderPodCmd(m *ice.Message, pod, cmd string, arg ...ice.Any) {
msg := m.Cmd(Space(m, pod), ctx.COMMAND, kit.Select("web.wiki.word", cmd)) msg := m.Cmd(Space(m, pod), ctx.COMMAND, kit.Select("web.wiki.word", cmd))
@ -163,31 +160,18 @@ func RenderPodCmd(m *ice.Message, pod, cmd string, arg ...ice.Any) {
))) )))
m.Echo(kit.Format(_cmd_template, list)).RenderResult() m.Echo(kit.Format(_cmd_template, list)).RenderResult()
} }
func RenderMain(m *ice.Message, pod, index string, arg ...ice.Any) *ice.Message { func RenderCmd(m *ice.Message, cmd string, arg ...ice.Any) {
if script := m.Cmdx(Space(m, pod), nfs.CAT, kit.Select(ice.SRC_MAIN_JS, index)); script != "" { RenderPodCmd(m, "", cmd, arg...)
return m.Echo(kit.Format(_main_template, script)).RenderResult()
}
return RenderIndex(m, ice.VOLCANOS)
} }
var _cmd_template = `<!DOCTYPE html>
<head>
<meta name="viewport" content="width=device-width,initial-scale=0.8,maximum-scale=0.8,user-scalable=no">
<meta charset="utf-8">
<link rel="stylesheet" type="text/css" href="/page/can.css">
</head>
<body>
<script src="/page/can.js"></script><script>Volcanos(%s)</script>
</body>
`
var _main_template = `<!DOCTYPE html> var _main_template = `<!DOCTYPE html>
<head> <head>
<meta name="viewport" content="width=device-width,initial-scale=0.8,maximum-scale=0.8,user-scalable=no"/> <meta name="viewport" content="width=device-width,initial-scale=0.8,maximum-scale=0.8,user-scalable=no"/>
<meta charset="utf-8"> <meta charset="utf-8">
<title>volcanos</title> <title>volcanos</title>
<link rel="shortcut icon" type="image/ico" href="/favicon.ico"> <link rel="shortcut icon" type="image/ico" href="/favicon.ico">
<link rel="stylesheet" type="text/css" href="/page/cache.css"> <link rel="stylesheet" href="/page/cache.css">
<link rel="stylesheet" type="text/css" href="/page/index.css"> <link rel="stylesheet" href="/page/index.css">
</head> </head>
<body> <body>
<script src="/proto.js"></script> <script src="/proto.js"></script>
@ -195,3 +179,14 @@ var _main_template = `<!DOCTYPE html>
<script>%s</script> <script>%s</script>
</body> </body>
` `
var _cmd_template = `<!DOCTYPE html>
<head>
<meta name="viewport" content="width=device-width,initial-scale=0.8,maximum-scale=0.8,user-scalable=no">
<meta charset="utf-8">
<link rel="stylesheet" href="/page/can.css">
</head>
<body>
<script src="/page/can.js"></script><script>Volcanos(%s)</script>
</body>
`

7
core/chat/pod.go
View File

@ -9,6 +9,7 @@ import (
"shylinux.com/x/icebergs/base/cli" "shylinux.com/x/icebergs/base/cli"
"shylinux.com/x/icebergs/base/ctx" "shylinux.com/x/icebergs/base/ctx"
"shylinux.com/x/icebergs/base/mdb" "shylinux.com/x/icebergs/base/mdb"
"shylinux.com/x/icebergs/base/lex"
"shylinux.com/x/icebergs/base/web" "shylinux.com/x/icebergs/base/web"
kit "shylinux.com/x/toolkits" kit "shylinux.com/x/toolkits"
) )
@ -32,8 +33,12 @@ func init() {
} else if arg[1] == CMD { } else if arg[1] == CMD {
web.RenderPodCmd(m, arg[0], arg[2], arg[3:]) web.RenderPodCmd(m, arg[0], arg[2], arg[3:])
} else if arg[1] == WEBSITE { } else if arg[1] == WEBSITE {
web.RenderWebsite(m, arg[0], path.Join(arg[2:]...)) RenderWebsite(m, arg[0], path.Join(arg[2:]...))
} }
}}, }},
}) })
} }
func RenderWebsite(m *ice.Message, pod string, dir string, arg ...string) *ice.Message {
return m.Echo(m.Cmdx(web.Space(m, pod), "web.chat.website", lex.PARSE, dir, arg)).RenderResult()
}