Apply feedback

Author: ChristopherHX

routers/api/v1/repo/file.go

@@ -307,23 +307,23 @@ func archiveDownload(ctx *context.APIContext) {
 		return
 	}
 
+	// Add nix format link header so tarballs lock correctly:
+	// https://github.com/nixos/nix/blob/56763ff918eb308db23080e560ed2ea3e00c80a7/doc/manual/src/protocols/tarball-fetcher.md
+	ctx.Resp.Header().Add("Link", fmt.Sprintf(`<%s/archive/%s.%s?rev=%s>; rel="immutable"`,
+		ctx.Repo.Repository.APIURL(),
+		aReq.CommitID,
+		aReq.Type.String(),
+		aReq.CommitID,
+	))
+
 	if setting.Repository.StreamArchives {
 		downloadName := ctx.Repo.Repository.Name + "-" + aReq.GetArchiveName()
 
-		// Add nix format link header so tarballs lock correctly:
-		// https://github.com/nixos/nix/blob/56763ff918eb308db23080e560ed2ea3e00c80a7/doc/manual/src/protocols/tarball-fetcher.md
-		ctx.Resp.Header().Add("Link", fmt.Sprintf(`<%s/archive/%s.%s?rev=%s>; rel="immutable"`,
-			ctx.Repo.Repository.APIURL(),
-			aReq.CommitID,
-			aReq.Type.String(),
-			aReq.CommitID,
-		))
-
 		ctx.SetServeHeaders(&context.ServeHeaderOptions{
 			Filename: downloadName,
 		})
 
-		if err := aReq.Stream(ctx, ctx.Resp); err != nil && !ctx.Written() {
+		if err := aReq.Stream(ctx, ctx.Repo.GitRepo, ctx.Resp); err != nil && !ctx.Written() {
 			ctx.APIErrorInternal(err)
 		}
 		return
@@ -341,15 +341,6 @@ func archiveDownload(ctx *context.APIContext) {
 func download(ctx *context.APIContext, archiveName string, archiver *repo_model.RepoArchiver) {
 	downloadName := ctx.Repo.Repository.Name + "-" + archiveName
 
-	// Add nix format link header so tarballs lock correctly:
-	// https://github.com/nixos/nix/blob/56763ff918eb308db23080e560ed2ea3e00c80a7/doc/manual/src/protocols/tarball-fetcher.md
-	ctx.Resp.Header().Add("Link", fmt.Sprintf(`<%s/archive/%s.%s?rev=%s>; rel="immutable"`,
-		ctx.Repo.Repository.APIURL(),
-		archiver.CommitID,
-		archiver.Type.String(),
-		archiver.CommitID,
-	))
-
 	rPath := archiver.RelativePath()
 	if setting.RepoArchive.Storage.ServeDirect() {
 		// If we have a signed url (S3, object storage), redirect to this directly.

routers/web/repo/repo.go

@@ -377,23 +377,23 @@ func Download(ctx *context.Context) {
 		return
 	}
 
+	// Add nix format link header so tarballs lock correctly:
+	// https://github.com/nixos/nix/blob/56763ff918eb308db23080e560ed2ea3e00c80a7/doc/manual/src/protocols/tarball-fetcher.md
+	ctx.Resp.Header().Add("Link", fmt.Sprintf(`<%s/archive/%s.%s?rev=%s>; rel="immutable"`,
+		ctx.Repo.Repository.APIURL(),
+		aReq.CommitID,
+		aReq.Type.String(),
+		aReq.CommitID,
+	))
+
 	if setting.Repository.StreamArchives {
 		downloadName := ctx.Repo.Repository.Name + "-" + aReq.GetArchiveName()
 
-		// Add nix format link header so tarballs lock correctly:
-		// https://github.com/nixos/nix/blob/56763ff918eb308db23080e560ed2ea3e00c80a7/doc/manual/src/protocols/tarball-fetcher.md
-		ctx.Resp.Header().Add("Link", fmt.Sprintf(`<%s/archive/%s.%s?rev=%s>; rel="immutable"`,
-			ctx.Repo.Repository.APIURL(),
-			aReq.CommitID,
-			aReq.Type.String(),
-			aReq.CommitID,
-		))
-
 		ctx.SetServeHeaders(&context.ServeHeaderOptions{
 			Filename: downloadName,
 		})
 
-		if err := aReq.Stream(ctx, ctx.Resp); err != nil && !ctx.Written() {
+		if err := aReq.Stream(ctx, ctx.Repo.GitRepo, ctx.Resp); err != nil && !ctx.Written() {
 			ctx.ServerError("archiver.StreamArchive", err)
 		}
 		return
@@ -411,12 +411,6 @@ func Download(ctx *context.Context) {
 func download(ctx *context.Context, archiveName string, archiver *repo_model.RepoArchiver) {
 	downloadName := ctx.Repo.Repository.Name + "-" + archiveName
 
-	// Add nix format link header so tarballs lock correctly:
-	// https://github.com/nixos/nix/blob/56763ff918eb308db23080e560ed2ea3e00c80a7/doc/manual/src/protocols/tarball-fetcher.md
-	ctx.Resp.Header().Add("Link", fmt.Sprintf(`<%s/archive/%s.tar.gz?rev=%s>; rel="immutable"`,
-		ctx.Repo.Repository.APIURL(),
-		archiver.CommitID, archiver.CommitID))
-
 	rPath := archiver.RelativePath()
 	if setting.RepoArchive.Storage.ServeDirect() {
 		// If we have a signed url (S3, object storage), redirect to this directly.

services/repository/archiver/archiver.go

@@ -140,38 +140,21 @@ func (aReq *ArchiveRequest) Await(ctx context.Context) (*repo_model.RepoArchiver
 
 // Stream satisfies the ArchiveRequest being passed in.  Processing
 // will occur directly in this routine.
-func (aReq *ArchiveRequest) Stream(ctx context.Context, w io.Writer) error {
-	ctx, _, finished := process.GetManager().AddContext(ctx, fmt.Sprintf("ArchiveRequest[%d]: %s", aReq.RepoID, aReq.GetArchiveName()))
-	defer finished()
-
-	repo, err := repo_model.GetRepositoryByID(ctx, aReq.RepoID)
-	if err != nil {
-		return fmt.Errorf("archiver.LoadRepo failed: %w", err)
-	}
-
-	gitRepo, err := gitrepo.OpenRepository(ctx, repo)
-	if err != nil {
-		return err
-	}
-	defer gitRepo.Close()
-
+func (aReq *ArchiveRequest) Stream(ctx context.Context, gitRepo *git.Repository, w io.Writer) error {
 	if aReq.Type == git.ArchiveBundle {
-		err = gitRepo.CreateBundle(
+		return gitRepo.CreateBundle(
 			ctx,
 			aReq.CommitID,
 			w,
 		)
-	} else {
-		err = gitRepo.CreateArchive(
-			ctx,
-			aReq.Type,
-			w,
-			setting.Repository.PrefixArchiveFiles,
-			aReq.CommitID,
-		)
 	}
-
-	return err
+	return gitRepo.CreateArchive(
+		ctx,
+		aReq.Type,
+		w,
+		setting.Repository.PrefixArchiveFiles,
+		aReq.CommitID,
+	)
 }
 
 // doArchive satisfies the ArchiveRequest being passed in.  Processing
@@ -247,21 +230,7 @@ func doArchive(ctx context.Context, r *ArchiveRequest) (*repo_model.RepoArchiver
 			}
 		}()
 
-		if archiver.Type == git.ArchiveBundle {
-			err = gitRepo.CreateBundle(
-				ctx,
-				archiver.CommitID,
-				w,
-			)
-		} else {
-			err = gitRepo.CreateArchive(
-				ctx,
-				archiver.Type,
-				w,
-				setting.Repository.PrefixArchiveFiles,
-				archiver.CommitID,
-			)
-		}
+		err = r.Stream(ctx, gitRepo, w)
 		_ = w.CloseWithError(err)
 		done <- err
 	}(done, w, archiver, gitRepo)