From b223d361955f8b722f7dd0b358b2e57e6f359edf Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 24 Jun 2021 05:12:38 +0800
Subject: Rework repository archive (#14723)

* Use storage to store archive files

* Fix backend lint

* Add archiver table on database

* Finish archive download

* Fix test

* Add database migrations

* Add status for archiver

* Fix lint

* Add queue

* Add doctor to check and delete old archives

* Improve archive queue

* Fix tests

* improve archive storage

* Delete repo archives

* Add missing fixture

* fix fixture

* Fix fixture

* Fix test

* Fix archiver cleaning

* Fix bug

* Add docs for repository archive storage

* remove repo-archive configuration

* Fix test

* Fix test

* Fix lint

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
---
 modules/git/commit_archive.go | 64 -------------------------------------------
 modules/git/repo_archive.go   | 61 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 64 deletions(-)
 delete mode 100644 modules/git/commit_archive.go
 create mode 100644 modules/git/repo_archive.go

(limited to 'modules/git')

diff --git a/modules/git/commit_archive.go b/modules/git/commit_archive.go
deleted file mode 100644
index d075ba0911..0000000000
--- a/modules/git/commit_archive.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2015 The Gogs Authors. All rights reserved.
-// Copyright 2020 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package git
-
-import (
-	"context"
-	"fmt"
-	"path/filepath"
-	"strings"
-)
-
-// ArchiveType archive types
-type ArchiveType int
-
-const (
-	// ZIP zip archive type
-	ZIP ArchiveType = iota + 1
-	// TARGZ tar gz archive type
-	TARGZ
-)
-
-// String converts an ArchiveType to string
-func (a ArchiveType) String() string {
-	switch a {
-	case ZIP:
-		return "zip"
-	case TARGZ:
-		return "tar.gz"
-	}
-	return "unknown"
-}
-
-// CreateArchiveOpts represents options for creating an archive
-type CreateArchiveOpts struct {
-	Format ArchiveType
-	Prefix bool
-}
-
-// CreateArchive create archive content to the target path
-func (c *Commit) CreateArchive(ctx context.Context, target string, opts CreateArchiveOpts) error {
-	if opts.Format.String() == "unknown" {
-		return fmt.Errorf("unknown format: %v", opts.Format)
-	}
-
-	args := []string{
-		"archive",
-	}
-	if opts.Prefix {
-		args = append(args, "--prefix="+filepath.Base(strings.TrimSuffix(c.repo.Path, ".git"))+"/")
-	}
-
-	args = append(args,
-		"--format="+opts.Format.String(),
-		"-o",
-		target,
-		c.ID.String(),
-	)
-
-	_, err := NewCommandContext(ctx, args...).RunInDir(c.repo.Path)
-	return err
-}
diff --git a/modules/git/repo_archive.go b/modules/git/repo_archive.go
new file mode 100644
index 0000000000..07003aa6b2
--- /dev/null
+++ b/modules/git/repo_archive.go
@@ -0,0 +1,61 @@
+// Copyright 2015 The Gogs Authors. All rights reserved.
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package git
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"path/filepath"
+	"strings"
+)
+
+// ArchiveType archive types
+type ArchiveType int
+
+const (
+	// ZIP zip archive type
+	ZIP ArchiveType = iota + 1
+	// TARGZ tar gz archive type
+	TARGZ
+)
+
+// String converts an ArchiveType to string
+func (a ArchiveType) String() string {
+	switch a {
+	case ZIP:
+		return "zip"
+	case TARGZ:
+		return "tar.gz"
+	}
+	return "unknown"
+}
+
+// CreateArchive create archive content to the target path
+func (repo *Repository) CreateArchive(ctx context.Context, format ArchiveType, target io.Writer, usePrefix bool, commitID string) error {
+	if format.String() == "unknown" {
+		return fmt.Errorf("unknown format: %v", format)
+	}
+
+	args := []string{
+		"archive",
+	}
+	if usePrefix {
+		args = append(args, "--prefix="+filepath.Base(strings.TrimSuffix(repo.Path, ".git"))+"/")
+	}
+
+	args = append(args,
+		"--format="+format.String(),
+		commitID,
+	)
+
+	var stderr strings.Builder
+	err := NewCommandContext(ctx, args...).RunInDirPipeline(repo.Path, target, &stderr)
+	if err != nil {
+		return ConcatenateError(err, stderr.String())
+	}
+	return nil
+}
-- 
cgit v1.2.3