alexvanin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Change uncompressed size calculation to account for the encryption overhead

Browse source
This commit is contained in:
plumbeo 2022-09-07 10:09:59 +02:00
parent 837b816358
commit d66e755ac7
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmd/restic/cmd_stats.go
View file

@ -7,6 +7,7 @@ import (
"path/filepath" "path/filepath"
"github.com/restic/restic/internal/backend" "github.com/restic/restic/internal/backend"
"github.com/restic/restic/internal/crypto"
"github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/restic"
"github.com/restic/restic/internal/walker" "github.com/restic/restic/internal/walker"
@ -136,11 +137,7 @@ func runStats(gopts GlobalOptions, args []string) error {
} }
stats.TotalSize += uint64(pbs[0].Length) stats.TotalSize += uint64(pbs[0].Length)
if repo.Config().Version >= 2 { if repo.Config().Version >= 2 {
if pbs[0].IsCompressed() { stats.TotalUncompressedSize += uint64(crypto.CiphertextLength(int(pbs[0].DataLength())))
stats.TotalUncompressedSize += uint64(pbs[0].UncompressedLength)
} else {
stats.TotalUncompressedSize += uint64(pbs[0].Length)
}
} }
stats.TotalBlobCount++ stats.TotalBlobCount++
} }
@ -293,7 +290,7 @@ func verifyStatsInput(gopts GlobalOptions, args []string) error {
// for a successful and efficient walk. // for a successful and efficient walk.
type statsContainer struct { type statsContainer struct {
TotalSize uint64 `json:"total_size"` TotalSize uint64 `json:"total_size"`
TotalUncompressedSize uint64 `json:"total_uncompressed_size"` TotalUncompressedSize uint64 `json:"total_uncompressed_size,omitempty"`
TotalFileCount uint64 `json:"total_file_count"` TotalFileCount uint64 `json:"total_file_count"`
TotalBlobCount uint64 `json:"total_blob_count,omitempty"` TotalBlobCount uint64 `json:"total_blob_count,omitempty"`
// holds count of all considered snapshots // holds count of all considered snapshots