From 3b7c5bb195f2f1ebf9cbae1810904e632c0a91f8 Mon Sep 17 00:00:00 2001 From: shaoying Date: Mon, 19 Jul 2021 08:50:42 +0800 Subject: [PATCH] opt chrome --- misc/chrome/chrome.go | 7 ++--- misc/chrome/chrome.shy | 5 ++-- misc/chrome/favor.go | 47 +++++++++++++++++----------------- misc/chrome/sync.go | 58 +++++++++++++++++++++--------------------- 4 files changed, 59 insertions(+), 58 deletions(-) diff --git a/misc/chrome/chrome.go b/misc/chrome/chrome.go index 45645dd8..d573ca60 100644 --- a/misc/chrome/chrome.go +++ b/misc/chrome/chrome.go @@ -2,6 +2,7 @@ package crx import ( ice "github.com/shylinux/icebergs" + "github.com/shylinux/icebergs/base/cli" "github.com/shylinux/icebergs/base/web" "github.com/shylinux/icebergs/core/code" kit "github.com/shylinux/toolkits" @@ -18,11 +19,11 @@ var Index = &ice.Context{Name: CHROME, Help: "浏览器", ice.CTX_EXIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Save() }}, CHROME: {Name: "chrome wid tid url auto 启动 构建 下载", Help: "浏览器", Action: map[string]*ice.Action{ - "install": {Name: "install", Help: "下载", Hand: func(m *ice.Message, arg ...string) { + web.DOWNLOAD: {Name: "download", Help: "下载", Hand: func(m *ice.Message, arg ...string) { }}, - "build": {Name: "build", Help: "构建", Hand: func(m *ice.Message, arg ...string) { + cli.BUILD: {Name: "build", Help: "构建", Hand: func(m *ice.Message, arg ...string) { }}, - "start": {Name: "start", Help: "启动", Hand: func(m *ice.Message, arg ...string) { + cli.START: {Name: "start", Help: "启动", Hand: func(m *ice.Message, arg ...string) { }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Cmdy(web.SPACE, CHROME, CHROME, arg) diff --git a/misc/chrome/chrome.shy b/misc/chrome/chrome.shy index 52bc8225..1710ea26 100644 --- a/misc/chrome/chrome.shy +++ b/misc/chrome/chrome.shy @@ -10,11 +10,12 @@ chapter "安装" field chrome web.code.chrome.chrome chapter "应用" +field "同步流" web.code.chrome.sync +field "收藏夹" web.code.chrome.favor + field "浏览器" web.space field "蜘蛛侠" web.code.chrome.spide field "缓存池" web.code.chrome.cache -field "收藏夹" web.code.chrome.favor -field "同步流" web.code.chrome.sync section "命令行" refer ` diff --git a/misc/chrome/favor.go b/misc/chrome/favor.go index 04f735ce..89bf85fa 100644 --- a/misc/chrome/favor.go +++ b/misc/chrome/favor.go @@ -3,6 +3,7 @@ package crx import ( ice "github.com/shylinux/icebergs" "github.com/shylinux/icebergs/base/mdb" + "github.com/shylinux/icebergs/core/code" kit "github.com/shylinux/toolkits" ) @@ -12,50 +13,48 @@ func init() { Index.Merge(&ice.Context{ Configs: map[string]*ice.Config{ FAVOR: {Name: FAVOR, Help: "收藏夹", Value: kit.Data( - kit.MDB_SHORT, kit.MDB_TOPIC, kit.MDB_FIELD, "time,id,type,name,text", + kit.MDB_SHORT, kit.MDB_ZONE, kit.MDB_FIELD, "time,id,type,name,text", )}, }, Commands: map[string]*ice.Command{ - FAVOR: {Name: "favor topic id auto create export import", Help: "收藏夹", Action: map[string]*ice.Action{ - mdb.CREATE: {Name: "create topic", Help: "创建", Hand: func(m *ice.Message, arg ...string) { + FAVOR: {Name: "favor zone id auto export import", Help: "收藏夹", Action: map[string]*ice.Action{ + mdb.CREATE: {Name: "create zone", Help: "创建", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(mdb.INSERT, m.Prefix(FAVOR), "", mdb.HASH, arg) }}, - mdb.INSERT: {Name: "insert topic=数据结构 name=hi text=hello", Help: "添加", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy(mdb.INSERT, m.Prefix(FAVOR), "", mdb.HASH, kit.MDB_TOPIC, m.Option(kit.MDB_TOPIC)) - m.Cmdy(mdb.INSERT, m.Prefix(FAVOR), kit.Keys(kit.MDB_HASH, kit.Hashs(m.Option(kit.MDB_TOPIC))), mdb.LIST, arg) + mdb.INSERT: {Name: "insert zone=数据结构 type= name=hi text=hello", Help: "添加", Hand: func(m *ice.Message, arg ...string) { + m.Cmdy(mdb.INSERT, m.Prefix(FAVOR), "", mdb.HASH, m.OptionSimple(kit.MDB_ZONE)) + m.Cmdy(mdb.INSERT, m.Prefix(FAVOR), kit.KeyHash(m.Option(kit.MDB_ZONE)), mdb.LIST, arg) }}, mdb.MODIFY: {Name: "modify", Help: "编辑", Hand: func(m *ice.Message, arg ...string) { - m.Richs(m.Prefix(FAVOR), "", m.Option(kit.MDB_TOPIC), func(key string, value map[string]interface{}) { - m.Cmdy(mdb.MODIFY, m.Prefix(FAVOR), kit.Keys(kit.MDB_HASH, key), mdb.LIST, kit.MDB_ID, m.Option(kit.MDB_ID), arg) - }) + m.Cmdy(mdb.MODIFY, m.Prefix(FAVOR), "", mdb.ZONE, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), arg) }}, mdb.REMOVE: {Name: "remove", Help: "删除", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy(mdb.DELETE, m.Prefix(FAVOR), "", mdb.HASH, kit.MDB_TOPIC, m.Option(kit.MDB_TOPIC)) + m.Cmdy(mdb.DELETE, m.Prefix(FAVOR), "", mdb.ZONE, m.OptionSimple(kit.MDB_ZONE)) }}, mdb.EXPORT: {Name: "export", Help: "导出", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy(mdb.EXPORT, m.Prefix(FAVOR), "", mdb.HASH) + m.OptionFields(kit.MDB_ZONE, m.Conf(FAVOR, kit.META_FIELD)) + m.Cmdy(mdb.EXPORT, m.Prefix(FAVOR), "", mdb.ZONE) + m.Conf(FAVOR, kit.MDB_HASH, "") }}, mdb.IMPORT: {Name: "import", Help: "导入", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy(mdb.IMPORT, m.Prefix(FAVOR), "", mdb.HASH) + m.Cmdy(mdb.IMPORT, m.Prefix(FAVOR), "", mdb.ZONE) }}, mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) { switch arg[0] { - case kit.MDB_TOPIC: - m.Option(mdb.FIELDS, "time,count,topic") - m.Cmdy(mdb.SELECT, m.Prefix(FAVOR), "", mdb.HASH) + case kit.MDB_ZONE: + m.Cmdy(mdb.INPUTS, m.Prefix(FAVOR), "", mdb.HASH, arg) + default: + m.Cmdy(mdb.INPUTS, m.Prefix(FAVOR), kit.KeyHash(m.Option(kit.MDB_ZONE)), mdb.LIST, arg) } }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { - if len(arg) > 0 { - m.Option(mdb.FIELDS, kit.Select(m.Conf(m.Prefix(FAVOR), kit.META_FIELD), mdb.DETAIL, len(arg) > 1)) - m.Richs(m.Prefix(FAVOR), "", arg[0], func(key string, value map[string]interface{}) { - m.Cmdy(mdb.SELECT, m.Prefix(FAVOR), kit.Keys(kit.MDB_HASH, key), mdb.LIST, kit.MDB_ID, arg[1:]) - }) - return + m.Fields(len(arg) < 2, kit.Select(m.Conf(FAVOR, kit.META_FIELD), "time,zone,count", len(arg) == 0)) + if m.Cmdy(mdb.SELECT, m.Prefix(FAVOR), "", mdb.ZONE, arg); len(arg) == 0 { + m.Action(mdb.CREATE) + m.PushAction(mdb.REMOVE) + } else { + m.PushAction(code.INNER) } - m.Option(mdb.FIELDS, "time,count,topic") - m.Cmdy(mdb.SELECT, m.Prefix(FAVOR), "", mdb.HASH) - m.PushAction(mdb.REMOVE) }}, }, }) diff --git a/misc/chrome/sync.go b/misc/chrome/sync.go index 49312558..177d579e 100644 --- a/misc/chrome/sync.go +++ b/misc/chrome/sync.go @@ -3,10 +3,15 @@ package crx import ( ice "github.com/shylinux/icebergs" "github.com/shylinux/icebergs/base/mdb" - "github.com/shylinux/icebergs/base/web" kit "github.com/shylinux/toolkits" ) +const _sync_index = 1 + +func _sync_count(m *ice.Message) string { + return m.Conf(SYNC, kit.Keym(kit.MDB_COUNT)) +} + const SYNC = "sync" func init() { @@ -17,8 +22,21 @@ func init() { )}, }, Commands: map[string]*ice.Command{ - SYNC: {Name: "sync id auto export import", Help: "同步流", Action: map[string]*ice.Action{ + "/sync": {Name: "/sync", Help: "同步", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + m.Cmdy(SYNC, mdb.INSERT, arg) + }}, + SYNC: {Name: "sync id auto page export import", Help: "同步流", Action: map[string]*ice.Action{ + mdb.PREV: {Name: "prev", Help: "上一页", Hand: func(m *ice.Message, arg ...string) { + mdb.PrevPage(m, _sync_count(m), kit.Slice(arg, _sync_index)...) + }}, + mdb.NEXT: {Name: "next", Help: "下一页", Hand: func(m *ice.Message, arg ...string) { + mdb.NextPage(m, _sync_count(m), kit.Slice(arg, _sync_index)...) + }}, + mdb.INSERT: {Name: "insert type name text", Help: "添加", Hand: func(m *ice.Message, arg ...string) { + m.Cmdy(mdb.INSERT, m.Prefix(SYNC), "", mdb.LIST, m.OptionSimple("type,name,text")) + }}, mdb.EXPORT: {Name: "export", Help: "导出", Hand: func(m *ice.Message, arg ...string) { + m.OptionFields(m.Conf(SYNC, kit.META_FIELD)) m.Cmdy(mdb.EXPORT, m.Prefix(SYNC), "", mdb.LIST) }}, mdb.IMPORT: {Name: "import", Help: "导入", Hand: func(m *ice.Message, arg ...string) { @@ -26,37 +44,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)).Appendv(ice.MSG_APPEND, kit.MDB_TOPIC, kit.MDB_COUNT, kit.MDB_TIME) + case kit.MDB_ZONE: + m.Cmdy(FAVOR, ice.OptionFields("zone,count,time")) } }}, - FAVOR: {Name: "favor topic name", 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, SPIDE, kit.MDB_NAME, m.Option(kit.MDB_NAME), kit.MDB_TEXT, m.Option(kit.MDB_TEXT)) - }}, - }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { - if m.Option(mdb.FIELDS, kit.Select(m.Conf(SYNC, kit.META_FIELD), mdb.DETAIL, len(arg) > 0)); len(arg) > 0 { - m.Option("cache.field", kit.MDB_ID) - m.Option("cache.value", arg[0]) - } else { - defer m.PushAction(FAVOR) - if m.Option("_control", "page"); m.Option("cache.limit") == "" { - m.Option("cache.limit", "10") - } - } - - m.Cmdy(mdb.SELECT, m.Prefix(SYNC), "", mdb.LIST, m.Option("cache.field"), m.Option("cache.value")) - }}, - "/sync": {Name: "/sync", Help: "同步", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { - m.Cmdy(mdb.INSERT, m.Prefix(SYNC), "", mdb.LIST, kit.MDB_TYPE, SPIDE, - kit.MDB_NAME, m.Option(kit.MDB_NAME), kit.MDB_TEXT, m.Option(kit.MDB_TEXT)) - }}, - "/crx": {Name: "/crx", Help: "插件", Action: map[string]*ice.Action{ - web.HISTORY: {Name: "history", Help: "历史记录", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy("web.spide", web.SPIDE_SELF, "/code/chrome/sync", - kit.MDB_NAME, arg[1], kit.MDB_TEXT, arg[2]) + FAVOR: {Name: "favor zone name", Help: "收藏", Hand: func(m *ice.Message, arg ...string) { + m.Cmdy(m.Prefix(FAVOR), mdb.INSERT, m.OptionSimple("zone,type,name,text")) }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + m.OptionPage(kit.Slice(arg, _sync_index)...) + m.Fields(len(arg) == 0 || arg[0] == "", m.Conf(SYNC, kit.META_FIELD)) + m.Cmdy(mdb.SELECT, m.Prefix(SYNC), "", mdb.LIST, kit.MDB_ID, arg) + m.StatusTimeCountTotal(_sync_count(m)) + m.PushAction(FAVOR) }}, }, })