add language analysis

Author: zmh-program

api.go

@@ -21,7 +21,7 @@ func GetRepo(username string, repo string) (data map[string]interface{}, err err
 	return data, err
 }
 
-func GetLanguages(username string, repo string) (data map[string]interface{}, err error) {
+func GetLanguages(username string, repo string) (data map[string]float64, err error) {
 	err = Get(fmt.Sprintf("repos/%s/%s/languages", username, repo), &data)
 	return data, err
 }
@@ -70,7 +70,7 @@ func iterRepos(username string) (data []interface{}, err error) {
 
 func CollectLanguages(username string, repos []interface{}) (data map[string]float64, err error) {
 	data = make(map[string]float64)
-	channel := make(chan map[string]interface{}, len(repos))
+	channel := make(chan map[string]float64, len(repos))
 
 	for _, repo := range repos {
 		go func(username string, repo string) {
@@ -86,7 +86,7 @@ func CollectLanguages(username string, repos []interface{}) (data map[string]flo
 		select {
 		case languages := <-channel:
 			for k, v := range languages {
-				data[k] += v.(float64)
+				data[k] += v
 			}
 		}
 	}
@@ -118,7 +118,7 @@ func AnalysisUser(username string) (data iris.Map, err error, code int) {
 			"forks":     ScaleConvert(Sum(repos, "forks_count"), true),
 			"issues":    ScaleConvert(Sum(repos, "open_issues_count"), true),
 			"watchers":  ScaleConvert(Sum(repos, "watchers_count"), true),
-			"languages": languages,
+			"languages": CountLanguages(languages),
 		}, nil, iris.StatusOK
 	}
 	return nil, errors.New("user not found"), iris.StatusNotFound
@@ -144,7 +144,7 @@ func AnalysisRepo(username string, repo string) (data iris.Map, err error, code
 			"issues":    ScaleConvert(res["open_issues_count"].(float64), false),
 			"color":     GetColor(res["language"]),
 			"license":   getLicense(res["license"]),
-			"languages": languages,
+			"languages": CountLanguages(languages),
 		}, nil, iris.StatusOK
 	}
 	return nil, errors.New("repo not found"), iris.StatusNotFound

utils.go

@@ -62,6 +62,13 @@ func ScaleConvert(n float64, useSmallScale bool) string {
 	return fmt.Sprintf("%.1f%s", n, scaleUnits[idx])
 }
 
+func ThrowError(ctx iris.Context, message string, code int) {
+	ctx.StatusCode(code)
+	ctx.JSON(iris.Map{
+		"message": message,
+	})
+}
+
 func Get(uri string, ptr interface{}) (err error) {
 	req, err := http.NewRequest("GET", "https://api.github.com/"+uri, nil)
 	if err != nil {
@@ -89,9 +96,14 @@ func Get(uri string, ptr interface{}) (err error) {
 	return nil
 }
 
-func ThrowError(ctx iris.Context, message string, code int) {
-	ctx.StatusCode(code)
-	ctx.JSON(iris.Map{
-		"message": message,
-	})
+func CountLanguages(languages map[string]float64) map[string]string {
+	total := 0.
+	res := map[string]string{}
+	for _, v := range languages {
+		total += v
+	}
+	for k, v := range languages {
+		res[k] = fmt.Sprintf("%.0f%% (%s)", v/total*100, ScaleConvert(v, false))
+	}
+	return res
 }