diff --git a/core/team/miss.go b/core/team/miss.go index df2c4bc9..17b3e795 100644 --- a/core/team/miss.go +++ b/core/team/miss.go @@ -1,5 +1,10 @@ package team +import ( + ice "github.com/shylinux/icebergs" + kit "github.com/shylinux/toolkits" +) + const MISS = "miss" func init() { diff --git a/core/team/plan.go b/core/team/plan.go index a904dda2..0e3e2a42 100644 --- a/core/team/plan.go +++ b/core/team/plan.go @@ -1,5 +1,16 @@ package team +import ( + ice "github.com/shylinux/icebergs" + "github.com/shylinux/icebergs/base/ctx" + "github.com/shylinux/icebergs/base/gdb" + "github.com/shylinux/icebergs/base/mdb" + kit "github.com/shylinux/toolkits" + + "path" + "time" +) + const PLAN = "plan" func init() { diff --git a/core/team/team.go b/core/team/team.go index b7ed3976..caa56ecd 100644 --- a/core/team/team.go +++ b/core/team/team.go @@ -2,14 +2,7 @@ package team import ( ice "github.com/shylinux/icebergs" - "github.com/shylinux/icebergs/base/ctx" - "github.com/shylinux/icebergs/base/gdb" - "github.com/shylinux/icebergs/base/mdb" "github.com/shylinux/icebergs/base/web" - kit "github.com/shylinux/toolkits" - - "path" - "time" ) const TEAM = "team" diff --git a/misc/git/repos.go b/misc/git/repos.go index 803c3d2b..f87a9dfe 100644 --- a/misc/git/repos.go +++ b/misc/git/repos.go @@ -73,11 +73,18 @@ func init() { }}, "status": {Name: "status name=auto auto 提交 编译 下载", Help: "代码状态", Action: map[string]*ice.Action{ "pull": {Name: "pull", Help: "下载", Hand: func(m *ice.Message, arg ...string) { + m.Option("_process", "_progress") if m.Richs("progress", "", m.Option("_progress"), func(key string, value map[string]interface{}) { + m.Push("step", kit.Int(value["count"])*100/kit.Int(value["total"])) m.Push("count", value["count"]) m.Push("total", value["total"]) m.Push("name", value["name"]) }) != nil { + if m.Append("count") == m.Append("total") { + m.Option("_process", "") + m.Set(ice.MSG_APPEND) + m.Cmdy("status") + } return } @@ -94,6 +101,7 @@ func init() { }) }) m.Option("_progress", h) + m.Push("step", count*100/total) m.Push("count", count) m.Push("total", total) m.Push("name", "")