From dc686729a2c303b4fe35500439dd7b16fa895534 Mon Sep 17 00:00:00 2001
From: shaoying <shaoying@zuoyebang.com>
Date: Mon, 16 Nov 2020 15:53:23 +0800
Subject: [PATCH] opt some

---
 base/web/share.go |  4 ++--
 go.mod            |  2 +-
 misc/bash/sync.go | 16 +++++++++++++---
 misc/vim/sess.go  |  4 +++-
 misc/vim/sync.go  |  3 ++-
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/base/web/share.go b/base/web/share.go
index 09a26253..77418e0b 100644
--- a/base/web/share.go
+++ b/base/web/share.go
@@ -144,9 +144,9 @@ func init() {
 				p := path.Join(kit.Simple(m.Conf(SERVE, "meta.publish"), arg)...)
 				if m.W == nil {
 					m.Cmdy("nfs.cat", p)
-					return
+				} else {
+					m.Render(ice.RENDER_DOWNLOAD, p)
 				}
-				_share_local(m, p)
 			}},
 		}})
 }
diff --git a/go.mod b/go.mod
index ac8f2450..89653029 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/kr/pty v1.1.1
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/nareix/joy4 v0.0.0-20200507095837-05a4ffbb5369
-	github.com/shylinux/toolkits v0.1.9
+	github.com/shylinux/toolkits v0.2.0
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2
 	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
diff --git a/misc/bash/sync.go b/misc/bash/sync.go
index 5811154d..dd14718a 100644
--- a/misc/bash/sync.go
+++ b/misc/bash/sync.go
@@ -3,6 +3,7 @@ package bash
 import (
 	ice "github.com/shylinux/icebergs"
 	"github.com/shylinux/icebergs/base/aaa"
+	"github.com/shylinux/icebergs/base/cli"
 	"github.com/shylinux/icebergs/base/mdb"
 	"github.com/shylinux/icebergs/base/tcp"
 	kit "github.com/shylinux/toolkits"
@@ -34,10 +35,19 @@ 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), mdb.INPUTS)
+						m.Cmdy(FAVOR, mdb.INPUTS, arg)
 					}
 				}},
-				FAVOR: {Name: "favor topic type name text", Help: "收藏", Hand: func(m *ice.Message, arg ...string) {
+				cli.SYSTEM: {Name: "system", Help: "命令", Hand: func(m *ice.Message, arg ...string) {
+					if len(arg) > 0 && arg[0] == cli.RUN {
+						m.Cmdy(cli.SYSTEM, arg[1:])
+						return
+					}
+
+					m.PushPlugin(cli.SYSTEM, cli.SYSTEM, cli.RUN)
+					m.Push(cli.ARG, kit.Format(kit.Simple(kit.Split(m.Option(kit.MDB_TEXT)))))
+				}},
+				FAVOR: {Name: "favor topic=some@key type name text", Help: "收藏", Hand: func(m *ice.Message, arg ...string) {
 					m.Cmdy(m.Prefix(FAVOR), mdb.INSERT, kit.MDB_TOPIC, m.Option(kit.MDB_TOPIC),
 						kit.MDB_TYPE, m.Option(kit.MDB_TYPE), kit.MDB_NAME, m.Option(kit.MDB_NAME), kit.MDB_TEXT, m.Option(kit.MDB_TEXT))
 				}},
@@ -47,7 +57,7 @@ func init() {
 				} else {
 					m.Option(mdb.FIELDS, m.Conf(SYNC, kit.META_FIELD))
 					m.Option(ice.MSG_CONTROL, ice.CONTROL_PAGE)
-					defer m.PushAction(FAVOR)
+					defer m.PushAction(cli.SYSTEM, FAVOR)
 				}
 
 				m.Cmdy(mdb.SELECT, m.Prefix(SYNC), "", mdb.LIST, kit.MDB_ID, arg)
diff --git a/misc/vim/sess.go b/misc/vim/sess.go
index 79e31b0e..b5be80e1 100644
--- a/misc/vim/sess.go
+++ b/misc/vim/sess.go
@@ -55,14 +55,16 @@ func init() {
 					}
 				}
 
+				m.Debug("what %v", m.Option(SID))
 				if sid := strings.TrimSpace(m.Option(SID)); m.Option(SID, sid) != "" {
-					if msg := m.Cmd(SESS, sid); m.Option(SID, msg.Append(kit.MDB_HASH)) != "" {
+					if msg := m.Cmd(SESS, sid); msg.Append(kit.MDB_STATUS) != "" {
 						m.Option(aaa.USERNAME, msg.Append(aaa.USERNAME))
 						m.Option(tcp.HOSTNAME, msg.Append(tcp.HOSTNAME))
 					} else {
 						// 登录失败
 					}
 				}
+				m.Debug("what %v", m.Option(SID))
 				m.Render(ice.RENDER_RESULT)
 			}},
 			"/sess": {Name: "/sess", Help: "会话", Action: map[string]*ice.Action{
diff --git a/misc/vim/sync.go b/misc/vim/sync.go
index 7ec6de8e..c5cd1cb0 100644
--- a/misc/vim/sync.go
+++ b/misc/vim/sync.go
@@ -30,7 +30,8 @@ func init() {
 				m.Cmdy(mdb.SELECT, m.Prefix(SYNC), "", mdb.LIST, kit.MDB_ID, arg)
 			}},
 			"/sync": {Name: "/sync", Help: "同步", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
-				if m.Option(ARG) == "qa" {
+				switch m.Option(ARG) {
+				case "wq", "q", "qa":
 					m.Cmd("/sess", LOGOUT)
 				}