From 6e9b941c0b3002b9cb9736dc426a125415bcf0e1 Mon Sep 17 00:00:00 2001 From: shy Date: Tue, 9 Jan 2024 10:40:29 +0800 Subject: [PATCH] add some --- base/web/dream.go | 15 +++++++++++++-- base/web/serve.go | 10 +++++----- base/web/spide.go | 4 ---- core/chat/grant.go | 9 ++++----- misc/git/search.go | 14 +++++--------- misc/git/search.js | 2 +- 6 files changed, 28 insertions(+), 26 deletions(-) diff --git a/base/web/dream.go b/base/web/dream.go index e78f6a71..1dc6884d 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -214,7 +214,7 @@ func init() { } }}, nfs.REPOS: {Help: "仓库", Icon: "bi bi-git", Hand: func(m *ice.Message, arg ...string) { - m.ProcessOpen(m.MergePodCmd("", CODE_GIT_SEARCH, nfs.REPOS, nfs.REPOS)) + m.ProcessOpen(m.MergePodCmd("", CODE_GIT_SEARCH)) }}, STARTALL: {Name: "startall name", Help: "启动", Icon: "bi bi-play-circle", Hand: func(m *ice.Message, arg ...string) { DreamEach(m, m.Option(mdb.NAME), cli.STOP, func(name string) { @@ -315,7 +315,7 @@ func init() { PushStats(m, kit.Keys(m.CommandKey(), mdb.TOTAL), msg.Length(), "", "已启动空间") } }}, - }, StatsAction(), DreamAction(), mdb.ImportantHashAction(ctx.TOOLS, ROUTE, mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,icon,repos,binary,template,restart")), Hand: func(m *ice.Message, arg ...string) { + }, StatsAction(), DreamAction(), mdb.ImportantHashAction(ctx.TOOLS, "web.code.git.search,route", mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,icon,repos,binary,template,restart")), Hand: func(m *ice.Message, arg ...string) { if ice.Info.NodeType == WORKER { return } else if len(arg) == 0 { @@ -334,6 +334,17 @@ func init() { return value }).Option(ice.MSG_ACTION, "") ctx.DisplayTableCard(m) + return + m.Cmds(SPACE, func(value ice.Maps) { + if value[mdb.TYPE] == SERVER { + m.Push(mdb.TYPE, value[mdb.TYPE]) + m.Push(mdb.NAME, value[mdb.NAME]) + m.Push(mdb.ICON, nfs.USR_ICONS_ICEBERGS) + m.Push(mdb.TEXT, SERVER) + msg := gdb.Event(m.Spawn(value), DREAM_TABLES) + m.PushButton(strings.Join(msg.Appendv(ctx.ACTION), "")) + } + }) } else if arg[0] == ctx.ACTION { gdb.Event(m, DREAM_ACTION, arg) } else { diff --git a/base/web/serve.go b/base/web/serve.go index c7781fcc..028b9e3e 100644 --- a/base/web/serve.go +++ b/base/web/serve.go @@ -260,15 +260,15 @@ func init() { } }) } -func Domain(host, port string) string { return kit.Format("%s://%s:%s", HTTP, host, port) } + +func Domain(host, port string) string { + return kit.Format("%s://%s:%s", HTTP, host, port) +} func Script(m *ice.Message, str string, arg ...ice.Any) string { return ice.Render(m, ice.RENDER_SCRIPT, kit.Format(str, arg...)) } func ChatCmdPath(m *ice.Message, arg ...string) string { - if p := m.Option(ice.MSG_USERPOD); p != "" { - return path.Join(CHAT_POD, p, "/cmd/", kit.Select(m.PrefixKey(), path.Join(arg...))) - } - return path.Join(CHAT_CMD, kit.Select(m.PrefixKey(), path.Join(arg...))) + return m.MergePodCmd("", kit.Select(m.PrefixKey(), path.Join(arg...))) } func RequireFile(m *ice.Message, file string) string { if strings.HasPrefix(file, nfs.PS) || strings.HasPrefix(file, ice.HTTP) { diff --git a/base/web/spide.go b/base/web/spide.go index b9addefc..d56583b2 100644 --- a/base/web/spide.go +++ b/base/web/spide.go @@ -364,10 +364,6 @@ func HostPort(m *ice.Message, host, port string, arg ...string) string { if len(arg) > 0 { kit.If(kit.Select("", arg, 0), func(pod string) { p += S(pod) }) kit.If(kit.Select("", arg, 1), func(cmd string) { p += C(cmd) }) - // kit.If(p, func() { p = "/chat" + p }) - // kit.If(kit.Select("", arg, 0), func(pod string) { p += "/pod/" + pod }) - // kit.If(kit.Select("", arg, 1), func(cmd string) { p += "/cmd/" + cmd }) - // kit.If(p, func() { p = "/chat" + p }) } kit.If(host == "", func() { host = kit.ParseURL(UserHost(m)).Hostname() }) if port == tcp.PORT_443 { diff --git a/core/chat/grant.go b/core/chat/grant.go index 7a0d62cd..5edbe294 100644 --- a/core/chat/grant.go +++ b/core/chat/grant.go @@ -1,8 +1,6 @@ package chat import ( - "net/http" - ice "shylinux.com/x/icebergs" "shylinux.com/x/icebergs/base/aaa" "shylinux.com/x/icebergs/base/cli" @@ -28,9 +26,10 @@ func init() { }}, web.HOME: {Help: "首页", Hand: func(m *ice.Message, arg ...string) { m.ProcessOpen(m.MergeLink(web.CHAT_PORTAL)) }}, aaa.CONFIRM: {Help: "授权", Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) { - if m.Warn(m.R.Method == http.MethodGet, ice.ErrNotAllow) { - return - } else if m.Warn(m.Option(ice.MSG_USERNAME) == "", ice.ErrNotLogin) || m.Warn(m.Option(web.SPACE) == "", ice.ErrNotValid, web.SPACE) { + // if m.Warn(m.R.Method == http.MethodGet, ice.ErrNotAllow) { + // return + // } else + if m.Warn(m.Option(ice.MSG_USERNAME) == "", ice.ErrNotLogin) || m.Warn(m.Option(web.SPACE) == "", ice.ErrNotValid, web.SPACE) { return } else if msg := m.Cmd(web.SPACE, m.Option(web.SPACE)); m.Warn(msg.Append(mdb.TYPE) == "", ice.ErrNotFound, m.Option(web.SPACE)) { return diff --git a/misc/git/search.go b/misc/git/search.go index 1e950136..cf5f90e1 100644 --- a/misc/git/search.go +++ b/misc/git/search.go @@ -29,16 +29,16 @@ func init() { ) const SEARCH = "search" Index.MergeCommands(ice.Commands{ - SEARCH: {Name: "search repos@key keyword auto", Help: "代码源", Actions: ice.MergeActions(ice.Actions{ + SEARCH: {Name: "search keyword auto", Help: "代码源", Actions: ice.MergeActions(ice.Actions{ ice.CTX_INIT: {Hand: func(m *ice.Message, arg ...string) { - macos.AppInstall(m, "App Store.png", m.PrefixKey(), ctx.ARGS, kit.Format([]string{REPOS})) + macos.AppInstall(m, "App Store.png", m.PrefixKey()) }}, cli.START: {Name: "start name*", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(web.DREAM, mdb.CREATE); m.Cmdy(web.DREAM, cli.START) }}, CLONE: {Name: "clone name*", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(REPOS, CLONE, m.Option(REPOS)) }}, HTML_URL: {Help: "源码", Hand: func(m *ice.Message, arg ...string) { m.ProcessOpen(m.Option(HTML_URL)) }}, WEBSITE: {Help: "官网", Hand: func(m *ice.Message, arg ...string) { m.ProcessOpen(m.Option(WEBSITE)) }}, ORIGIN: {Help: "平台", Icon: "bi bi-box-arrow-up-right", Hand: func(m *ice.Message, arg ...string) { - m.ProcessOpen(web.SpideOrigin(m, kit.Select(m.Option(REPOS), arg, 0)) + EXPLORE_REPOS) + m.ProcessOpen(web.SpideOrigin(m, REPOS) + EXPLORE_REPOS) }}, web.DREAM_INPUTS: {Hand: func(m *ice.Message, arg ...string) { kit.If(arg[0] == REPOS, func() { @@ -48,12 +48,8 @@ func init() { }) }}, }, web.DreamAction(), ctx.ConfAction(ctx.TOOLS, web.DREAM)), Hand: func(m *ice.Message, arg ...string) { - if len(arg) == 0 { - m.Cmdy(web.SPIDE).RenameAppend(web.CLIENT_NAME, REPOS, web.CLIENT_URL, ORIGIN).Cut("time,repos,origin") - return - } - kit.For(kit.Value(kit.UnMarshal(m.Cmdx(web.SPIDE, arg[0], web.SPIDE_RAW, http.MethodGet, REPOS_SEARCH, - "q", kit.Select("", arg, 1), mdb.SORT, "updated", mdb.ORDER, "desc", mdb.PAGE, "1", mdb.LIMIT, "30")), mdb.DATA), func(value ice.Map) { + kit.For(kit.Value(kit.UnMarshal(m.Cmdx(web.SPIDE, REPOS, web.SPIDE_RAW, http.MethodGet, REPOS_SEARCH, + "q", kit.Select("", arg, 0), mdb.SORT, "updated", mdb.ORDER, "desc", mdb.PAGE, "1", mdb.LIMIT, "30")), mdb.DATA), func(value ice.Map) { value[nfs.SIZE] = kit.FmtSize(kit.Int(value[nfs.SIZE]) * 1000) if t, e := time.Parse(time.RFC3339, kit.Format(value[UPDATED_AT])); e == nil { value[UPDATED_AT] = t.Format("01-02 15:04") diff --git a/misc/git/search.js b/misc/git/search.js index bb07864f..79204d73 100644 --- a/misc/git/search.js +++ b/misc/git/search.js @@ -1,5 +1,5 @@ Volcanos(chat.ONIMPORT, { - _init: function(can, msg) { if (!can.Option(nfs.REPOS)) { return can.onappend.table(can, msg) } + _init: function(can, msg) { if (can.isZoneMode()) { return can.onimport._vimer_zone(can, msg, can._output) } can.onappend.style(can, "card", can._output) can.page.Appends(can, can._output, msg.Table(function(value) { value.language == "JavaScript" && (value.language = "JS")