update user analysis

Author: zmh-program

api.go

@@ -42,16 +42,45 @@ func GetRepoExist(username string, repo string) bool {
 	return !(ok && val == "Not Found")
 }
 
+func iterRepos(username string) (data []interface{}, err error) {
+	repos, err := GetRepos(username)
+	if err != nil {
+		logger.Error(err)
+		return nil, err
+	}
+
+	var res []interface{}
+	for _, repo := range repos {
+		repo := repo.(map[string]interface{})
+		if !repo["fork"].(bool) {
+			res = append(res, repo)
+		}
+	}
+	return res, nil
+}
+
 func CollectLanguages(username string, repos []string) (data map[string]int, err error) {
 	data = make(map[string]int)
+	channel := make(chan map[string]interface{}, len(repos))
+
 	for _, repo := range repos {
-		languages, err := GetLanguages(username, repo)
-		if err != nil {
-			return data, err
-		}
-		for k, v := range languages {
-			data[k] += v.(int)
+		go func(username string, repo string) {
+			languages, err := GetLanguages(username, repo)
+			if err != nil {
+				return
+			}
+			channel <- languages
+		}(username, repo)
+	}
+
+	for range repos {
+		select {
+		case languages := <-channel:
+			for k, v := range languages {
+				data[k] += v.(int)
+			}
 		}
 	}
+
 	return data, nil
 }

main.go

@@ -1,19 +1,17 @@
 package main
 
 import (
-	"fmt"
 	"github.com/kataras/iris/v12"
 	"github.com/sirupsen/logrus"
 )
 
 func main() {
-	app := iris.New()
-	route := app.Party("/api")
+	app := iris.Default()
 	{
-		route.Use(iris.Compression)
-		route.Get("/user/{username:string}", AnalyseUser)
-		route.Get("/repo/{username:string}/{repo:string}", AnalyseRepo)
+		app.Get("/user/{username:string}", AnalyseUser)
+		app.Get("/repo/{username:string}/{repo:string}", AnalyseRepo)
 	}
+
 	logger.SetLevel(logrus.DebugLevel)
 	logger.SetFormatter(&Formatter{})
 
@@ -28,19 +26,28 @@ func AnalyseUser(ctx iris.Context) {
 	if GetUserExist(username) {
 		res, err := GetUser(username)
 		if err != nil {
-			ctx.StatusCode(iris.StatusInternalServerError)
-			ctx.JSON(iris.Map{
-				"message": err.Error(),
-			})
+			ThrowError(ctx, iris.StatusInternalServerError, err.Error())
+			return
+		}
+		repo, err := iterRepos(username)
+		if err != nil {
+			ThrowError(ctx, iris.StatusInternalServerError, err.Error())
 			return
 		}
-		fmt.Println(res)
-		ctx.JSON(iris.Map{})
+		ctx.JSON(iris.Map{
+			"username": username,
+			"location": res["location"],
+			"org":      res["type"] != "User",
+			"repos":    res["public_repos"],
+			"follower": ScaleConvert(res["followers"].(float64), true),
+			"stars":    ScaleConvert(Sum(repo, "stargazers_count"), true),
+			"forks":    ScaleConvert(Sum(repo, "forks_count"), true),
+			"issues":   ScaleConvert(Sum(repo, "open_issues_count"), true),
+			"watchers": ScaleConvert(Sum(repo, "watchers_count"), true),
+		})
+		return
 	}
-	ctx.StatusCode(iris.StatusNotFound)
-	ctx.JSON(iris.Map{
-		"message": "User not found.",
-	})
+	ThrowError(ctx, iris.StatusNotFound, "User not found.")
 }
 
 func AnalyseRepo(ctx iris.Context) {

utils.go

@@ -3,15 +3,16 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/kataras/iris/v12"
 	"github.com/sirupsen/logrus"
 	"io"
 	"net/http"
 )
 
-func Sum(array []int) int {
-	total := 0
-	for _, v := range array {
-		total += v
+func Sum(m []interface{}, k string) float64 {
+	total := 0.
+	for _, v := range m {
+		total += v.(map[string]interface{})[k].(float64)
 	}
 	return total
 }
@@ -73,3 +74,10 @@ func Get(uri string, ptr interface{}) (err error) {
 	}
 	return nil
 }
+
+func ThrowError(ctx iris.Context, code int, message string) {
+	ctx.StatusCode(code)
+	ctx.JSON(iris.Map{
+		"message": message,
+	})
+}