diff --git a/misc/bash/download.go b/misc/bash/download.go index 5430d7f4..1d495521 100644 --- a/misc/bash/download.go +++ b/misc/bash/download.go @@ -8,28 +8,26 @@ import ( ) func init() { - Index.Merge(&ice.Context{ - Commands: map[string]*ice.Command{ - "/download": {Name: "/download", Help: "下载", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { - if len(arg) == 0 || arg[0] == "" { - m.Cmdy(chat.FILES).Table() - return - } + Index.Merge(&ice.Context{Commands: map[string]*ice.Command{ + "/download": {Name: "/download", Help: "下载", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + if len(arg) == 0 || arg[0] == "" { + m.Cmdy(chat.FILES).Table() + return // 文件列表 + } - // 下载文件 - m.Cmdy(web.CACHE, m.Cmd(chat.FILES, arg[0]).Append(kit.MDB_DATA)) - m.Render(kit.Select(ice.RENDER_DOWNLOAD, ice.RENDER_RESULT, m.Append(kit.MDB_FILE) == ""), m.Append(kit.MDB_TEXT)) - }}, - "/upload": {Name: "/upload", Help: "上传", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { - // 缓存文件 - msg := m.Cmd(web.CACHE, web.UPLOAD) - m.Option(ice.MSG_UPLOAD, msg.Append(kit.MDB_HASH), msg.Append(kit.MDB_NAME)) - m.Cmd(chat.FILES, web.UPLOAD) + // 下载文件 + m.Cmdy(web.CACHE, m.Cmd(chat.FILES, arg[0]).Append(kit.MDB_DATA)) + m.Render(kit.Select(ice.RENDER_DOWNLOAD, ice.RENDER_RESULT, m.Append(kit.MDB_FILE) == ""), m.Append(kit.MDB_TEXT)) + }}, + "/upload": {Name: "/upload", Help: "上传", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + // 缓存文件 + msg := m.Cmd(web.CACHE, web.UPLOAD) + m.Option(ice.MSG_UPLOAD, msg.Append(kit.MDB_HASH), msg.Append(kit.MDB_NAME)) + m.Cmd(chat.FILES, web.UPLOAD) - for _, k := range []string{kit.MDB_DATA, kit.MDB_TIME, kit.MDB_TYPE, kit.MDB_NAME, kit.MDB_SIZE} { - m.Echo("%s: %s\n", k, msg.Append(k)) - } - }}, - }, - }) + for _, k := range []string{kit.MDB_DATA, kit.MDB_TIME, kit.MDB_TYPE, kit.MDB_NAME, kit.MDB_SIZE} { + m.Echo("%s: %s\n", k, msg.Append(k)) + } + }}, + }}) } diff --git a/misc/bash/favor.go b/misc/bash/favor.go index 106c84bf..ceb41a70 100644 --- a/misc/bash/favor.go +++ b/misc/bash/favor.go @@ -46,12 +46,12 @@ func init() { } }}, cli.SYSTEM: {Name: "system", Help: "命令", Hand: func(m *ice.Message, arg ...string) { - if len(arg) > 0 && arg[0] == mdb.ENGINE { + if len(arg) > 0 && arg[0] == cli.RUN { m.Cmdy(cli.SYSTEM, arg[1:]) return } - m.PushPlugin(cli.SYSTEM, cli.SYSTEM, mdb.ENGINE) + m.PushPlugin(cli.SYSTEM, cli.SYSTEM, cli.RUN) m.Push(kit.SSH_ARG, kit.Split(m.Option(kit.MDB_TEXT))) }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { diff --git a/misc/bash/sess.go b/misc/bash/sess.go index 86b1a90a..8b68220d 100644 --- a/misc/bash/sess.go +++ b/misc/bash/sess.go @@ -55,6 +55,8 @@ func init() { if strings.TrimSpace(m.Option(SID)) != "" { m.Option(mdb.FIELDS, m.Conf(m.Prefix(SESS), kit.META_FIELD)) msg := m.Cmd(mdb.SELECT, m.Prefix(SESS), "", mdb.HASH, kit.MDB_HASH, strings.TrimSpace(m.Option(SID))) + + // 用户信息 if m.Option(SID, msg.Append(kit.MDB_HASH)) != "" { m.Option(aaa.USERNAME, msg.Append(aaa.USERNAME)) m.Option(tcp.HOSTNAME, msg.Append(tcp.HOSTNAME)) diff --git a/misc/bash/sync.go b/misc/bash/sync.go index e662fb03..5811154d 100644 --- a/misc/bash/sync.go +++ b/misc/bash/sync.go @@ -34,7 +34,7 @@ func init() { mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) { switch arg[0] { case kit.MDB_TOPIC: - m.Cmdy(m.Prefix(FAVOR)).Appendv(ice.MSG_APPEND, kit.MDB_TOPIC, kit.MDB_COUNT, kit.MDB_TIME) + m.Cmdy(m.Prefix(FAVOR), mdb.INPUTS) } }}, FAVOR: {Name: "favor topic type name text", Help: "收藏", Hand: func(m *ice.Message, arg ...string) { @@ -44,15 +44,13 @@ func init() { }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { if len(arg) > 0 { m.Option(mdb.FIELDS, mdb.DETAIL) - m.Option(mdb.CACHE_FILED, kit.MDB_ID) - m.Option(mdb.CACHE_VALUE, arg[0]) } else { m.Option(mdb.FIELDS, m.Conf(SYNC, kit.META_FIELD)) m.Option(ice.MSG_CONTROL, ice.CONTROL_PAGE) defer m.PushAction(FAVOR) } - m.Cmdy(mdb.SELECT, m.Prefix(SYNC), "", mdb.LIST, m.Option(mdb.CACHE_FILED), m.Option(mdb.CACHE_VALUE)) + m.Cmdy(mdb.SELECT, m.Prefix(SYNC), "", mdb.LIST, kit.MDB_ID, arg) }}, "/sync": {Name: "/sync", Help: "同步", Action: map[string]*ice.Action{ HISTORY: {Name: "history", Help: "历史", Hand: func(m *ice.Message, arg ...string) { diff --git a/misc/bash/trash.go b/misc/bash/trash.go index e25ce52e..a57d5d05 100644 --- a/misc/bash/trash.go +++ b/misc/bash/trash.go @@ -7,10 +7,12 @@ import ( "github.com/shylinux/icebergs/base/nfs" "github.com/shylinux/icebergs/base/tcp" kit "github.com/shylinux/toolkits" - - "path" ) +const ( + FROM = "from" + TO = "to" +) const TRASH = "trash" func init() { @@ -23,36 +25,39 @@ func init() { Commands: map[string]*ice.Command{ TRASH: {Name: "TRASH hash path auto prunes", Help: "回收站", Action: map[string]*ice.Action{ mdb.INSERT: {Name: "insert from= to=", Help: "添加", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy(mdb.INSERT, m.Prefix(TRASH), "", mdb.HASH, "from", m.Option("from"), "to", m.Option("to")) + m.Cmdy(mdb.INSERT, m.Prefix(TRASH), "", mdb.HASH, FROM, m.Option(FROM), TO, m.Option(TO)) }}, mdb.REMOVE: {Name: "remove", Help: "删除", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy(cli.SYSTEM, "rm", "-rf", m.Option("to")) - m.Cmdy(mdb.DELETE, m.Prefix(TRASH), "", mdb.HASH, kit.MDB_HASH, m.Option(kit.MDB_HASH)) - }}, - "reback": {Name: "reback", Help: "恢复", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy(cli.SYSTEM, "mv", m.Option("to"), m.Option("from")) + m.Cmdy(cli.SYSTEM, "rm", "-rf", m.Option(TO)) m.Cmdy(mdb.DELETE, m.Prefix(TRASH), "", mdb.HASH, kit.MDB_HASH, m.Option(kit.MDB_HASH)) }}, mdb.PRUNES: {Name: "prunes", Help: "清理", Hand: func(m *ice.Message, arg ...string) { }}, + "reback": {Name: "reback", Help: "恢复", Hand: func(m *ice.Message, arg ...string) { + m.Cmdy(cli.SYSTEM, "mv", m.Option(TO), m.Option(FROM)) + m.Cmdy(mdb.DELETE, m.Prefix(TRASH), "", mdb.HASH, kit.MDB_HASH, m.Option(kit.MDB_HASH)) + }}, + nfs.DIR: {Name: "dir", Help: "目录", Hand: func(m *ice.Message, arg ...string) { + if len(arg) > 0 && arg[0] == cli.RUN { + m.Option(nfs.DIR_ROOT, m.Option(TO)) + m.Cmdy(nfs.DIR, kit.Select("", arg, 1)) + return + } + m.PushPlugin(nfs.DIR, nfs.DIR, cli.RUN) + }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { - if len(arg) > 0 { - m.Cmd(mdb.SELECT, m.Prefix(TRASH), "", mdb.HASH, kit.MDB_HASH, arg).Table(func(index int, value map[string]string, head []string) { - m.Cmdy(nfs.DIR, path.Join(value["to"], kit.Select("", arg, 1))) - }) - return - } m.Option(mdb.FIELDS, kit.Select(m.Conf(m.Prefix(TRASH), kit.META_FIELD), mdb.DETAIL, len(arg) > 0)) m.Cmdy(mdb.SELECT, m.Prefix(TRASH), "", mdb.HASH, kit.MDB_HASH, arg) - m.PushAction("reback", mdb.REMOVE) + m.PushAction(nfs.DIR, "reback", mdb.REMOVE) }}, "/trash": {Name: "/trash", Help: "回收", Action: map[string]*ice.Action{ - mdb.EXPORT: {Name: "export", Help: "导出", Hand: func(m *ice.Message, arg ...string) { + mdb.INSERT: {Name: "insert from to", Help: "添加", Hand: func(m *ice.Message, arg ...string) { + m.Cmdy(mdb.INSERT, m.Prefix(TRASH), "", mdb.HASH, tcp.HOSTNAME, m.Option(tcp.HOSTNAME), + kit.MDB_SIZE, m.Option(kit.MDB_SIZE), FROM, m.Option(FROM), TO, m.Option(TO)) }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { - m.Cmdy(mdb.INSERT, m.Prefix(TRASH), "", mdb.HASH, tcp.HOSTNAME, m.Option(tcp.HOSTNAME), - kit.MDB_SIZE, m.Option(kit.MDB_SIZE), "from", m.Option("from"), "to", m.Option("to")) + }}, }, }) diff --git a/misc/git/spide.go b/misc/git/spide.go index 4891e59c..99c0be97 100644 --- a/misc/git/spide.go +++ b/misc/git/spide.go @@ -3,6 +3,7 @@ package git import ( "os" "path" + "strings" ice "github.com/shylinux/icebergs" "github.com/shylinux/icebergs/base/cli" @@ -11,8 +12,6 @@ import ( "github.com/shylinux/icebergs/base/nfs" "github.com/shylinux/icebergs/core/code" kit "github.com/shylinux/toolkits" - - "strings" ) const SPIDE = "spide"