From e329623771c95fda391245dc7cee1d4d900c1294 Mon Sep 17 00:00:00 2001
From: Alexander Weiss <alex@weissfam.de>
Date: Sun, 6 Dec 2020 05:22:27 +0100
Subject: [PATCH] Remove LoadAllSnapshots

---
 cmd/restic/cmd_prune.go         | 39 ++++++++++++++++++++-------------
 internal/restic/snapshot.go     | 19 ----------------
 internal/restic/testing_test.go | 21 +++++++++++++++++-
 3 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/cmd/restic/cmd_prune.go b/cmd/restic/cmd_prune.go
index ea33cceb6..fd051e605 100644
--- a/cmd/restic/cmd_prune.go
+++ b/cmd/restic/cmd_prune.go
@@ -159,19 +159,13 @@ func runPruneWithRepo(opts PruneOptions, gopts GlobalOptions, repo *repository.R
 		Print("warning: running prune without a cache, this may be very slow!\n")
 	}
 
-	Verbosef("loading all snapshots...\n")
-	snapshots, err := restic.LoadAllSnapshots(gopts.ctx, repo, ignoreSnapshots)
-	if err != nil {
-		return err
-	}
-
 	Verbosef("loading indexes...\n")
-	err = repo.LoadIndex(gopts.ctx)
+	err := repo.LoadIndex(gopts.ctx)
 	if err != nil {
 		return err
 	}
 
-	usedBlobs, err := getUsedBlobs(gopts, repo, snapshots)
+	usedBlobs, err := getUsedBlobs(gopts, repo, ignoreSnapshots)
 	if err != nil {
 		return err
 	}
@@ -537,19 +531,34 @@ func rebuildIndexFiles(gopts GlobalOptions, repo restic.Repository, removePacks
 	return DeleteFilesChecked(gopts, repo, obsoleteIndexes, restic.IndexFile)
 }
 
-func getUsedBlobs(gopts GlobalOptions, repo restic.Repository, snapshots []*restic.Snapshot) (usedBlobs restic.BlobSet, err error) {
+func getUsedBlobs(gopts GlobalOptions, repo restic.Repository, ignoreSnapshots restic.IDSet) (usedBlobs restic.BlobSet, err error) {
 	ctx := gopts.ctx
 
-	Verbosef("finding data that is still in use for %d snapshots\n", len(snapshots))
+	var snapshotTrees restic.IDs
+	Verbosef("loading all snapshots...\n")
+	err = restic.ForAllSnapshots(gopts.ctx, repo, ignoreSnapshots,
+		func(id restic.ID, sn *restic.Snapshot, err error) error {
+			debug.Log("add snapshot %v (tree %v, error %v)", id, *sn.Tree, err)
+			if err != nil {
+				return err
+			}
+			snapshotTrees = append(snapshotTrees, *sn.Tree)
+			return nil
+		})
+	if err != nil {
+		return nil, err
+	}
+
+	Verbosef("finding data that is still in use for %d snapshots\n", len(snapshotTrees))
 
 	usedBlobs = restic.NewBlobSet()
 
-	bar := newProgressMax(!gopts.Quiet, uint64(len(snapshots)), "snapshots")
+	bar := newProgressMax(!gopts.Quiet, uint64(len(snapshotTrees)), "snapshots")
 	defer bar.Done()
-	for _, sn := range snapshots {
-		debug.Log("process snapshot %v", sn.ID())
+	for _, tree := range snapshotTrees {
+		debug.Log("process tree %v", tree)
 
-		err = restic.FindUsedBlobs(ctx, repo, *sn.Tree, usedBlobs)
+		err = restic.FindUsedBlobs(ctx, repo, tree, usedBlobs)
 		if err != nil {
 			if repo.Backend().IsNotExist(err) {
 				return nil, errors.Fatal("unable to load a tree from the repo: " + err.Error())
@@ -558,7 +567,7 @@ func getUsedBlobs(gopts GlobalOptions, repo restic.Repository, snapshots []*rest
 			return nil, err
 		}
 
-		debug.Log("processed snapshot %v", sn.ID())
+		debug.Log("processed tree %v", tree)
 		bar.Add(1)
 	}
 	return usedBlobs, nil
diff --git a/internal/restic/snapshot.go b/internal/restic/snapshot.go
index 584737d41..647bf57e6 100644
--- a/internal/restic/snapshot.go
+++ b/internal/restic/snapshot.go
@@ -126,25 +126,6 @@ func ForAllSnapshots(ctx context.Context, repo Repository, excludeIDs IDSet, fn
 	return wg.Wait()
 }
 
-// LoadAllSnapshots returns a list of all snapshots in the repo.
-// If a snapshot ID is in excludeIDs, it will not be included in the result.
-func LoadAllSnapshots(ctx context.Context, repo Repository, excludeIDs IDSet) (snapshots Snapshots, err error) {
-	err = ForAllSnapshots(ctx, repo, excludeIDs, func(id ID, sn *Snapshot, err error) error {
-		if err != nil {
-			return err
-		}
-
-		snapshots = append(snapshots, sn)
-		return nil
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	return snapshots, nil
-}
-
 func (sn Snapshot) String() string {
 	return fmt.Sprintf("<Snapshot %s of %v at %s by %s@%s>",
 		sn.id.Str(), sn.Paths, sn.Time, sn.Username, sn.Hostname)
diff --git a/internal/restic/testing_test.go b/internal/restic/testing_test.go
index c3989f55f..5607dc5fa 100644
--- a/internal/restic/testing_test.go
+++ b/internal/restic/testing_test.go
@@ -17,6 +17,25 @@ const (
 	testDepth           = 2
 )
 
+// LoadAllSnapshots returns a list of all snapshots in the repo.
+// If a snapshot ID is in excludeIDs, it will not be included in the result.
+func loadAllSnapshots(ctx context.Context, repo restic.Repository, excludeIDs restic.IDSet) (snapshots restic.Snapshots, err error) {
+	err = restic.ForAllSnapshots(ctx, repo, excludeIDs, func(id restic.ID, sn *restic.Snapshot, err error) error {
+		if err != nil {
+			return err
+		}
+
+		snapshots = append(snapshots, sn)
+		return nil
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return snapshots, nil
+}
+
 func TestCreateSnapshot(t *testing.T) {
 	repo, cleanup := repository.TestRepository(t)
 	defer cleanup()
@@ -25,7 +44,7 @@ func TestCreateSnapshot(t *testing.T) {
 		restic.TestCreateSnapshot(t, repo, testSnapshotTime.Add(time.Duration(i)*time.Second), testDepth, 0)
 	}
 
-	snapshots, err := restic.LoadAllSnapshots(context.TODO(), repo, restic.NewIDSet())
+	snapshots, err := loadAllSnapshots(context.TODO(), repo, restic.NewIDSet())
 	if err != nil {
 		t.Fatal(err)
 	}