octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-04 12:34:13 +00:00
Code Issues Releases Wiki Activity

Use progress in prune command

Browse Source
This commit is contained in:
Alexander Neumann 2016-08-15 21:10:20 +02:00
parent 8de6e5a627
commit 7f9d227725
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/cmds/restic/cmd_prune.go
View File

@ -82,13 +82,6 @@ func (cmd CmdPrune) Execute(args []string) error {
done := make(chan struct{}) done := make(chan struct{})
defer close(done) defer close(done)
cmd.global.Verbosef("building new index for repo\n")
idx, err := index.New(repo)
if err != nil {
return err
}
var stats struct { var stats struct {
blobs int blobs int
packs int packs int
@ -96,6 +89,19 @@ func (cmd CmdPrune) Execute(args []string) error {
bytes int64 bytes int64
} }
cmd.global.Verbosef("counting files in repo\n")
for _ = range repo.List(backend.Data, done) {
stats.packs++
}
cmd.global.Verbosef("building new index for repo\n")
bar := newProgressMax(cmd.global.ShowProgress(), uint64(stats.packs), "files")
idx, err := index.New(repo, bar)
if err != nil {
return err
}
for _, pack := range idx.Packs { for _, pack := range idx.Packs {
stats.bytes += pack.Size stats.bytes += pack.Size
} }
@ -137,7 +143,7 @@ func (cmd CmdPrune) Execute(args []string) error {
usedBlobs := pack.NewBlobSet() usedBlobs := pack.NewBlobSet()
seenBlobs := pack.NewBlobSet() seenBlobs := pack.NewBlobSet()
bar := newProgressMax(cmd.global.ShowProgress(), uint64(len(snapshots)), "snapshots") bar = newProgressMax(cmd.global.ShowProgress(), uint64(len(snapshots)), "snapshots")
bar.Start() bar.Start()
for _, sn := range snapshots { for _, sn := range snapshots {
debug.Log("CmdPrune.Execute", "process snapshot %v", sn.ID().Str()) debug.Log("CmdPrune.Execute", "process snapshot %v", sn.ID().Str())
@ -175,7 +181,8 @@ func (cmd CmdPrune) Execute(args []string) error {
cmd.global.Verbosef("creating new index\n") cmd.global.Verbosef("creating new index\n")
idx, err = index.New(repo) bar = newProgressMax(cmd.global.ShowProgress(), uint64(stats.packs), "files")
idx, err = index.New(repo, bar)
if err != nil { if err != nil {
return err return err
} }