fix error cache

Author: zmh-program

api.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"errors"
 	"fmt"
 	"github.com/kataras/iris/v12"
 )
@@ -96,23 +95,23 @@ func CollectLanguages(username string, repos []interface{}) (data map[string]flo
 
 type AnalysisData struct {
 	Data iris.Map
-	Err  error
+	Err  string
 	Code int
 }
 
 func AnalysisUser(username string) AnalysisData {
 	if GetUserExist(username) {
 		res, err := GetUser(username)
 		if err != nil {
-			return AnalysisData{nil, err, iris.StatusInternalServerError}
+			return AnalysisData{nil, err.Error(), iris.StatusInternalServerError}
 		}
 		repos, err := iterRepos(username)
 		if err != nil {
-			return AnalysisData{nil, err, iris.StatusInternalServerError}
+			return AnalysisData{nil, err.Error(), iris.StatusInternalServerError}
 		}
 		languages, err := CollectLanguages(username, repos)
 		if err != nil {
-			return AnalysisData{nil, err, iris.StatusInternalServerError}
+			return AnalysisData{nil, err.Error(), iris.StatusInternalServerError}
 		}
 		return AnalysisData{
 			iris.Map{
@@ -126,21 +125,21 @@ func AnalysisUser(username string) AnalysisData {
 				"issues":    ScaleConvert(Sum(repos, "open_issues_count"), true),
 				"watchers":  ScaleConvert(Sum(repos, "watchers_count"), true),
 				"languages": CountLanguages(languages),
-			}, nil, iris.StatusOK,
+			}, "", iris.StatusOK,
 		}
 	}
-	return AnalysisData{nil, errors.New("user not found"), iris.StatusNotFound}
+	return AnalysisData{nil, "user not found", iris.StatusNotFound}
 }
 
 func AnalysisRepo(username string, repo string) AnalysisData {
 	if GetRepoExist(username, repo) {
 		res, err := GetRepo(username, repo)
 		if err != nil {
-			return AnalysisData{nil, err, iris.StatusInternalServerError}
+			return AnalysisData{nil, err.Error(), iris.StatusInternalServerError}
 		}
 		languages, err := GetLanguages(username, repo)
 		if err != nil {
-			return AnalysisData{nil, err, iris.StatusInternalServerError}
+			return AnalysisData{nil, err.Error(), iris.StatusInternalServerError}
 		}
 		return AnalysisData{
 			iris.Map{
@@ -154,8 +153,8 @@ func AnalysisRepo(username string, repo string) AnalysisData {
 				"color":     GetColor(res["language"]),
 				"license":   getLicense(res["license"]),
 				"languages": CountLanguages(languages),
-			}, nil, iris.StatusOK,
+			}, "", iris.StatusOK,
 		}
 	}
-	return AnalysisData{nil, errors.New("repo not found"), iris.StatusNotFound}
+	return AnalysisData{nil, "repo not found", iris.StatusNotFound}
 }

cache.go

@@ -89,8 +89,8 @@ func CachedHandler(h iris.Handler, params ...string) iris.Handler {
 }
 
 func EndBody(ctx iris.Context, data AnalysisData) {
-	if data.Err != nil {
-		ThrowError(ctx, data.Err.Error(), data.Code)
+	if data.Err != "" {
+		ThrowError(ctx, data.Err, data.Code)
 	} else {
 		ctx.JSON(data.Data)
 	}

utils.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/kataras/iris/v12"
-	"github.com/sirupsen/logrus"
 	"io"
 	"net/http"
 	"sort"
@@ -87,7 +86,7 @@ func Get(uri string, ptr interface{}) (err error) {
 
 	defer func(Body io.ReadCloser) {
 		if err := Body.Close(); err != nil {
-			logrus.Infoln(err)
+			logger.Infoln(err)
 		}
 	}(resp.Body)
 
@@ -105,16 +104,11 @@ func CountLanguages(languages map[string]float64) []map[string]any {
 		total += v
 	}
 
-	var cursor float64
-
 	for k, v := range languages {
-		ratio := v / total
-		cursor += ratio
 		res = append(res, map[string]any{
 			"lang":    k,
 			"value":   v,
-			"percent": ratio * 100,
-			"cursor":  cursor,
+			"percent": v / total * 100,
 			"color":   GetColor(k),
 			"text":    fmt.Sprintf("%.0f%% (%s)", v/total*100, ScaleConvert(v, false)),
 		})