rename util to base && refactor PrintTable

Author: lixiaojun629

util/cli.go base/cli.goutil/cli.go renamed to base/cli.go

@@ -1,4 +1,4 @@
-package util
+package base
 
 import (
 	"bufio"
@@ -136,24 +136,32 @@ func PrintJSON(dataSet interface{}) error {
 	return nil
 }
 
-//PrintTable 以表格方式打印数据集合
-func PrintTable(dataSet interface{}, fieldList []string) error {
+//PrintTableS 简化版表格打印，无需传表头，根据结构体反射解析
+func PrintTableS(dataSet interface{}) {
 	dataSetVal := reflect.ValueOf(dataSet)
+	fieldNameList := make([]string, 0)
+	if dataSetVal.Len() > 0 {
+		elemType := dataSetVal.Index(0).Type()
+		for i := 0; i < elemType.NumField(); i++ {
+			fieldNameList = append(fieldNameList, elemType.Field(i).Name)
+		}
+	}
+	if kind := dataSetVal.Kind(); kind == reflect.Slice || kind == reflect.Array {
+		displaySlice(dataSetVal, fieldNameList)
+	} else {
+		panic(fmt.Sprintf("Internal error, PrintTableS expect array or slice, accept %T", dataSet))
+	}
+}
 
+//PrintTable 以表格方式打印数据集合
+func PrintTable(dataSet interface{}, fieldList []string) {
+	dataSetVal := reflect.ValueOf(dataSet)
 	switch dataSetVal.Kind() {
 	case reflect.Slice, reflect.Array:
 		displaySlice(dataSetVal, fieldList)
-	case reflect.Map:
-		displayMap(dataSetVal, fieldList)
 	default:
-		return fmt.Errorf("PrintTable expect array,slice or map, accept %T", dataSet)
+		panic(fmt.Sprintf("PrintTable expect array,slice or map, accept %T", dataSet))
 	}
-	return nil
-}
-
-func displayMap(mapVal reflect.Value, fieldList []string) {
-	fmt.Println(mapVal, fieldList)
-	//todo
 }
 
 func displaySlice(listVal reflect.Value, fieldList []string) {
@@ -180,39 +188,42 @@ func displaySlice(listVal reflect.Value, fieldList []string) {
 		}
 		rowList = append(rowList, row)
 	}
+	printTable(rowList, fieldList, showFieldMap)
+}
 
+func printTable(rowList []map[string]interface{}, fieldList []string, fieldWidthMap map[string]int) {
 	for _, field := range fieldList {
-		tmpl := "%-" + strconv.Itoa(showFieldMap[field]+GAP) + "s"
+		tmpl := "%-" + strconv.Itoa(fieldWidthMap[field]+GAP) + "s"
 		fmt.Printf(tmpl, field)
 	}
 	fmt.Printf("\n")
 
 	for _, row := range rowList {
 		for _, field := range fieldList {
 			cutWidth := calcCutWidth(fmt.Sprintf("%v", row[field]))
-			tmpl := "%-" + strconv.Itoa(showFieldMap[field]-cutWidth+GAP) + "v"
+			tmpl := "%-" + strconv.Itoa(fieldWidthMap[field]-cutWidth+GAP) + "v"
 			fmt.Printf(tmpl, row[field])
 		}
 		fmt.Printf("\n")
 	}
 }
 
 func calcCutWidth(text string) int {
-	set := []*unicode.RangeTable{unicode.Han}
+	set := []*unicode.RangeTable{unicode.Han, unicode.Punct}
 	width := 0
 	for _, r := range text {
-		if unicode.IsOneOf(set, r) {
+		if unicode.IsOneOf(set, r) && r > unicode.MaxLatin1 {
 			width++
 		}
 	}
 	return width
 }
 
 func calcWidth(text string) int {
-	set := []*unicode.RangeTable{unicode.Han}
+	set := []*unicode.RangeTable{unicode.Han, unicode.Punct}
 	width := 0
 	for _, r := range text {
-		if unicode.IsOneOf(set, r) {
+		if unicode.IsOneOf(set, r) && r > unicode.MaxLatin1 {
 			width += 2
 		} else {
 			width++

util/cli_test.go base/cli_test.goutil/cli_test.go renamed to base/cli_test.go

@@ -1,10 +1,10 @@
-package util
+package base
 
 import "testing"
 
 func TestGetHomePath(t *testing.T) {
 	home := GetHomePath()
 	if home == "" {
-		t.Errorf("util.GetHomePath(), home shoud not be empty. Got :%q", home)
+		t.Errorf("base.GetHomePath(), home shoud not be empty. Got :%q", home)
 	}
 }

util/config.go base/config.goutil/config.go renamed to base/config.go

@@ -1,4 +1,4 @@
-package util
+package base
 
 import (
 	"encoding/json"
@@ -130,7 +130,8 @@ func (p *Config) ListConfig(json bool) error {
 	if json {
 		return PrintJSON(tmpConfig)
 	}
-	return PrintTable([]Config{tmpConfig}, []string{"PublicKey", "PrivateKey", "Region", "Zone", "ProjectID"})
+	PrintTable([]Config{tmpConfig}, []string{"PublicKey", "PrivateKey", "Region", "Zone", "ProjectID"})
+	return nil
 }
 
 //ClearConfig 清空配置

cmd/completion.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	. "github.com/ucloud/ucloud-cli/util"
+	. "github.com/ucloud/ucloud-cli/base"
 )
 
 // NewCmdCompletion ucloud completion

cmd/configure.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	. "github.com/ucloud/ucloud-cli/util"
+	. "github.com/ucloud/ucloud-cli/base"
 )
 
 var config = ConfigInstance

cmd/eip.go

@@ -22,7 +22,7 @@ import (
 	"github.com/ucloud/ucloud-sdk-go/sdk"
 
 	"github.com/spf13/cobra"
-	. "github.com/ucloud/ucloud-cli/util"
+	. "github.com/ucloud/ucloud-cli/base"
 )
 
 //NewCmdEIP ucloud eip

cmd/globalssh.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	. "github.com/ucloud/ucloud-cli/util"
+	. "github.com/ucloud/ucloud-cli/base"
 )
 
 //NewCmdGssh ucloud gssh

cmd/image.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	. "github.com/ucloud/ucloud-cli/util"
+	. "github.com/ucloud/ucloud-cli/base"
 )
 
 //NewCmdUImage ucloud uimage

cmd/project.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/ucloud/ucloud-sdk-go/services/uaccount"
 
-	. "github.com/ucloud/ucloud-cli/util"
+	. "github.com/ucloud/ucloud-cli/base"
 )
 
 //NewCmdProject ucloud project

cmd/region.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/ucloud/ucloud-sdk-go/services/uaccount"
 
-	. "github.com/ucloud/ucloud-cli/util"
+	. "github.com/ucloud/ucloud-cli/base"
 )
 
 //NewCmdRegion ucloud region
@@ -74,20 +74,19 @@ func listRegion() error {
 	}
 	if resp.RetCode != 0 {
 		return fmt.Errorf("Something wrong. RetCode:%d, Message:%s", resp.RetCode, resp.Message)
+	}
+	regionList := make([]RegionTable, 0)
+	regionMap := make(map[string][]string)
+	for _, region := range resp.Regions {
+		regionMap[region.Region] = append(regionMap[region.Region], region.Zone)
+	}
+	for region, zones := range regionMap {
+		regionList = append(regionList, RegionTable{region, strings.Join(zones, ", ")})
+	}
+	if global.json {
+		PrintJSON(regionList)
 	} else {
-		regionList := make([]RegionTable, 0)
-		regionMap := make(map[string][]string)
-		for _, region := range resp.Regions {
-			regionMap[region.Region] = append(regionMap[region.Region], region.Zone)
-		}
-		for region, zones := range regionMap {
-			regionList = append(regionList, RegionTable{region, strings.Join(zones, ", ")})
-		}
-		if global.json {
-			PrintJSON(regionList)
-		} else {
-			err = PrintTable(regionList, []string{"Region", "Zones"})
-		}
+		PrintTable(regionList, []string{"Region", "Zones"})
 	}
 	return err
 }