sneak/attrsum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Track actual bytes read instead of stale file size

Browse Source 
fileMultihash now returns the number of bytes actually read during
hashing. This ensures BytesProcessed reflects the true amount of
data processed, not a potentially stale size from the initial walk.
This commit is contained in:
Jeffrey Paul 2026-02-02 13:50:42 -08:00
parent 5c2338d590
commit 629613de1b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
attrsum.go
View File

@ -241,7 +241,7 @@ func writeChecksumAndTime(path string, info os.FileInfo, stats *Stats) error {
// Record mtime before hashing to detect modifications during hash // Record mtime before hashing to detect modifications during hash
mtimeBefore := info.ModTime() mtimeBefore := info.ModTime()
hash, err := fileMultihash(path) hash, bytesRead, err := fileMultihash(path)
if err != nil { if err != nil {
return err return err
} }
@ -273,7 +273,7 @@ func writeChecksumAndTime(path string, info os.FileInfo, stats *Stats) error {
} }
atomic.AddInt64(&stats.FilesProcessed, 1) atomic.AddInt64(&stats.FilesProcessed, 1)
atomic.AddInt64(&stats.BytesProcessed, infoAfter.Size()) atomic.AddInt64(&stats.BytesProcessed, bytesRead)
return nil return nil
} }
@ -426,7 +426,7 @@ func ProcessCheck(dir string, cont bool, stats *Stats, bar *progressbar.Progress
return err return err
} }
act, err := fileMultihash(p) act, bytesRead, err := fileMultihash(p)
if err != nil { if err != nil {
atomic.AddInt64(&s.FilesFailed, 1) atomic.AddInt64(&s.FilesFailed, 1)
return err return err
@ -436,7 +436,7 @@ func ProcessCheck(dir string, cont bool, stats *Stats, bar *progressbar.Progress
atomic.AddInt64(&s.FilesFailed, 1) atomic.AddInt64(&s.FilesFailed, 1)
} else { } else {
atomic.AddInt64(&s.FilesProcessed, 1) atomic.AddInt64(&s.FilesProcessed, 1)
atomic.AddInt64(&s.BytesProcessed, info.Size()) atomic.AddInt64(&s.BytesProcessed, bytesRead)
} }
if verbose && !quiet { if verbose && !quiet {
status := "OK" status := "OK"
@ -604,20 +604,21 @@ func hasXattr(path, key string) bool {
return err == nil return err == nil
} }
func fileMultihash(path string) ([]byte, error) { func fileMultihash(path string) (hash []byte, bytesRead int64, err error) {
f, err := os.Open(path) f, err := os.Open(path)
if err != nil { if err != nil {
return nil, err return nil, 0, err
} }
defer f.Close() defer f.Close()
h := sha256.New() h := sha256.New()
if _, err := io.Copy(h, f); err != nil { bytesRead, err = io.Copy(h, f)
return nil, err if err != nil {
return nil, bytesRead, err
} }
mh, err := multihash.Encode(h.Sum(nil), multihash.SHA2_256) mh, err := multihash.Encode(h.Sum(nil), multihash.SHA2_256)
if err != nil { if err != nil {
return nil, err return nil, bytesRead, err
} }
return []byte(base58.Encode(mh)), nil return []byte(base58.Encode(mh)), bytesRead, nil
} }