Move fetching of user and organization repos to a separate struct and file.

Prepares the way for showing a list of repositories on the homepage and fancier
determination of the first commit.

app/digest.go

@@ -25,7 +25,7 @@ type DigestCommit struct {
 	RepositoryCommit *github.RepositoryCommit
 }
 
-func newDigestCommit(commit *github.RepositoryCommit, repo *github.Repository, location *time.Location) DigestCommit {
+func newDigestCommit(commit *github.RepositoryCommit, repo *Repo, location *time.Location) DigestCommit {
 	messagePieces := strings.SplitN(*commit.Commit.Message, "\n", 2)
 	title := messagePieces[0]
 	message := ""
@@ -58,7 +58,7 @@ func (commit DigestCommit) DisplayDateTooltip() string {
 }
 
 type RepoDigest struct {
-	Repo    *github.Repository
+	Repo    *Repo
 	Commits []DigestCommit
 }
 
@@ -74,7 +74,7 @@ type IntervalDigest struct {
 	StartTime   time.Time
 	EndTime     time.Time
 	RepoDigests []*RepoDigest
-	repos       []*github.Repository
+	repos       []*Repo
 }
 
 func (digest *IntervalDigest) Empty() bool {
@@ -131,36 +131,12 @@ func newDigest(githubClient *github.Client, account *Account) (*Digest, error) {
 		return nil, err
 	}
 
-	// The username parameter must be left blank so that we can get all of the
-	// repositories the user has access to, not just ones that they own.
-	repos, _, err := githubClient.Repositories.List("", nil)
+	repos, err := getRepos(githubClient, user)
 	if err != nil {
 		return nil, err
 	}
 
-	orgs, _, err := githubClient.Organizations.List("", nil)
-	if err != nil {
-		return nil, err
-	}
-	for _, org := range orgs {
-		orgRepos, _, err := githubClient.Repositories.ListByOrg(*org.Login, nil)
-		if err != nil {
-			return nil, err
-		}
-		newRepos := make([]github.Repository, len(repos)+len(orgRepos))
-		copy(newRepos, repos)
-		copy(newRepos[len(repos):], orgRepos)
-		repos = newRepos
-	}
-
-	oldestDigestTime := time.Now().In(account.TimezoneLocation)
-	for _, repo := range repos {
-		repoTime := repo.CreatedAt.In(account.TimezoneLocation)
-		if repoTime.Before(oldestDigestTime) {
-			oldestDigestTime = repoTime
-		}
-	}
-
+	oldestDigestTime := repos.OldestFirstCommitTime.In(account.TimezoneLocation)
 	intervalDigests := make([]*IntervalDigest, 0)
 	now := time.Now().In(account.TimezoneLocation)
 	for yearDelta := -1; ; yearDelta-- {
@@ -171,9 +147,8 @@ func newDigest(githubClient *github.Client, account *Account) (*Digest, error) {
 		digestEndTime := digestStartTime.AddDate(0, 0, 1)
 
 		// Only look at repos that may have activity in the digest interval.
-		var intervalRepos []*github.Repository
-		for i := range repos {
-			repo := &repos[i]
+		var intervalRepos []*Repo
+		for _, repo := range repos.AllRepos {
 			if repo.CreatedAt.Before(digestEndTime) && repo.PushedAt != nil &&
 				repo.PushedAt.After(digestStartTime) {
 				intervalRepos = append(intervalRepos, repo)
@@ -209,7 +184,7 @@ func (digest *Digest) fetch(githubClient *github.Client) error {
 	ch := make(chan *RepoDigestResponse)
 	for _, intervalDigest := range digest.IntervalDigests {
 		for _, repo := range intervalDigest.repos {
-			go func(intervalDigest *IntervalDigest, repo *github.Repository) {
+			go func(intervalDigest *IntervalDigest, repo *Repo) {
 				commits, _, err := githubClient.Repositories.ListCommits(
 					*repo.Owner.Login,
 					*repo.Name,

app/repos.go

@@ -0,0 +1,77 @@
+package githop
+
+import (
+	"time"
+
+	"github.com/google/go-github/github"
+)
+
+type Repos struct {
+	AllRepos              []*Repo
+	UserRepos             []*Repo
+	OrgRepos              []*OrgRepos
+	OldestFirstCommitTime time.Time
+}
+
+type Repo struct {
+	*github.Repository
+}
+
+type OrgRepos struct {
+	Org   *github.Organization
+	Repos []*Repo
+}
+
+func getRepos(githubClient *github.Client, user *github.User) (*Repos, error) {
+	// The username parameter must be left blank so that we can get all of the
+	// repositories the user has access to, not just ones that they own.
+	clientUserRepos, _, err := githubClient.Repositories.List("", nil)
+	if err != nil {
+		return nil, err
+	}
+
+	repos := &Repos{}
+	repos.UserRepos = make([]*Repo, 0, len(clientUserRepos))
+	allRepoCount := len(clientUserRepos)
+	for i := range clientUserRepos {
+		repos.UserRepos = append(repos.UserRepos, &Repo{&clientUserRepos[i]})
+	}
+
+	orgs, _, err := githubClient.Organizations.List("", nil)
+	if err != nil {
+		return nil, err
+	}
+
+	repos.OrgRepos = make([]*OrgRepos, 0, len(orgs))
+	for i := range orgs {
+		org := &orgs[i]
+		clientOrgRepos, _, err := githubClient.Repositories.ListByOrg(*org.Login, nil)
+		if err != nil {
+			return nil, err
+		}
+
+		orgRepos := make([]*Repo, 0, len(clientOrgRepos))
+		allRepoCount += len(clientOrgRepos)
+		for j := range clientOrgRepos {
+			orgRepos = append(orgRepos, &Repo{&clientOrgRepos[j]})
+		}
+		repos.OrgRepos = append(repos.OrgRepos, &OrgRepos{org, orgRepos})
+	}
+
+	repos.AllRepos = make([]*Repo, 0, allRepoCount)
+	repos.AllRepos = append(repos.AllRepos, repos.UserRepos...)
+	for _, org := range repos.OrgRepos {
+		repos.AllRepos = append(repos.AllRepos, org.Repos...)
+	}
+
+	// TODO: better computation of the oldest first commit via the stats API
+	repos.OldestFirstCommitTime = time.Now().UTC()
+	for _, repo := range repos.AllRepos {
+		repoTime := repo.CreatedAt.UTC()
+		if repoTime.Before(repos.OldestFirstCommitTime) {
+			repos.OldestFirstCommitTime = repoTime
+		}
+	}
+
+	return repos, nil
+}