修复

modules/git/repo_stats.go

@@ -32,7 +32,120 @@ type CodeActivityAuthor struct {
 }
 
 // GetCodeActivityStats returns code statistics for activity page
-func GetCodeActivityStatsWithoutSince(repo *gitea_git.Repository, branch string, page, pageSize int) (int64, *CodeActivityStats, error) {
+func GetCodeActivityStatsWithoutSince(repo *gitea_git.Repository, branch string) (*CodeActivityStats, error) {
+	stats := &CodeActivityStats{}
+
+	stdout, _, runErr := gitea_git.NewCommand(repo.Ctx, "rev-list", "--count", "--no-merges", "--branches=*", "--date=iso").RunStdString(&gitea_git.RunOpts{Dir: repo.Path})
+	if runErr != nil {
+		return nil, runErr
+	}
+
+	c, err := strconv.ParseInt(strings.TrimSpace(stdout), 10, 64)
+	if err != nil {
+		return nil, err
+	}
+	stats.CommitCountInAllBranches = c
+
+	stdoutReader, stdoutWriter, err := os.Pipe()
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		_ = stdoutReader.Close()
+		_ = stdoutWriter.Close()
+	}()
+	gitCmd := gitea_git.NewCommand(repo.Ctx, "log", "--numstat", "--no-merges", "--pretty=format:---%n%h%n%aN%n%aE%n", "--date=iso")
+	if len(branch) == 0 {
+		gitCmd.AddArguments("--branches=*")
+	} else {
+		gitCmd.AddArguments("--first-parent").AddDynamicArguments(branch)
+	}
+
+	stderr := new(strings.Builder)
+	err = gitCmd.Run(&gitea_git.RunOpts{
+		Env:    []string{},
+		Dir:    repo.Path,
+		Stdout: stdoutWriter,
+		Stderr: stderr,
+		PipelineFunc: func(ctx context.Context, cancel context.CancelFunc) error {
+			_ = stdoutWriter.Close()
+			scanner := bufio.NewScanner(stdoutReader)
+			scanner.Split(bufio.ScanLines)
+			stats.CommitCount = 0
+			stats.Additions = 0
+			stats.Deletions = 0
+			authors := make(map[string]*CodeActivityAuthor)
+			files := make(container.Set[string])
+			var author string
+			var currentAuthor *CodeActivityAuthor
+			p := 0
+			for scanner.Scan() {
+				l := strings.TrimSpace(scanner.Text())
+				if l == "---" {
+					p = 1
+				} else if p == 0 {
+					continue
+				} else {
+					p++
+				}
+				if p > 4 && len(l) == 0 {
+					continue
+				}
+				switch p {
+				case 1: // Separator
+				case 2: // Commit sha-1
+					stats.CommitCount++
+				case 3: // Author
+					author = l
+				case 4: // E-mail
+					email := strings.ToLower(l)
+					if _, ok := authors[email+author]; !ok {
+						authors[email+author] = &CodeActivityAuthor{Name: author, Email: email, Commits: 0}
+					}
+					authors[email+author].Commits++
+					currentAuthor = authors[email+author]
+				default: // Changed file
+					if parts := strings.Fields(l); len(parts) >= 3 {
+						if parts[0] != "-" {
+							if c, err := strconv.ParseInt(strings.TrimSpace(parts[0]), 10, 64); err == nil {
+								stats.Additions += c
+								currentAuthor.Additions += c
+							}
+						}
+						if parts[1] != "-" {
+							if c, err := strconv.ParseInt(strings.TrimSpace(parts[1]), 10, 64); err == nil {
+								stats.Deletions += c
+								currentAuthor.Deletions += c
+							}
+						}
+						files.Add(parts[2])
+					}
+				}
+			}
+			a := make([]*CodeActivityAuthor, 0, len(authors))
+			for _, v := range authors {
+				a = append(a, v)
+			}
+			// Sort authors descending depending on commit count
+			sort.Slice(a, func(i, j int) bool {
+				return a[i].Commits > a[j].Commits
+			})
+			stats.AuthorCount = int64(len(authors))
+			stats.ChangedFiles = int64(len(files))
+			stats.Authors = a
+			_ = stdoutReader.Close()
+			return nil
+		},
+	})
+	if err != nil {
+		return nil, fmt.Errorf("Failed to get GetCodeActivityStats for repository.\nError: %w\nStderr: %s", err, stderr)
+	}
+
+	return stats, nil
+}
+
+// GetCodeActivityStats returns code statistics for activity page
+func GetPaginateCodeActivityStatsWithoutSince(repo *gitea_git.Repository, branch string, page, pageSize int) (int64, *CodeActivityStats, error) {
 	var total int64
 
 	stats := &CodeActivityStats{}

routers/hat/repo/repo.go

@@ -2,9 +2,7 @@ package repo
 
 import (
 	"fmt"
-	"math"
 	"net/http"
-	"strconv"
 	"strings"
 
 	access_model "code.gitea.io/gitea/models/perm/access"
@@ -17,7 +15,6 @@ import (
 	gitea_git "code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
-	"code.gitea.io/gitea/routers/api/v1/utils"
 	"code.gitea.io/gitea/services/gitdiff"
 	hat_activities_models "code.gitlink.org.cn/Gitlink/gitea_hat.git/models/activities"
 	hat_git "code.gitlink.org.cn/Gitlink/gitea_hat.git/modules/git"
@@ -560,27 +557,16 @@ func ListCodeStats(ctx *context.APIContext) {
 		return
 	}
 
-	listOpts := utils.GetListOptions(ctx)
-
 	ref := ctx.FormString("ref")
-	// if ref == "" {
-	// 	ref = ctx.Repo.Repository.DefaultBranch
-	// }
+	if ref == "" {
+		ref = ctx.Repo.Repository.DefaultBranch
+	}
 
-	total, stats, err := hat_git.GetCodeActivityStatsWithoutSince(ctx.Repo.GitRepo, ref, listOpts.Page, listOpts.PageSize)
+	stats, err := hat_git.GetCodeActivityStatsWithoutSince(ctx.Repo.GitRepo, ref)
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "GetCodeActivityStatsWithoutSince", err)
 		return
 	}
 
-	pageCount := int(math.Ceil(float64(total) / float64(listOpts.PageSize)))
-	ctx.Resp.Header().Set("X-Page", strconv.Itoa(listOpts.Page))
-	ctx.Resp.Header().Set("X-PerPage", strconv.Itoa(listOpts.PageSize))
-	ctx.Resp.Header().Set("X-Total", strconv.FormatInt(total, 10))
-	ctx.Resp.Header().Set("X-PageCount", strconv.Itoa(pageCount))
-	ctx.Resp.Header().Set("X-HasMore", strconv.FormatBool(listOpts.Page < pageCount))
-
-	ctx.SetLinkHeader(int(total), listOpts.PageSize)
-	ctx.Resp.Header().Set("X-Total-Count", fmt.Sprintf("%d", total))
 	ctx.JSON(http.StatusOK, stats)
 }