Merge branch 'main' into feature-svg-diff

go-gitea · Jun 4, 2021 · 221e7e8 · 221e7e8
2 parents 0264265 + 7979c36
commit 221e7e8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/modules/migrations/gitea_uploader.go b/modules/migrations/gitea_uploader.go
@@ -276,19 +276,22 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
 				// asset.DownloadURL maybe a local file
 				var rc io.ReadCloser
 				var err error
-				if asset.DownloadURL == nil {
+				if asset.DownloadFunc != nil {
 					rc, err = asset.DownloadFunc()
 					if err != nil {
 						return err
 					}
-				} else {
+				} else if asset.DownloadURL != nil {
 					rc, err = uri.Open(*asset.DownloadURL)
 					if err != nil {
 						return err
 					}
 				}
-				defer rc.Close()
+				if rc == nil {
+					return nil
+				}
 				_, err = storage.Attachments.Save(attach.RelativePath(), rc, int64(*asset.Size))
+				rc.Close()
 				return err
 			}()
 			if err != nil {

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

diff --git a/modules/migrations/restore.go b/modules/migrations/restore.go
@@ -83,7 +83,7 @@ func (r *RepositoryRestorer) GetRepoInfo() (*base.Repository, error) {
 		IsPrivate:     isPrivate,
 		Description:   opts["description"],
 		OriginalURL:   opts["original_url"],
-		CloneURL:      opts["clone_addr"],
+		CloneURL:      filepath.Join(r.baseDir, "git"),
 		DefaultBranch: opts["default_branch"],
 	}, nil
 }
@@ -155,7 +155,9 @@ func (r *RepositoryRestorer) GetReleases() ([]*base.Release, error) {
 	}
 	for _, rel := range releases {
 		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