Fix archive error when rename repo or user (#16399)

Use repo id instead of full name to generate archive path

3 files changed, 28 insertions, 1 deletions

diff --git a/modules/cron/tasks_extended.go b/modules/cron/tasks_extended.go
index 4a37e5d242..680f83e50c 100644
--- a/modules/cron/tasks_extended.go
+++ b/modules/cron/tasks_extended.go
@@ -33,7 +33,7 @@ func registerDeleteRepositoryArchives() {
 		RunAtStart: false,
 		Schedule:   "@annually",
 	}, func(ctx context.Context, _ *models.User, _ Config) error {
-		return models.DeleteRepositoryArchives(ctx)
+		return repo_module.DeleteRepositoryArchives(ctx)
 	})
 }
 
diff --git a/modules/repository/archive.go b/modules/repository/archive.go
new file mode 100644
index 0000000000..bea636c579
--- /dev/null
+++ b/modules/repository/archive.go
@@ -0,0 +1,20 @@
+// Copyright 2021 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 repository
+
+import (
+	"context"
+
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/storage"
+)
+
+// DeleteRepositoryArchives deletes all repositories' archives.
+func DeleteRepositoryArchives(ctx context.Context) error {
+	if err := models.DeleteAllRepoArchives(); err != nil {
+		return err
+	}
+	return storage.Clean(storage.RepoArchives)
+}
diff --git a/modules/storage/storage.go b/modules/storage/storage.go
index 2fe14b41ef..9f87e58b60 100644
--- a/modules/storage/storage.go
+++ b/modules/storage/storage.go
@@ -88,6 +88,13 @@ func Copy(dstStorage ObjectStorage, dstPath string, srcStorage ObjectStorage, sr
 	return dstStorage.Save(dstPath, f, size)
 }
 
+// Clean delete all the objects in this storage
+func Clean(storage ObjectStorage) error {
+	return storage.IterateObjects(func(path string, obj Object) error {
+		return storage.Delete(path)
+	})
+}
+
 // SaveFrom saves data to the ObjectStorage with path p from the callback
 func SaveFrom(objStorage ObjectStorage, p string, callback func(w io.Writer) error) error {
 	pr, pw := io.Pipe()