perf: drop wasted requests and reuse markdown renderers

pr edit with reviewers and other fields reads the pull request once,
org delete counts only repositories, org view counts concurrently,
team list skips the repository count of all-repository teams,
pr diff --web builds the URL locally, pr list re-reads pull requests
concurrently for review fields, and glamour renderers are built once
per width and color.

Signed-off-by: bircni <bircni@icloud.com>
This commit is contained in:
bircni committed 2026-10-12 18:44:29 +02:00
1 parent af14803b3a
commit 8bf979099b
8 files changed
+104 -47

No files matched your search

+30 -13
View File
@@ -94,7 +94,8 @@ type OrganizationSize struct {
Members, Teams, Repositories *int
}
// Size counts the members, teams and repositories of an organization.
// Size counts the members, teams and repositories of an organization; a count the account cannot
// read is nil.
func (s Organizations) Size(ctx context.Context, name string) (OrganizationSize, error) {
first := listOptions(1, 1)
counts := []func(context.Context, *gitea.Client) (*gitea.Response, error){
@@ -106,24 +107,40 @@ func (s Organizations) Size(ctx context.Context, name string) (OrganizationSize,
_, resp, err := c.Organizations.ListOrgTeams(ctx, name, gitea.ListTeamsOptions{ListOptions: first})
return resp, err
},
func(ctx context.Context, c *gitea.Client) (*gitea.Response, error) {
_, resp, err := c.Repositories.ListOrgRepos(ctx, name, gitea.ListOrgReposOptions{ListOptions: first})
return resp, err
},
orgRepos(name),
}
totals := make([]*int, len(counts))
for i, count := range counts {
total, err := listTotal(ctx, s.Client, count)
if ctx.Err() != nil {
return OrganizationSize{}, ctx.Err()
}
if err == nil {
totals[i] = total
}
_ = concurrently(len(counts), func(i int) error {
totals[i], _ = listTotal(ctx, s.Client, counts[i])
return nil
})
if ctx.Err() != nil {
return OrganizationSize{}, ctx.Err()
}
return OrganizationSize{Members: totals[0], Teams: totals[1], Repositories: totals[2]}, nil
}
// RepositoryCount counts the repositories of an organization, or returns nil when the account
// cannot read the count.
func (s Organizations) RepositoryCount(ctx context.Context, name string) (*int, error) {
total, err := listTotal(ctx, s.Client, orgRepos(name))
if ctx.Err() != nil {
return nil, ctx.Err()
}
if err != nil {
return nil, nil
}
return total, nil
}
// orgRepos requests the first repository of an organization, to count them.
func orgRepos(name string) func(context.Context, *gitea.Client) (*gitea.Response, error) {
return func(ctx context.Context, c *gitea.Client) (*gitea.Response, error) {
_, resp, err := c.Repositories.ListOrgRepos(ctx, name, gitea.ListOrgReposOptions{ListOptions: listOptions(1, 1)})
return resp, err
}
}
// listTotal returns the collection size a list request reports, or nil when the server does not count it.
func listTotal(ctx context.Context, client *transport.Client, list func(context.Context, *gitea.Client) (*gitea.Response, error)) (*int, error) {
_, resp, err := call(ctx, client, func(ctx context.Context, c *gitea.Client) (struct{}, *gitea.Response, error) {
+17 -6
View File
@@ -236,6 +236,17 @@ func (s Pulls) View(ctx context.Context, n int64) (Pull, error) {
return pullFrom(pull), nil
}
// ViewAll retrieves each of items again, a few at a time, for the fields only a single pull
// request carries, such as its reviewers.
func (s Pulls) ViewAll(ctx context.Context, items []Pull) ([]Pull, error) {
viewed := make([]Pull, len(items))
err := concurrently(len(items), func(i int) (err error) {
viewed[i], err = s.View(ctx, items[i].Number)
return err
})
return viewed, err
}
func (s Pulls) get(ctx context.Context, n int64) (*gitea.PullRequest, error) {
item, err := repoCall(ctx, s.Client, s.Repository, func(ctx context.Context, c *gitea.Client, owner, name string) (*gitea.PullRequest, *gitea.Response, error) {
return c.PullRequests.GetPullRequest(ctx, owner, name, n)
@@ -264,15 +275,15 @@ func (s Pulls) Create(ctx context.Context, opts PullOptions) (Pull, error) {
// Edit updates only explicitly supplied resource fields.
func (s Pulls) Edit(ctx context.Context, n int64, opts PullEdit) (Pull, error) {
if opts.ReviewerChanges != nil {
item, err := (Reviews{Client: s.Client, Repository: s.Repository}).ChangeRequests(ctx, n, *opts.ReviewerChanges)
if err != nil {
return Pull{}, err
}
reviews, changes := Reviews{Client: s.Client, Repository: s.Repository}, opts.ReviewerChanges
opts.ReviewerChanges = nil
if opts == (PullEdit{}) {
return item, nil
return reviews.ChangeRequests(ctx, n, *changes)
}
item, err = s.Edit(ctx, n, opts)
if err := reviews.changeRequests(ctx, n, *changes); err != nil {
return Pull{}, err
}
item, err := s.Edit(ctx, n, opts)
if err != nil {
return Pull{}, fmt.Errorf("review requests were updated, but editing other pull request fields failed: %w", err)
}
+17 -9
View File
@@ -51,12 +51,24 @@ func (c ReviewRequestChanges) Validate() error {
// ChangeRequests returns the PR after changes and reports partial mutation failures.
func (s Reviews) ChangeRequests(ctx context.Context, n int64, changes ReviewRequestChanges) (Pull, error) {
if err := changes.Validate(); err != nil {
if err := s.changeRequests(ctx, n, changes); err != nil {
return Pull{}, err
}
item, err := (Pulls{Client: s.Client, Repository: s.Repository}).View(ctx, n)
if err != nil {
return Pull{}, fmt.Errorf("review requests were updated, but reading the pull request failed: %w", err)
}
return item, nil
}
// changeRequests applies the review request changes to pull request n.
func (s Reviews) changeRequests(ctx context.Context, n int64, changes ReviewRequestChanges) error {
if err := changes.Validate(); err != nil {
return err
}
if len(changes.Add.Teams)+len(changes.Remove.Teams) > 0 {
if err := s.CheckRequestTeams(ctx, append(append([]string{}, changes.Add.Teams...), changes.Remove.Teams...)); err != nil {
return Pull{}, err
return err
}
}
mutated := false
@@ -76,17 +88,13 @@ func (s Reviews) ChangeRequests(ctx context.Context, n int64, changes ReviewRequ
})
if err != nil {
if mutated {
return Pull{}, fmt.Errorf("reviewer removals succeeded, but adding reviewers failed: %w", err)
return fmt.Errorf("reviewer removals succeeded, but adding reviewers failed: %w", err)
}
return Pull{}, fmt.Errorf("review request update failed; Gitea may have applied some requests: %w", err)
return fmt.Errorf("review request update failed; Gitea may have applied some requests: %w", err)
}
mutated = true
}
item, err := (Pulls{Client: s.Client, Repository: s.Repository}).View(ctx, n)
if err != nil {
return Pull{}, fmt.Errorf("review requests were updated, but reading the pull request failed: %w", err)
}
return item, nil
return nil
}
// CheckRequestTeams verifies that every named team exists in the repository's organization.
+2 -1
View File
@@ -203,7 +203,8 @@ func (s Teams) Sizes(ctx context.Context, teams []Team) ([]TeamSize, error) {
_, resp, err := c.Organizations.ListTeamMembers(ctx, id, gitea.ListTeamMembersOptions{ListOptions: first})
return resp, err
})
if err != nil {
if err != nil || teams[i].AllRepositories {
sizes[i] = TeamSize{Members: members}
return err
}
repositories, err := listTotal(ctx, s.Client, func(ctx context.Context, c *gitea.Client) (*gitea.Response, error) {