Merge pull request #850 from middelink/fix-848

Add progressbar to repack and blob remove phases of prune cmd.

src/cmds/restic/cmd_prune.go

@@ -217,17 +217,28 @@ func pruneRepository(gopts GlobalOptions, repo restic.Repository) error {
 	Verbosef("will delete %d packs and rewrite %d packs, this frees %s\n",
 		len(removePacks), len(rewritePacks), formatBytes(uint64(removeBytes)))
 
-	err = repository.Repack(repo, rewritePacks, usedBlobs)
-	if err != nil {
-		return err
+	if len(rewritePacks) != 0 {
+		bar = newProgressMax(!gopts.Quiet, uint64(len(rewritePacks)), "packs rewritten")
+		bar.Start()
+		err = repository.Repack(repo, rewritePacks, usedBlobs, bar)
+		if err != nil {
+			return err
+		}
+		bar.Done()
 	}
 
-	for packID := range removePacks {
-		h := restic.Handle{Type: restic.DataFile, Name: packID.String()}
-		err = repo.Backend().Remove(h)
-		if err != nil {
-			Warnf("unable to remove file %v from the repository\n", packID.Str())
+	if len(removePacks) != 0 {
+		bar = newProgressMax(!gopts.Quiet, uint64(len(removePacks)), "packs deleted")
+		bar.Start()
+		for packID := range removePacks {
+			h := restic.Handle{Type: restic.DataFile, Name: packID.String()}
+			err = repo.Backend().Remove(h)
+			if err != nil {
+				Warnf("unable to remove file %v from the repository\n", packID.Str())
+			}
+			bar.Report(restic.Stat{Blobs: 1})
 		}
+		bar.Done()
 	}
 
 	Verbosef("creating new index\n")

src/restic/repository/repack.go

@@ -18,7 +18,7 @@ import (
 // these packs. Each pack is loaded and the blobs listed in keepBlobs is saved
 // into a new pack. Afterwards, the packs are removed. This operation requires
 // an exclusive lock on the repo.
-func Repack(repo restic.Repository, packs restic.IDSet, keepBlobs restic.BlobSet) (err error) {
+func Repack(repo restic.Repository, packs restic.IDSet, keepBlobs restic.BlobSet, p *restic.Progress) (err error) {
 	debug.Log("repacking %d packs while keeping %d blobs", len(packs), len(keepBlobs))
 
 	for packID := range packs {
@@ -118,6 +118,9 @@ func Repack(repo restic.Repository, packs restic.IDSet, keepBlobs restic.BlobSet
 		if err = os.Remove(tempfile.Name()); err != nil {
 			return errors.Wrap(err, "Remove")
 		}
+		if p != nil {
+			p.Report(restic.Stat{Blobs: 1})
+		}
 	}
 
 	if err := repo.Flush(); err != nil {

src/restic/repository/repack_test.go

@@ -132,7 +132,7 @@ func findPacksForBlobs(t *testing.T, repo restic.Repository, blobs restic.BlobSe
 }
 
 func repack(t *testing.T, repo restic.Repository, packs restic.IDSet, blobs restic.BlobSet) {
-	err := repository.Repack(repo, packs, blobs)
+	err := repository.Repack(repo, packs, blobs, nil)
 	if err != nil {
 		t.Fatal(err)
 	}