From a495764fbbdd732fe16b94c3ece104d1c84c8507 Mon Sep 17 00:00:00 2001 From: Denis Isaev Date: Thu, 29 Nov 2018 23:22:36 +0300 Subject: [PATCH] return repo language in repo list --- pkg/app/providers/implementations/github.go | 1 + pkg/app/providers/provider/models.go | 1 + pkg/app/returntypes/returntypes.go | 1 + pkg/app/services/repo/service.go | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/app/providers/implementations/github.go b/pkg/app/providers/implementations/github.go index d0384093..711afba8 100644 --- a/pkg/app/providers/implementations/github.go +++ b/pkg/app/providers/implementations/github.go @@ -97,6 +97,7 @@ func parseGithubRepository(r *github.Repository, root bool) *provider.Repo { DefaultBranch: r.GetDefaultBranch(), Source: source, StargazersCount: r.GetStargazersCount(), + Language: r.GetLanguage(), } } diff --git a/pkg/app/providers/provider/models.go b/pkg/app/providers/provider/models.go index b958f5a7..00e81d1d 100644 --- a/pkg/app/providers/provider/models.go +++ b/pkg/app/providers/provider/models.go @@ -19,6 +19,7 @@ type Repo struct { Source *Repo StargazersCount int + Language string } type Branch struct { diff --git a/pkg/app/returntypes/returntypes.go b/pkg/app/returntypes/returntypes.go index 7ce7e5b3..0c32d3db 100644 --- a/pkg/app/returntypes/returntypes.go +++ b/pkg/app/returntypes/returntypes.go @@ -20,6 +20,7 @@ type RepoInfo struct { IsPrivate bool `json:"isPrivate,omitempty"` IsCreating bool `json:"isCreating,omitempty"` IsDeleting bool `json:"isDeleting,omitempty"` + Language string `json:"language,omitempty"` } type WrappedRepoInfo struct { diff --git a/pkg/app/services/repo/service.go b/pkg/app/services/repo/service.go index 7d88f36b..e15fa025 100644 --- a/pkg/app/services/repo/service.go +++ b/pkg/app/services/repo/service.go @@ -329,6 +329,7 @@ func (s BasicService) List(rc *request.AuthorizedContext, req *listRequest) (*re Organization: strings.Split(pr.Name, "/")[0], IsAdmin: pr.IsAdmin, IsPrivate: pr.IsPrivate, + Language: pr.Language, } if ar, ok := activatedRepos[pr.ID]; pr.ID != 0 && ok { @@ -354,7 +355,7 @@ func (s BasicService) List(rc *request.AuthorizedContext, req *listRequest) (*re func (s BasicService) fetchProviderReposCached(rc *request.AuthorizedContext, useCache bool, p provider.Provider) ([]provider.Repo, error) { const maxPages = 20 - key := fmt.Sprintf("repos/%s/fetch?user_id=%d&maxPage=%d&v=4", p.Name(), rc.Auth.UserID, maxPages) + key := fmt.Sprintf("repos/%s/fetch?user_id=%d&maxPage=%d&v=5", p.Name(), rc.Auth.UserID, maxPages) if rc.Auth.PrivateAccessToken != "" { key += "&private=true" }