gitea: remove duplication in fetching repos (#1046)

We had the same pagination logic repeated 3 times. Factor it out.

Author: keegancsmith

cmd/zoekt-mirror-gitea/main.go

@@ -196,17 +196,8 @@ func filterRepositories(repos []*gitea.Repository, noArchived bool) (filteredRep
 	return
 }
 
-func getOrgRepos(client *gitea.Client, org string, reposFilters reposFilters) ([]*gitea.Repository, error) {
+func searchRepos(client *gitea.Client, searchOptions *gitea.SearchRepoOptions, reposFilters reposFilters) ([]*gitea.Repository, error) {
 	var allRepos []*gitea.Repository
-	searchOptions := &gitea.SearchRepoOptions{}
-	// OwnerID
-	organization, _, err := client.GetOrg(org)
-	if err != nil {
-		return nil, err
-	}
-
-	searchOptions.OwnerID = organization.ID
-
 	for {
 		repos, resp, err := client.SearchRepos(*searchOptions)
 		if err != nil {
@@ -216,61 +207,43 @@ func getOrgRepos(client *gitea.Client, org string, reposFilters reposFilters) ([
 			break
 		}
 
-		searchOptions.Page = resp.NextPage
 		repos = filterRepositories(repos, *reposFilters.noArchived)
 		allRepos = append(allRepos, repos...)
+		searchOptions.Page = resp.NextPage
 		if resp.NextPage == 0 {
 			break
 		}
 	}
+
 	return allRepos, nil
 }
 
-func getAllRepos(client *gitea.Client, reposFilters reposFilters) ([]*gitea.Repository, error) {
-	var allRepos []*gitea.Repository
+func getOrgRepos(client *gitea.Client, org string, reposFilters reposFilters) ([]*gitea.Repository, error) {
 	searchOptions := &gitea.SearchRepoOptions{}
-	for {
-		repos, resp, err := client.SearchRepos(*searchOptions)
-		if err != nil {
-			return nil, err
-		}
-		if len(repos) == 0 {
-			break
-		}
-		repos = filterRepositories(repos, *reposFilters.noArchived)
-		allRepos = append(allRepos, repos...)
-		searchOptions.Page = resp.NextPage
-		if resp.NextPage == 0 {
-			break
-		}
+	// OwnerID
+	organization, _, err := client.GetOrg(org)
+	if err != nil {
+		return nil, err
 	}
-	return allRepos, nil
+
+	searchOptions.OwnerID = organization.ID
+
+	return searchRepos(client, searchOptions, reposFilters)
+}
+
+func getAllRepos(client *gitea.Client, reposFilters reposFilters) ([]*gitea.Repository, error) {
+	return searchRepos(client, &gitea.SearchRepoOptions{}, reposFilters)
 }
 
 func getUserRepos(client *gitea.Client, user string, reposFilters reposFilters) ([]*gitea.Repository, error) {
-	var allRepos []*gitea.Repository
 	searchOptions := &gitea.SearchRepoOptions{}
 	u, _, err := client.GetUserInfo(user)
 	if err != nil {
 		return nil, err
 	}
 	searchOptions.OwnerID = u.ID
-	for {
-		repos, resp, err := client.SearchRepos(*searchOptions)
-		if err != nil {
-			return nil, err
-		}
-		if len(repos) == 0 {
-			break
-		}
-		repos = filterRepositories(repos, *reposFilters.noArchived)
-		allRepos = append(allRepos, repos...)
-		searchOptions.Page = resp.NextPage
-		if resp.NextPage == 0 {
-			break
-		}
-	}
-	return allRepos, nil
+
+	return searchRepos(client, searchOptions, reposFilters)
 }
 
 func cloneRepos(destDir string, repos []*gitea.Repository) error {