Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

GitHub: migrate draft releases too (#15884) (#15888)

Browse source 
* GitHub: migrate draft releases too

* refactor
This commit is contained in:
6543 2021-05-16 09:24:28 +02:00 committed by GitHub
parent 3bcf2e5c18
commit 8c4bf4c3b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
modules/migrations/gitea_uploader.go
View file

@ -248,14 +248,16 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
rel.OriginalAuthorID = release.PublisherID rel.OriginalAuthorID = release.PublisherID
} }
// calc NumCommits // calc NumCommits if no draft
commit, err := g.gitRepo.GetCommit(rel.TagName) if !release.Draft {
if err != nil { commit, err := g.gitRepo.GetCommit(rel.TagName)
return fmt.Errorf("GetCommit: %v", err) if err != nil {
} return fmt.Errorf("GetCommit: %v", err)
rel.NumCommits, err = commit.CommitsCount() }
if err != nil { rel.NumCommits, err = commit.CommitsCount()
return fmt.Errorf("CommitsCount: %v", err) if err != nil {
return fmt.Errorf("CommitsCount: %v", err)
}
} }
for _, asset := range release.Assets { for _, asset := range release.Assets {
@ -268,9 +270,10 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
} }
// download attachment // download attachment
err = func() error { err := func() error {
// asset.DownloadURL maybe a local file // asset.DownloadURL maybe a local file
var rc io.ReadCloser var rc io.ReadCloser
var err error
if asset.DownloadURL == nil { if asset.DownloadURL == nil {
rc, err = asset.DownloadFunc() rc, err = asset.DownloadFunc()
if err != nil { if err != nil {

44
modules/migrations/github.go
View file

@ -264,34 +264,29 @@ func (g *GithubDownloaderV3) GetLabels() ([]*base.Label, error) {
} }
func (g *GithubDownloaderV3) convertGithubRelease(rel *github.RepositoryRelease) *base.Release { func (g *GithubDownloaderV3) convertGithubRelease(rel *github.RepositoryRelease) *base.Release {
var (
name string
desc string
)
if rel.Body != nil {
desc = *rel.Body
}
if rel.Name != nil {
name = *rel.Name
}
var email string
if rel.Author.Email != nil {
email = *rel.Author.Email
}
r := &base.Release{ r := &base.Release{
TagName: *rel.TagName, TagName: *rel.TagName,
TargetCommitish: *rel.TargetCommitish, TargetCommitish: *rel.TargetCommitish,
Name: name,
Body: desc,
Draft: *rel.Draft, Draft: *rel.Draft,
Prerelease: *rel.Prerelease, Prerelease: *rel.Prerelease,
Created: rel.CreatedAt.Time, Created: rel.CreatedAt.Time,
PublisherID: *rel.Author.ID, PublisherID: *rel.Author.ID,
PublisherName: *rel.Author.Login, PublisherName: *rel.Author.Login,
PublisherEmail: email, }
Published: rel.PublishedAt.Time,
if rel.Body != nil {
r.Body = *rel.Body
}
if rel.Name != nil {
r.Name = *rel.Name
}
if rel.Author.Email != nil {
r.PublisherEmail = *rel.Author.Email
}
if rel.PublishedAt != nil {
r.Published = rel.PublishedAt.Time
} }
for _, asset := range rel.Assets { for _, asset := range rel.Assets {
@ -306,18 +301,17 @@ func (g *GithubDownloaderV3) convertGithubRelease(rel *github.RepositoryRelease)
Updated: asset.UpdatedAt.Time, Updated: asset.UpdatedAt.Time,
DownloadFunc: func() (io.ReadCloser, error) { DownloadFunc: func() (io.ReadCloser, error) {
g.sleep() g.sleep()
asset, redir, err := g.client.Repositories.DownloadReleaseAsset(g.ctx, g.repoOwner, g.repoName, assetID, nil) asset, redirectURL, err := g.client.Repositories.DownloadReleaseAsset(g.ctx, g.repoOwner, g.repoName, assetID, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = g.RefreshRate() if err := g.RefreshRate(); err != nil {
if err != nil {
log.Error("g.client.RateLimits: %s", err) log.Error("g.client.RateLimits: %s", err)
} }
if asset == nil { if asset == nil {
if redir != "" { if redirectURL != "" {
g.sleep() g.sleep()
req, err := http.NewRequestWithContext(g.ctx, "GET", redir, nil) req, err := http.NewRequestWithContext(g.ctx, "GET", redirectURL, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }