优化命令行显示

Orange-AFK · Dec 15, 2020 · 12909cd · 12909cd
1 parent ca88554
commit 12909cd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -45,13 +45,6 @@ exit:
 		fmt.Println(util.Cyan("欢迎使用trojan管理程序"))
 		fmt.Println()
 		menuList := []string{"trojan管理", "用户管理", "安装管理", "web管理", "查看配置", "生成json"}
-		for i := 0; i < len(menuList); i++ {
-			if i%2 == 0 {
-				fmt.Printf("%d.%-15s\t", i+1, menuList[i])
-			} else {
-				fmt.Printf("%d.%-15s\n\n", i+1, menuList[i])
-			}
-		}
 		switch util.LoopInput("请选择: ", menuList, false) {
 		case 1:
 			trojan.ControllMenu()

diff --git a/trojan/user.go b/trojan/user.go
@@ -13,7 +13,7 @@ import (
 func UserMenu() {
 	fmt.Println()
 	menu := []string{"新增用户", "删除用户", "限制流量", "清空流量", "设置限期", "取消限期"}
-	switch util.LoopInput("请选择: ", menu, true) {
+	switch util.LoopInput("请选择: ", menu, false) {
 	case 1:
 		AddUser()
 	case 2:

diff --git a/util/string.go b/util/string.go
@@ -61,16 +61,26 @@ func getChar(str string) string {
 }
 
 // LoopInput 循环输入选择, 或者直接回车退出
-func LoopInput(tip string, choices interface{}, print bool) int {
+func LoopInput(tip string, choices interface{}, singleRowPrint bool) int {
 	reflectValue := reflect.ValueOf(choices)
 	if reflectValue.Kind() != reflect.Slice && reflectValue.Kind() != reflect.Array {
 		fmt.Println("only support slice or array type!")
 		return -1
 	}
 	length := reflectValue.Len()
-	if print && reflectValue.Type().String() == "[]string" {
-		for i := 0; i < length; i++ {
-			fmt.Printf("%d.%s\n\n", i+1, reflectValue.Index(i).Interface())
+	if reflectValue.Type().String() == "[]string" {
+		if singleRowPrint {
+			for i := 0; i < length; i++ {
+				fmt.Printf("%d.%s\n\n", i+1, reflectValue.Index(i).Interface())
+			}
+		} else {
+			for i := 0; i < length; i++ {
+				if i%2 == 0 {
+					fmt.Printf("%d.%-15s\t", i+1, reflectValue.Index(i).Interface())
+				} else {
+					fmt.Printf("%d.%-15s\n\n", i+1, reflectValue.Index(i).Interface())
+				}
+			}
 		}
 	}
 	for {