diff --git a/base/nfs/save.go b/base/nfs/save.go index 1740c546..d823661b 100644 --- a/base/nfs/save.go +++ b/base/nfs/save.go @@ -77,6 +77,8 @@ func _link_file(m *ice.Message, name string, from string) { const ( CONTENT = "content" ALIAS = "alias" + FROM = "from" + TO = "to" ) const LOAD = "load" const DEFS = "defs" diff --git a/base/nfs/trash.go b/base/nfs/trash.go index 67dd3966..5d71b20f 100644 --- a/base/nfs/trash.go +++ b/base/nfs/trash.go @@ -30,9 +30,6 @@ func _trash_create(m *ice.Message, from string) { } } -const ( - FROM = "from" -) const TRASH = "trash" func init() { diff --git a/base/web/broad.go b/base/web/broad.go index 1f16bcb1..7b4d5e73 100644 --- a/base/web/broad.go +++ b/base/web/broad.go @@ -28,7 +28,7 @@ func _broad_send(m *ice.Message, host, port string, remote_host, remote_port str } func _broad_serve(m *ice.Message, host, port string) { m.Go(func() { - _broad_send(m.Sleep("1s"), host, port, "255.255.255.255", "9020", mdb.TYPE, ice.Info.NodeType, mdb.NAME, ice.Info.NodeName) + _broad_send(m.Sleep("100ms"), host, port, "255.255.255.255", "9020", mdb.TYPE, ice.Info.NodeType, mdb.NAME, ice.Info.NodeName) }) if s, e := net.ListenUDP("udp4", _broad_addr(m, "0.0.0.0", port)); m.Assert(e) { defer s.Close() diff --git a/base/web/dream.go b/base/web/dream.go index 049eef29..22809089 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -109,7 +109,7 @@ func init() { _dream_list(m).Cut("name,status,time") case "repos": m.Cmdy(SPIDE, ice.OPS, SPIDE_MSG, "/x/list") - // m.Cmdy(SPIDE, ice.DEV, SPIDE_MSG, "/x/list") + m.Cmdy(SPIDE, ice.DEV, SPIDE_MSG, "/x/list") m.Cmdy(SPIDE, ice.SHY, SPIDE_MSG, "/x/list") default: gdb.Event(m, "", arg) diff --git a/base/web/serve.go b/base/web/serve.go index 29d41af3..86a4fbd5 100644 --- a/base/web/serve.go +++ b/base/web/serve.go @@ -179,13 +179,13 @@ func init() { Index.MergeCommands(ice.Commands{ SERVE: {Name: "serve name auto start", Help: "服务器", Actions: ice.MergeActions(ice.Actions{ ice.CTX_INIT: {Hand: func(m *ice.Message, arg ...string) { cli.NodeInfo(m, ice.Info.Pathname, WORKER) }}, - cli.START: {Name: "start dev name=web proto=http host port=9020 nodename username usernick", Hand: func(m *ice.Message, arg ...string) { + cli.START: {Name: "start dev name proto host port=9020 nodename username usernick", Hand: func(m *ice.Message, arg ...string) { _serve_start(m) }}, SERVE_START: {Hand: func(m *ice.Message, arg ...string) { m.Go(func() { opened := false - m.Sleep("1s").Cmd(SPACE, func(values ice.Maps) { + m.Sleep("2s").Cmd(SPACE, func(values ice.Maps) { if values[mdb.TYPE] == CHROME { opened = true } diff --git a/misc/git/server.go b/misc/git/server.go index 5098d0fa..c67527a5 100644 --- a/misc/git/server.go +++ b/misc/git/server.go @@ -146,7 +146,7 @@ func init() { _repos_cat(m, dir, arg[1], arg[2], kit.Select("", arg, 3)) } }}, - SERVER: {Name: "server repos branch commit path auto create import", Help: "服务器", Actions: ice.MergeActions(ice.Actions{ + SERVER: {Name: "server repos branch commit path auto create import", Help: "源代码", Actions: ice.MergeActions(ice.Actions{ mdb.CREATE: {Name: "create name*", Hand: func(m *ice.Message, arg ...string) { _repos_init(m, path.Join(ice.USR_LOCAL_REPOS, m.Option(mdb.NAME))) }}, diff --git a/misc/git/status.go b/misc/git/status.go index eb6bb02d..82f44dc4 100644 --- a/misc/git/status.go +++ b/misc/git/status.go @@ -60,7 +60,7 @@ func _status_tags(m *ice.Message) { return text } if v, ok := vs[kit.Select("", strings.Split(ls[0], ice.PS), -1)]; ok && ls[1] != v { - m.Logs(mdb.MODIFY, REPOS, ls[0], "from", ls[1], "to", v) + m.Logs(mdb.MODIFY, REPOS, ls[0], nfs.FROM, ls[1], nfs.TO, v) text, change = strings.Replace(text, ls[1], v, -1), true } return text @@ -182,9 +182,9 @@ func init() { switch m.Option(ctx.ACTION) { case "insteadof": switch arg[0] { - case "from": + case nfs.FROM: m.Push(arg[0], kit.MergeURL2(ice.Info.Make.Remote, ice.PS)) - case "to": + case nfs.TO: m.Cmd(web.BROAD, func(values ice.Maps) { m.Push(arg[0], kit.Format("http://%s:%s/", values[tcp.HOST], values[tcp.PORT])) }) @@ -265,13 +265,15 @@ func init() { }}, "change": {Help: "变更", Hand: func(m *ice.Message, arg ...string) { }}, - "insteadof": {Name: "insteadof from to", Help: "代理", Hand: func(m *ice.Message, arg ...string) { - m.Cmd("configs", func(values ice.Maps) { - if values[mdb.VALUE] == m.Option("from") { + "insteadof": {Name: "insteadof from* to", Help: "代理", Hand: func(m *ice.Message, arg ...string) { + m.Cmd(CONFIGS, func(values ice.Maps) { + if values[mdb.VALUE] == m.Option(nfs.FROM) { _configs_set(m, "--unset", values[mdb.NAME]) } }) - _git_cmd(m, "config", "--global", "url."+m.Option("to")+".insteadOf", m.Option("from")) + if m.Option(nfs.TO) != "" { + _git_cmd(m, "config", "--global", "url."+m.Option(nfs.TO)+".insteadof", m.Option(nfs.FROM)) + } }}, "branch_switch": {Help: "切换", Hand: func(m *ice.Message, arg ...string) { _repos_cmd(m, m.Option(REPOS), "checkout", m.Option(BRANCH))