mirror of
https://github.com/tiennm99/ghglance.git
synced 2026-10-14 18:18:32 +00:00
feat: count org repos and fix contribution-window truncation
Split each contribution year into quarterly windows. commitContributionsByRepository caps at 100 repos per query and drops the remainder without signalling it, which a prolific year hits: 2026 returned exactly 100 where the quarterly union returns 108. Warn when a window still comes back at the ceiling instead of reporting a complete list. Add -include-org-repos / include_org_repos so org-owned repos the user administers count toward stars, repo count, repos-per-language and top-starred. Off by default, since enabling it moves those totals for every existing caller. Commit-driven cards already covered org repos through the seed list. Org repos carrying only read or write access are dropped via viewerPermission. Rename Profile.PublicRepos to RepoCount and drop "public" from the card label: the count tracks the fetch filters and includes private repos whenever the token can see them.
This commit is contained in:
1 parent
4d7de90656
commit
30ba70d8ea
12 files changed
+294
-79
No files matched your search
@@ -31,8 +31,38 @@ type contributionYearGQL struct {
|
||||
} `json:"user"`
|
||||
}
|
||||
|
||||
// maxRepositoriesPerWindow mirrors the maxRepositories argument in
|
||||
// contributionYearQuery. GitHub caps it at 100, and a window that returns
|
||||
// exactly that many repos is almost certainly truncated.
|
||||
const maxRepositoriesPerWindow = 100
|
||||
|
||||
// contributionWindows splits one calendar year into quarters, dropping any
|
||||
// quarter that starts after now and clamping the last one to now.
|
||||
//
|
||||
// A year-wide window silently loses repos once the user commits in more than
|
||||
// maxRepositoriesPerWindow of them in that year — the query returns the top
|
||||
// 100 and says nothing about the rest. Quarters keep each window well under
|
||||
// the ceiling. The API clips contributionCalendar to the exact window (no
|
||||
// week-boundary spillover), so concatenating quarters yields each day once.
|
||||
func contributionWindows(year int, now time.Time) [][2]time.Time {
|
||||
var out [][2]time.Time
|
||||
for q := 0; q < 4; q++ {
|
||||
from := time.Date(year, time.Month(q*3+1), 1, 0, 0, 0, 0, time.UTC)
|
||||
if from.After(now) {
|
||||
break
|
||||
}
|
||||
to := from.AddDate(0, 3, 0).Add(-time.Second)
|
||||
if to.After(now) {
|
||||
to = now
|
||||
}
|
||||
out = append(out, [2]time.Time{from, to})
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// FetchContributionsAllTime iterates p.ContributionYears and issues one
|
||||
// contributionsCollection query per year. Each year's payload contributes:
|
||||
// contributionsCollection query per quarter. Each window's payload
|
||||
// contributes:
|
||||
//
|
||||
// - Days → p.DailyContributionsAllTime
|
||||
// - Commit count → p.TotalCommitsAllTime
|
||||
@@ -45,62 +75,83 @@ func (c *Client) FetchContributionsAllTime(ctx context.Context, p *Profile, opts
|
||||
sort.Ints(years) // ascending so the concatenated series is oldest→newest
|
||||
|
||||
seen := map[string]int{} // "owner/name" → index in p.SeedRepos
|
||||
now := time.Now().UTC()
|
||||
|
||||
for _, y := range years {
|
||||
from := time.Date(y, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
to := time.Date(y, 12, 31, 23, 59, 59, 0, time.UTC)
|
||||
if now := time.Now().UTC(); to.After(now) {
|
||||
to = now
|
||||
}
|
||||
|
||||
vars := map[string]any{
|
||||
"login": p.Login,
|
||||
"from": from.Format(time.RFC3339),
|
||||
"to": to.Format(time.RFC3339),
|
||||
}
|
||||
var resp contributionYearGQL
|
||||
if err := c.query(ctx, contributionYearQuery, vars, &resp); err != nil {
|
||||
return err
|
||||
}
|
||||
if resp.User == nil {
|
||||
// Don't abort the run — other years may still yield data — but
|
||||
// make the partial-data case visible instead of rendering an
|
||||
// empty all-time card silently.
|
||||
fmt.Fprintf(os.Stderr, "warn: contribution year %d returned no user data\n", y)
|
||||
continue
|
||||
}
|
||||
|
||||
cc := resp.User.ContributionsCollection
|
||||
p.TotalCommitsAllTime += cc.TotalCommitContributions
|
||||
for _, w := range cc.ContributionCalendar.Weeks {
|
||||
for _, d := range w.ContributionDays {
|
||||
t, err := time.Parse("2006-01-02", d.Date)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
p.DailyContributionsAllTime = append(p.DailyContributionsAllTime, DailyContribution{
|
||||
Date: t,
|
||||
Count: d.ContributionCount,
|
||||
})
|
||||
for _, w := range contributionWindows(y, now) {
|
||||
if err := c.fetchContributionWindow(ctx, p, opts, w[0], w[1], seen); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
for _, cr := range cc.CommitContributionsByRepository {
|
||||
r := cr.Repository
|
||||
if r.IsFork && !opts.IncludeForks {
|
||||
// fetchContributionWindow folds a single contributionsCollection window into
|
||||
// the profile. Split out from FetchContributionsAllTime so the quarter loop
|
||||
// stays readable.
|
||||
func (c *Client) fetchContributionWindow(
|
||||
ctx context.Context,
|
||||
p *Profile,
|
||||
opts FetchOptions,
|
||||
from, to time.Time,
|
||||
seen map[string]int,
|
||||
) error {
|
||||
vars := map[string]any{
|
||||
"login": p.Login,
|
||||
"from": from.Format(time.RFC3339),
|
||||
"to": to.Format(time.RFC3339),
|
||||
}
|
||||
var resp contributionYearGQL
|
||||
if err := c.query(ctx, contributionYearQuery, vars, &resp); err != nil {
|
||||
return err
|
||||
}
|
||||
if resp.User == nil {
|
||||
// Don't abort the run — other windows may still yield data — but
|
||||
// make the partial-data case visible instead of rendering an
|
||||
// empty all-time card silently.
|
||||
fmt.Fprintf(os.Stderr, "warn: contributions %s..%s returned no user data\n",
|
||||
from.Format("2006-01-02"), to.Format("2006-01-02"))
|
||||
return nil
|
||||
}
|
||||
|
||||
cc := resp.User.ContributionsCollection
|
||||
p.TotalCommitsAllTime += cc.TotalCommitContributions
|
||||
for _, w := range cc.ContributionCalendar.Weeks {
|
||||
for _, d := range w.ContributionDays {
|
||||
t, err := time.Parse("2006-01-02", d.Date)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
if r.IsPrivate && !opts.IncludePrivate {
|
||||
continue
|
||||
}
|
||||
info := r.toRepoInfo(p.Login)
|
||||
key := info.Owner + "/" + info.Name
|
||||
if _, ok := seen[key]; ok {
|
||||
continue
|
||||
}
|
||||
seen[key] = len(p.SeedRepos)
|
||||
p.SeedRepos = append(p.SeedRepos, info)
|
||||
p.DailyContributionsAllTime = append(p.DailyContributionsAllTime, DailyContribution{
|
||||
Date: t,
|
||||
Count: d.ContributionCount,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Surface a hit ceiling rather than pretending the list is complete.
|
||||
if len(cc.CommitContributionsByRepository) >= maxRepositoriesPerWindow {
|
||||
fmt.Fprintf(os.Stderr,
|
||||
"warn: contributions %s..%s hit the %d-repo ceiling; some repos are missing from commit probing\n",
|
||||
from.Format("2006-01-02"), to.Format("2006-01-02"), maxRepositoriesPerWindow)
|
||||
}
|
||||
|
||||
for _, cr := range cc.CommitContributionsByRepository {
|
||||
r := cr.Repository
|
||||
if r.IsFork && !opts.IncludeForks {
|
||||
continue
|
||||
}
|
||||
if r.IsPrivate && !opts.IncludePrivate {
|
||||
continue
|
||||
}
|
||||
info := r.toRepoInfo(p.Login)
|
||||
key := info.Owner + "/" + info.Name
|
||||
if _, ok := seen[key]; ok {
|
||||
continue
|
||||
}
|
||||
seen[key] = len(p.SeedRepos)
|
||||
p.SeedRepos = append(p.SeedRepos, info)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
Reference in new issue
Block a user