gitea/changelog
43
16
Fork 11
Code Issues 11 Pull Requests 1 Actions Releases 5 Wiki Activity

Update Gitea SDK to v0.13.0 #49

Merged
techknowlogick merged 2 commits from 6543/gitea_changelog_tool:update-sdk into master 2020-09-22 21:38:12 +00:00
Conversation 0 Commits 2 Files Changed 3 +33 -37
3 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -3,7 +3,7 @@ module code.gitea.io/changelog
go 1.13
require (
code.gitea.io/sdk/gitea v0.12.1
code.gitea.io/sdk/gitea v0.13.0
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/google/go-github/v32 v32.1.0
github.com/hashicorp/go-version v1.2.1 // indirect

4
go.sum
View File

@ -1,5 +1,5 @@
code.gitea.io/sdk/gitea v0.12.1 h1:bMgjEqPnNX/i6TpVwXwpjJtFOnUSuC9P6yy/jjy8sjY=
code.gitea.io/sdk/gitea v0.12.1/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY=
code.gitea.io/sdk/gitea v0.13.0 h1:iHognp8ZMhMFLooUUNZFpm8IHaC9qoHJDvAE5vTm5aw=
code.gitea.io/sdk/gitea v0.13.0/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=

64
service/gitea.go
View File

@ -23,11 +23,14 @@ type Gitea struct {
// Generate returns a Gitea changelog
func (ge *Gitea) Generate() (string, []Entry, error) {
client := gitea.NewClient(ge.BaseURL, ge.Token)
client, err := gitea.NewClient(ge.BaseURL, gitea.SetToken(ge.Token))
if err != nil {
return "", nil, err
}
entries := make([]Entry, 0)
milestoneID, err := ge.milestoneID(client)
milestone, _, err := client.GetMilestoneByName(ge.Owner, ge.Repo, ge.Milestone)
if err != nil {
return "", nil, err
}
@ -37,14 +40,10 @@ func (ge *Gitea) Generate() (string, []Entry, error) {
from = "issues"
}
tagURL := getGiteaTagURL(client, ge.BaseURL, ge.Owner, ge.Repo, ge.Milestone, from, milestoneID)
tagURL := getGiteaTagURL(client, ge.BaseURL, ge.Owner, ge.Repo, ge.Milestone, from, milestone.ID)
p := 1
// https://github.com/go-gitea/gitea/blob/d92781bf941972761177ac9e07441f8893758fd3/models/repo.go#L63
// https://github.com/go-gitea/gitea/blob/e3c3b33ea7a5a223e22688c3f0eb2d3dab9f991c/models/pull_list.go#L104
// FIXME Gitea has this hard-coded at 40
perPage := 40
for {
perPage := ge.perPage(client)
for p := 1; ; p++ {
options := gitea.ListIssueOption{
ListOptions: gitea.ListOptions{
Page: p,
@ -58,7 +57,7 @@ func (ge *Gitea) Generate() (string, []Entry, error) {
options.Type = gitea.IssueTypeIssue
}
issues, err := client.ListRepoIssues(ge.Owner, ge.Repo, options)
issues, _, err := client.ListRepoIssues(ge.Owner, ge.Repo, options)
if err != nil {
return "", nil, err
}
@ -77,8 +76,6 @@ func (ge *Gitea) Generate() (string, []Entry, error) {
if len(issues) != perPage {
break
}
p++
}
return tagURL, entries, nil
@ -111,30 +108,31 @@ func convertToEntry(issue gitea.Issue) Entry {
// Contributors returns a list of contributors from Gitea
func (ge *Gitea) Contributors() (ContributorList, error) {
client := gitea.NewClient(ge.BaseURL, ge.Token)
contributorsMap := make(map[string]bool)
milestoneID, err := ge.milestoneID(client)
client, err := gitea.NewClient(ge.BaseURL, gitea.SetToken(ge.Token))
if err != nil {
return nil, err
}
p := 1
perPage := 100
for {
results, err := client.ListRepoPullRequests(ge.Owner, ge.Repo, gitea.ListPullRequestsOptions{
contributorsMap := make(map[string]bool)
milestone, _, err := client.GetMilestoneByName(ge.Owner, ge.Repo, ge.Milestone)
if err != nil {
return nil, err
}
perPage := ge.perPage(client)
for p := 1; ; p++ {
results, _, err := client.ListRepoPullRequests(ge.Owner, ge.Repo, gitea.ListPullRequestsOptions{
ListOptions: gitea.ListOptions{
Page: p,
PageSize: perPage,
},
State: "closed",
Milestone: milestoneID,
Milestone: milestone.ID,
})
if err != nil {
return nil, err
}
p++
for _, pr := range results {
if pr != nil && pr.HasMerged {
@ -158,17 +156,15 @@ func (ge *Gitea) Contributors() (ContributorList, error) {
return contributors, nil
}
func (ge *Gitea) milestoneID(client *gitea.Client) (int64, error) {
milestones, err := client.ListRepoMilestones(ge.Owner, ge.Repo, gitea.ListMilestoneOption{State: gitea.StateAll})
if err != nil {
return 0, err
}
for _, ms := range milestones {
if ms.Title == ge.Milestone {
return ms.ID, nil
func (ge *Gitea) perPage(client *gitea.Client) int {
// set low value so it will work in most cases
perPage := 10
if client.CheckServerVersionConstraint(">=1.13.0") == nil {
conf, _, err := client.GetGlobalAPISettings()
if err != nil {
return perPage
}
return conf.MaxResponseItems
}
return 0, fmt.Errorf("no milestone found for %s", ge.Milestone)
return perPage
}