From 5cc4cbbe16de0df9c32fa10cd0e515c25bd1adef Mon Sep 17 00:00:00 2001 From: harveyshao Date: Mon, 18 Oct 2021 11:35:45 +0800 Subject: [PATCH] opt avatar --- base/nfs/cat.go | 6 +++--- base/web/share.go | 12 +++++++++--- core/chat/header.go | 6 +++--- core/chat/river.go | 3 +++ core/code/webpack.go | 5 +++-- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/base/nfs/cat.go b/base/nfs/cat.go index 5fc47d62..3bdf7c08 100644 --- a/base/nfs/cat.go +++ b/base/nfs/cat.go @@ -48,9 +48,9 @@ func _cat_right(m *ice.Message, name string) bool { return true } func _cat_find(m *ice.Message, name string) io.ReadCloser { - if m.Option("content") != "" { - return NewReadCloser(bytes.NewBufferString(m.Option("content"))) - } + // if m.Option("content") != "" { + // return NewReadCloser(bytes.NewBufferString(m.Option("content"))) + // } if f, e := os.Open(path.Join(m.Option(DIR_ROOT), name)); e == nil { return f diff --git a/base/web/share.go b/base/web/share.go index a932a7cd..4772a402 100644 --- a/base/web/share.go +++ b/base/web/share.go @@ -163,15 +163,21 @@ func init() { "/share/cache/": {Name: "/share/cache/", Help: "缓存池", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { _share_cache(m, arg...) }}, - "/share/local/": {Name: "/share/local/", Help: "文件夹", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { - _share_local(m, arg...) - }}, "/share/proxy/": {Name: "/share/proxy/", Help: "文件流", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { _share_proxy(m, arg...) }}, "/share/repos/": {Name: "/share/repos/", Help: "代码库", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { _share_repos(m, path.Join(arg[0], arg[1], arg[2]), arg[3:]...) }}, + "/share/local/": {Name: "/share/local/", Help: "文件夹", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + _share_local(m, arg...) + }}, + "/share/local/avatar": {Name: "avatar", Help: "头像", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + m.RenderDownload(strings.TrimPrefix(m.Cmd(aaa.USER, m.Option(ice.MSG_USERNAME)).Append(aaa.AVATAR), "/share/local/")) + }}, + "/share/local/background": {Name: "background", Help: "壁纸", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + m.RenderDownload(strings.TrimPrefix(m.Cmd(aaa.USER, m.Option(ice.MSG_USERNAME)).Append(aaa.BACKGROUND), "/share/local/")) + }}, }, }) } diff --git a/core/chat/header.go b/core/chat/header.go index faf15c5a..a98d2a51 100644 --- a/core/chat/header.go +++ b/core/chat/header.go @@ -97,15 +97,15 @@ func init() { aaa.LOGOUT: {Name: "logout", Help: "退出登录", Hand: func(m *ice.Message, arg ...string) { m.Cmd(aaa.SESS, mdb.REMOVE, ice.OptionHash(m.Option(ice.MSG_SESSID))) }}, - aaa.AVATAR: {Name: "avatar", Help: "用户头像", Hand: func(m *ice.Message, arg ...string) { - _header_users(m, aaa.AVATAR, arg...) - }}, aaa.USERNICK: {Name: "usernick", Help: "用户昵称", Hand: func(m *ice.Message, arg ...string) { _header_users(m, aaa.USERNICK, arg...) }}, aaa.BACKGROUND: {Name: "background", Help: "用户壁纸", Hand: func(m *ice.Message, arg ...string) { _header_users(m, aaa.BACKGROUND, arg...) }}, + aaa.AVATAR: {Name: "avatar", Help: "用户头像", Hand: func(m *ice.Message, arg ...string) { + _header_users(m, aaa.AVATAR, arg...) + }}, code.WEBPACK: {Name: "webpack", Help: "打包页面", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(code.WEBPACK, mdb.CREATE, m.OptionSimple(kit.MDB_NAME)) diff --git a/core/chat/river.go b/core/chat/river.go index 2de373c0..4eb7d3b2 100644 --- a/core/chat/river.go +++ b/core/chat/river.go @@ -153,6 +153,9 @@ func init() { }) }) }}, + mdb.REMOVE: {Name: "remove", Help: "添加", Hand: func(m *ice.Message, arg ...string) { + m.Cmdy(mdb.DELETE, m.PrefixKey(), "", mdb.HASH, m.OptionSimple(kit.MDB_HASH)) + }}, mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) { switch m.Option(ctx.ACTION) { case cli.START: diff --git a/core/code/webpack.go b/core/code/webpack.go index 5bc78c4a..58d4adde 100644 --- a/core/code/webpack.go +++ b/core/code/webpack.go @@ -45,6 +45,7 @@ func init() { } }) } + js.WriteString(ice.NL) for _, k := range []string{"lib", "panel", "plugin"} { m.Cmd(nfs.DIR, k).Table(func(index int, value map[string]string, head []string) { if kit.Ext(value[kit.MDB_PATH]) == JS { @@ -62,9 +63,9 @@ func init() { if f, _, e := kit.Create(path.Join(ice.USR_PUBLISH, WEBPACK, kit.Keys(m.Option(kit.MDB_NAME), JS))); m.Assert(e) { defer f.Close() - f.WriteString("\n") + f.WriteString(ice.NL) f.WriteString(kit.Format(`Volcanos.meta.args = {river: "%s", storm: "%s"}`, m.Option("river"), m.Option("storm"))) - f.WriteString("\n") + f.WriteString(ice.NL) f.WriteString(`Volcanos.meta.pack = ` + kit.Formats(kit.UnMarshal(kit.Select("{}", m.Option("content"))))) }