test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

Fix bug of migrate comments which only fetch one page (#17055) (#17058) 

* Fix bug of migrate comments which only fetch one page

* add next page to trace

Co-authored-by: zeripath <art27@cantab.net>

Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
Lunny Xiao 2021-09-16 02:01:54 +08:00 committed by GitHub
parent 1f8df5dd89
commit fd35f56e87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/migrations/github.go
View File

@ -541,6 +541,9 @@ func (g *GithubDownloaderV3) GetAllComments(page, perPage int) ([]*base.Comment,
created = "created" created = "created"
asc = "asc" asc = "asc"
) )
if perPage > g.maxPerPage {
perPage = g.maxPerPage
}
opt := &github.IssueListCommentsOptions{ opt := &github.IssueListCommentsOptions{
Sort: &created, Sort: &created,
Direction: &asc, Direction: &asc,
@ -555,7 +558,9 @@ func (g *GithubDownloaderV3) GetAllComments(page, perPage int) ([]*base.Comment,
if err != nil { if err != nil {
return nil, false, fmt.Errorf("error while listing repos: %v", err) return nil, false, fmt.Errorf("error while listing repos: %v", err)
} }
log.Trace("Request get comments %d/%d, but in fact get %d", perPage, page, len(comments)) var isEnd = resp.NextPage == 0
log.Trace("Request get comments %d/%d, but in fact get %d, next page is %d", perPage, page, len(comments), resp.NextPage)
g.rate = &resp.Rate g.rate = &resp.Rate
for _, comment := range comments { for _, comment := range comments {
var email string var email string
@ -600,7 +605,7 @@ func (g *GithubDownloaderV3) GetAllComments(page, perPage int) ([]*base.Comment,
}) })
} }
return allComments, len(allComments) < perPage, nil return allComments, isEnd, nil
} }
// GetPullRequests returns pull requests according page and perPage // GetPullRequests returns pull requests according page and perPage