liubin/icebergs
1
0
Fork 0
forked from x/icebergs
Code Pull Requests Activity

add some

Browse Source
This commit is contained in:
IT 老营长 @云轩领航-创始人 2024-04-03 02:55:42 +08:00
parent 045f57af43
commit fd319e30e4
3 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/web/space.go
View File

@ -378,7 +378,7 @@ func init() {
})
m.Sort("", kit.Simple(aaa.LOGIN, WEIXIN, PORTAL, WORKER, SERVER, ORIGIN))
} else {
if arg[0] == "" {
if kit.IsIn(arg[0], "", ice.CONTEXTS) {
m.Cmdy(arg[1:])
return
}

57
core/code/version.go
View File

@ -29,10 +29,12 @@ func init() {
}},
"sync": {Help: "同步", Hand: func(m *ice.Message, arg ...string) {
repos := map[string]string{}
m.Cmds("web.code.git.repos").Table(func(value ice.Maps) { repos[strings.Split(value[web.ORIGIN], "://")[1]] = value[nfs.VERSION] })
m.Cmd("web.code.mod", mdb.RENDER, MOD, ice.GO_MOD, nfs.PWD).Table(func(value ice.Maps) { repos[value[REQUIRE]] = value[VERSION] })
res := m.Cmdx(nfs.CAT, path.Join(nfs.USR_LOCAL_WORK, m.Option(SPACE), ice.GO_MOD), func(ls []string, text string) string {
if len(ls) == 2 {
if len(ls) > 1 {
if v, ok := repos[ls[0]]; ok {
m.Debug("what %v %v => %v", ls[0], ls[1], repos[ls[0]])
text = lex.TB + ls[0] + lex.SP + v
}
}
@ -41,15 +43,22 @@ func init() {
m.Cmd(nfs.SAVE, path.Join(nfs.USR_LOCAL_WORK, m.Option(SPACE), ice.GO_MOD), res)
m.Cmd(SPACE, m.Option(SPACE), cli.SYSTEM, GO, MOD, "tidy")
}},
"add": {Name: "add version", Hand: func(m *ice.Message, arg ...string) {
"tag": {Name: "tag version", Hand: func(m *ice.Message, arg ...string) {
m.Cmd(SPACE, m.Option(SPACE), cli.SYSTEM, GIT, TAG, m.Option(VERSION))
m.Cmd(SPACE, m.Option(SPACE), VIMER, COMPILE)
m.Sleep3s()
}},
"xterm": {Hand: func(m *ice.Message, arg ...string) {
web.ProcessPodCmd(m, m.Option(web.SPACE), m.ActionKey(), cli.SH, arg...)
}},
"status": {Hand: func(m *ice.Message, arg ...string) {
web.ProcessPodCmd(m, m.Option(web.SPACE), m.ActionKey(), nil, arg...)
}},
}), Hand: func(m *ice.Message, arg ...string) {
repos := map[string]string{}
list := map[string]map[string]string{}
list[ice.Info.Pathname] = map[string]string{}
m.Cmds("web.code.git.repos").Table(func(value ice.Maps) { repos[strings.Split(value[web.ORIGIN], "://")[1]] = value[nfs.VERSION] })
m.Cmd("web.code.mod", mdb.RENDER, MOD, ice.GO_MOD, nfs.PWD).Table(func(value ice.Maps) {
list[ice.Info.Pathname][value[REQUIRE]] = value[VERSION]
if value[REPLACE] == nfs.PWD {
@ -74,24 +83,46 @@ func init() {
for space, v := range list {
diff := false
m.Push(web.SPACE, space)
m.Push(MODULE, list[space][MODULE])
m.Push(VERSION, list[space][VERSION])
m.Push(MODULE, v[MODULE])
m.Push(VERSION, v[VERSION])
kit.For(repos, func(k, _v string) {
if kit.IsIn(k,
"shylinux.com/x/go-qrcode",
"shylinux.com/x/websocket",
) {
return
}
if k == v[MODULE] || v[k] == "" {
m.Push(k, "")
} else if v[k] == _v {
m.Push(k, v[k])
kit.If(v[k] != "" && v[k] != _v, func() { diff = true })
} else {
m.Push(k, v[k]+" => "+_v)
diff = true
}
})
m.Push("diff", list[space]["diff"])
button, status := []ice.Any{}, ""
if diff {
m.Push(mdb.STATUS, html.DANGER).PushButton("sync", "add")
} else {
button, status = append(button, "sync"), html.DANGER
}
if list[space]["diff"] != "" {
button = append(button, "status")
}
if strings.Contains(list[space][VERSION], "-") {
m.Push(mdb.STATUS, "").PushButton("add")
} else {
m.Push(mdb.STATUS, "").PushButton("")
button = append(button, "tag")
}
if len(button) > 0 {
button = append(button, "xterm")
}
m.Push("diff", list[space]["diff"]).Push(mdb.STATUS, status).PushButton(button...)
}
fields := []string{}
for _, k := range m.Appendv(ice.MSG_APPEND) {
if len(kit.TrimArg(m.Appendv(k)...)) > 0 {
fields = append(fields, k)
}
}
}
m.Sort(web.SPACE, ice.STR_R)
m.Cut(fields...).Sort(web.SPACE, ice.STR_R)
}},
})

4
misc/git/repos.go
View File

@ -613,6 +613,10 @@ func init() {
}
}},
TAG: {Name: "tag version", Hand: func(m *ice.Message, arg ...string) {
m.Option(cli.CMD_DIR, _repos_path(m, m.Option(nfs.REPOS)))
_git_cmd(m, "tag", m.Option(VERSION))
_repos_insert(m.Spawn(), m.Option(cli.CMD_DIR))
return
repos := _repos_open(m, m.Option(REPOS))
if refer, err := repos.Head(); !m.Warn(err) {
kit.If(m.Option(VERSION) == "", func() { m.Option(VERSION, _repos_tag(m, m.Option(TAGS))) })