Merge pull request #1 from luopengift/v1.0.0

v1.0.1-release

Author: luopengift

cmd/exec.go

@@ -26,8 +26,8 @@ func Run(ctx context.Context, conf *config.Config) error {
 		fmt.Println(version.VERSION)
 		return nil
 	case params.Debug:
-		log.Display("params", params)
-		log.Display("config", conf)
+		log.Warn("params: %v", string(log.Dump(params)))
+		log.Warn("config: %v", string(log.Dump(conf)))
 		return nil
 	case len(os.Args) < 3: //登录交互模式
 		if conf.Remote { // 远程获取模式

console/console.go

@@ -156,9 +156,9 @@ func StartConsole(ctx context.Context, conf *config.Config) error {
 			r.Super = true
 			log.ConsoleWithMagenta("进入Super模式!")
 		case input == "print config":
-			log.Display("config", conf)
+			log.Warn("config: %v", string(log.Dump(conf)))
 		case input == "print runtime":
-			log.Display("runtime", r)
+			log.Warn("runtime: %v", string(log.Dump(r)))
 		case strings.HasPrefix(input, "dump "): // 存储配置文件
 			if r.Super {
 				inputList := strings.Split(input, " ")

pkg/endpoint/endpoints.go

@@ -52,10 +52,15 @@ func (eps Endpoints) Groups(kind string) Groups {
 }
 
 // Search search
-func (eps Endpoints) Search(search ...string) Endpoints {
-	result := Endpoints{}
-	for index, endpoint := range eps {
-		if FindWithIdx(endpoint, index, search...) {
+func (eps Endpoints) Search(querys ...string) Endpoints {
+	if len(querys) == 1 {
+		if id, err := strconv.Atoi(querys[0]); err == nil && id <= eps.Len() {
+			return Endpoints{eps[id]}
+		}
+	}
+	var result Endpoints
+	for _, endpoint := range eps {
+		if Find(endpoint.Name, querys...) || Find(endpoint.Host, querys...) || Find(endpoint.IP, querys...) {
 			result = append(result, endpoint)
 		}
 	}
@@ -65,8 +70,8 @@ func (eps Endpoints) Search(search ...string) Endpoints {
 // Match match
 func (eps Endpoints) Match(match string) Endpoints {
 	result := Endpoints{}
-	for index, endpoint := range eps {
-		if match == strconv.Itoa(index) || match == endpoint.Name || match == endpoint.Host || match == endpoint.IP {
+	for _, endpoint := range eps {
+		if match == endpoint.Name || match == endpoint.Host || match == endpoint.IP {
 			result = append(result, endpoint)
 		}
 	}

pkg/endpoint/groups.go

@@ -28,15 +28,13 @@ func (grps Groups) Print() {
 
 // Search search
 func (grps Groups) Search(querys ...string) Groups {
-	var result Groups
-	for index, group := range grps {
-		if len(querys) == 1 {
-			if querys[0] == strconv.Itoa(index) {
-				result = append(result, group)
-				continue
-			}
+	if len(querys) == 1 {
+		if id, err := strconv.Atoi(querys[0]); err == nil && id <= grps.Len() {
+			return Groups{grps[id]}
 		}
-
+	}
+	var result Groups
+	for _, group := range grps {
 		if Find(group.Name, querys...) {
 			result = append(result, group)
 		}

pkg/endpoint/users.go

@@ -13,40 +13,51 @@ var userFormat = "%-4v\t%-20s"
 type Users []string
 
 // Print print users
-func (s Users) Print() {
+func (u Users) Print() {
 	log.ConsoleWithGreen(fmt.Sprintf(userFormat, "[ID]", "用户名"))
-	for idx, user := range s {
+	for idx, user := range u {
 		log.ConsoleWithGreen(userFormat, fmt.Sprintf("[%v]", idx), user)
 	}
 }
 
 // Search search
-func (s Users) Search(querys ...string) Users {
-	var result Users
-	for index, user := range s {
-		if len(querys) == 1 {
-			if querys[0] == strconv.Itoa(index) {
-				result = append(result, user)
-				continue
-			}
+func (u Users) Search(querys ...string) Users {
+	if len(querys) == 1 {
+		if id, err := strconv.Atoi(querys[0]); err == nil && id <= u.Len() {
+			return Users{u[id]}
 		}
-
-		if Find(user, querys...) {
+	}
+	var result Users
+	for _, user := range u {
+		if FindOr(user, querys...) {
 			result = append(result, user)
-
 		}
-
 	}
 	return result
 }
 
 // Match Match
-func (s Users) Match(input string) Users {
+func (u Users) Match(input string) Users {
 	var result Users
-	for index, user := range s {
+	for index, user := range u {
 		if input == strconv.Itoa(index) || user == input {
 			result = append(result, user)
 		}
 	}
 	return result
 }
+
+// Len implements sort.Interface
+func (u Users) Len() int {
+	return len(u)
+}
+
+// Less implements sort.Interface
+func (u Users) Less(i, j int) bool {
+	return u[i] < u[j]
+}
+
+// Swap implements sort.Interface
+func (u Users) Swap(i, j int) {
+	u[i], u[j] = u[j], u[i]
+}

pkg/endpoint/util.go

@@ -1,22 +1,9 @@
 package endpoint
 
 import (
-	"strconv"
 	"strings"
-
-	"github.com/luopengift/ssh"
 )
 
-// FindWithIdx find
-func FindWithIdx(endpoint *ssh.Endpoint, idx int, querys ...string) bool {
-	if len(querys) == 1 {
-		if querys[0] == strconv.Itoa(idx) {
-			return true
-		}
-	}
-	return endpoint.Find(querys...)
-}
-
 // FindOr find key is contains in one of querys.
 func FindOr(key string, querys ...string) bool {
 	for _, query := range querys {