git724/forgejo
1
0
Fork 0
Code Issues Pull requests 3 Projects 1 Releases Packages Wiki Activity

Copy git data from disk when restore repository (#16066)

Browse source
This commit is contained in:
Lunny Xiao 2021-06-04 21:14:20 +08:00 • committed by GitHub
commit 7979c3654e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/migrations/gitea_uploader.go
View file

@ -276,19 +276,22 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
// asset.DownloadURL maybe a local file // asset.DownloadURL maybe a local file
var rc io.ReadCloser var rc io.ReadCloser
var err error var err error
if asset.DownloadURL == nil { if asset.DownloadFunc != nil {
rc, err = asset.DownloadFunc() rc, err = asset.DownloadFunc()
if err != nil { if err != nil {
return err return err
} }
} else { } else if asset.DownloadURL != nil {
rc, err = uri.Open(*asset.DownloadURL) rc, err = uri.Open(*asset.DownloadURL)
if err != nil { if err != nil {
return err return err
} }
} }
defer rc.Close() if rc == nil {
return nil
}
_, err = storage.Attachments.Save(attach.RelativePath(), rc, int64(*asset.Size)) _, err = storage.Attachments.Save(attach.RelativePath(), rc, int64(*asset.Size))
rc.Close()
return err return err
}() }()
if err != nil { if err != nil {

2
modules/migrations/migrate.go
View file

@ -184,7 +184,7 @@ func migrateRepository(downloader base.Downloader, uploader base.Uploader, opts
return err return err
} }
log.Trace("migrating git data") log.Trace("migrating git data from %s", repo.CloneURL)
if err = uploader.CreateRepo(repo, opts); err != nil { if err = uploader.CreateRepo(repo, opts); err != nil {
return err return err
} }

6
modules/migrations/restore.go
View file

@ -83,7 +83,7 @@ func (r *RepositoryRestorer) GetRepoInfo() (*base.Repository, error) {
IsPrivate: isPrivate, IsPrivate: isPrivate,
Description: opts["description"], Description: opts["description"],
OriginalURL: opts["original_url"], OriginalURL: opts["original_url"],
CloneURL: opts["clone_addr"], CloneURL: filepath.Join(r.baseDir, "git"),
DefaultBranch: opts["default_branch"], DefaultBranch: opts["default_branch"],
}, nil }, nil
} }
@ -155,7 +155,9 @@ func (r *RepositoryRestorer) GetReleases() ([]*base.Release, error) {
} }
for _, rel := range releases { for _, rel := range releases {
for _, asset := range rel.Assets { for _, asset := range rel.Assets {
*asset.DownloadURL = "file://" + filepath.Join(r.baseDir, *asset.DownloadURL) if asset.DownloadURL != nil {
*asset.DownloadURL = "file://" + filepath.Join(r.baseDir, *asset.DownloadURL)
}
} }
} }
return releases, nil return releases, nil