From 6966a524f0d617ec0bd720e42636b05c3fb54c66 Mon Sep 17 00:00:00 2001 From: harveyshao Date: Tue, 3 Aug 2021 20:27:07 +0800 Subject: [PATCH] opt some --- base/mdb/hash.go | 12 ++++++------ core/chat/files.go | 2 +- core/chat/location.go | 2 +- core/chat/meet.go | 2 +- core/chat/paste.go | 2 +- core/chat/river.go | 2 +- core/chat/scan.go | 2 +- misc.go | 4 +++- 8 files changed, 15 insertions(+), 13 deletions(-) diff --git a/base/mdb/hash.go b/base/mdb/hash.go index 18008dfc..312b27f5 100644 --- a/base/mdb/hash.go +++ b/base/mdb/hash.go @@ -140,22 +140,22 @@ func _hash_inputs(m *ice.Message, prefix, chain string, field, value string) { m.Sort(kit.MDB_COUNT, "int_r") } -func HashAction(key string, fields ...string) map[string]*ice.Action { +func HashAction(fields ...string) map[string]*ice.Action { list := map[string]*ice.Action{ MODIFY: {Name: "modify", Help: "编辑", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy(MODIFY, m.Prefix(key), "", HASH, m.OptionSimple(kit.MDB_HASH), arg) + m.Cmdy(MODIFY, m.PrefixKey(), "", HASH, m.OptionSimple(kit.MDB_HASH), arg) }}, REMOVE: {Name: "remove", Help: "删除", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy(DELETE, m.Prefix(key), "", HASH, m.OptionSimple(kit.MDB_HASH)) + m.Cmdy(DELETE, m.PrefixKey(), "", HASH, m.OptionSimple(kit.MDB_HASH)) }}, EXPORT: {Name: "export", Help: "导出", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy(EXPORT, m.Prefix(key), "", HASH) + m.Cmdy(EXPORT, m.PrefixKey(), "", HASH) }}, IMPORT: {Name: "import", Help: "导入", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy(IMPORT, m.Prefix(key), "", HASH) + m.Cmdy(IMPORT, m.PrefixKey(), "", HASH) }}, INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy(INPUTS, m.Prefix(key), "", HASH, arg) + m.Cmdy(INPUTS, m.PrefixKey(), "", HASH, arg) }}, } if len(fields) == 0 { diff --git a/core/chat/files.go b/core/chat/files.go index 19632258..8b678725 100644 --- a/core/chat/files.go +++ b/core/chat/files.go @@ -23,7 +23,7 @@ func init() { up := kit.Simple(m.Optionv(ice.MSG_UPLOAD)) m.Cmdy(mdb.INSERT, m.Prefix(FILES), "", mdb.HASH, kit.MDB_TYPE, kit.Ext(up[1]), kit.MDB_NAME, up[1], kit.MDB_SIZE, up[2], kit.MDB_DATA, up[0]) }}, - }, mdb.HashAction(FILES)), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + }, mdb.HashAction()), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Fields(len(arg), m.Conf(FILES, kit.META_FIELD)) m.Cmdy(mdb.SELECT, m.Prefix(FILES), "", mdb.HASH, kit.MDB_HASH, arg) m.Table(func(index int, value map[string]string, head []string) { diff --git a/core/chat/location.go b/core/chat/location.go index 8f2293af..d3dd7188 100644 --- a/core/chat/location.go +++ b/core/chat/location.go @@ -48,7 +48,7 @@ func init() { mdb.CREATE: {Name: "create type=text name text latitude longitude", Help: "添加", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(mdb.INSERT, m.Prefix(LOCATION), "", mdb.HASH, arg) }}, - }, mdb.HashAction(LOCATION)), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + }, mdb.HashAction()), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Fields(len(arg), m.Conf(LOCATION, kit.META_FIELD)) m.Cmdy(mdb.SELECT, m.Prefix(LOCATION), "", mdb.HASH, kit.MDB_HASH, arg) m.PushAction(OPENLOCATION, mdb.REMOVE) diff --git a/core/chat/meet.go b/core/chat/meet.go index 76a3ed5f..9082bf2d 100644 --- a/core/chat/meet.go +++ b/core/chat/meet.go @@ -26,7 +26,7 @@ func init() { mdb.CREATE: {Name: "create name 照片 性别 年龄 身高 体重 籍贯 户口 学历 学校 职业 公司 年薪 资产 家境", Help: "添加", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(mdb.INSERT, m.Prefix(MISS), "", mdb.HASH, arg) }}, - }, mdb.HashAction(MISS)), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + }, mdb.HashAction()), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Fields(len(arg), m.Conf(MISS, kit.META_FIELD)) m.Cmd(mdb.SELECT, m.Prefix(MISS), "", mdb.HASH, kit.MDB_NAME, arg).Table(func(index int, value map[string]string, head []string) { value["照片"] = kit.Format(``, value["照片"], kit.Select("100", "400", m.Option(mdb.FIELDS) == mdb.DETAIL)) diff --git a/core/chat/paste.go b/core/chat/paste.go index a5b82a17..b1fb0b78 100644 --- a/core/chat/paste.go +++ b/core/chat/paste.go @@ -27,7 +27,7 @@ func init() { _trans(arg, map[string]string{"data": "text"}) m.Cmdy(mdb.INSERT, m.Prefix(PASTE), "", mdb.HASH, arg) }}, - }, mdb.HashAction(PASTE)), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + }, mdb.HashAction()), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Fields(len(arg), m.Conf(PASTE, kit.META_FIELD)) if m.Cmdy(mdb.SELECT, cmd, "", mdb.HASH, kit.MDB_HASH, arg); len(arg) > 0 { m.PushScript(ssh.SCRIPT, m.Append(kit.MDB_TEXT)) diff --git a/core/chat/river.go b/core/chat/river.go index da53f213..f67da959 100644 --- a/core/chat/river.go +++ b/core/chat/river.go @@ -179,7 +179,7 @@ func init() { SHARE: {Name: "share", Help: "共享", Hand: func(m *ice.Message, arg ...string) { _header_share(m, arg...) }}, - }, mdb.HashAction(RIVER)), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + }, mdb.HashAction()), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Cmdy(mdb.SELECT, RIVER, "", mdb.HASH, kit.MDB_HASH, arg) m.PushAction(mdb.REMOVE) }}, diff --git a/core/chat/scan.go b/core/chat/scan.go index e94994a5..994d88fe 100644 --- a/core/chat/scan.go +++ b/core/chat/scan.go @@ -26,7 +26,7 @@ func init() { mdb.CREATE: {Name: "create type=text name=hi text:textarea=hi", Help: "添加", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(mdb.INSERT, m.Prefix(SCAN), "", mdb.HASH, arg) }}, - }, mdb.HashAction(SCAN)), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + }, mdb.HashAction()), Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Fields(len(arg), m.Conf(SCAN, kit.META_FIELD)) if m.Cmdy(mdb.SELECT, m.Prefix(SCAN), "", mdb.HASH, kit.MDB_HASH, arg); len(arg) > 0 { m.PushScript(ssh.SCRIPT, m.Append(kit.MDB_TEXT)) diff --git a/misc.go b/misc.go index b4401065..e4411b23 100644 --- a/misc.go +++ b/misc.go @@ -433,8 +433,10 @@ func MergeAction(list ...map[string]*Action) map[string]*Action { } for _, item := range list[1:] { for k, v := range item { - if _, ok := list[0][k]; !ok { + if h, ok := list[0][k]; !ok { list[0][k] = v + } else if h.Hand == nil { + h.Hand = v.Hand } } }