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

Merge branch 'fix-stats'

Browse Source
This commit is contained in:
Alexander Neumann 2014-11-23 15:04:03 +01:00
commit fd3aca66e4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/khepri/cmd_backup.go
View File

@ -17,13 +17,13 @@ func format_bytes(c uint64) string {
switch { switch {
case c > 1<<40: case c > 1<<40:
return fmt.Sprintf("%.3fTiB", b/(1<<40)) return fmt.Sprintf("%.3f TiB", b/(1<<40))
case c > 1<<30: case c > 1<<30:
return fmt.Sprintf("%.3fGiB", b/(1<<30)) return fmt.Sprintf("%.3f GiB", b/(1<<30))
case c > 1<<20: case c > 1<<20:
return fmt.Sprintf("%.3fMiB", b/(1<<20)) return fmt.Sprintf("%.3f MiB", b/(1<<20))
case c > 1<<10: case c > 1<<10:
return fmt.Sprintf("%.3fKiB", b/(1<<10)) return fmt.Sprintf("%.3f KiB", b/(1<<10))
default: default:
return fmt.Sprintf("%dB", c) return fmt.Sprintf("%dB", c)
} }
@ -108,9 +108,9 @@ func commandBackup(be backend.Server, key *khepri.Key, args []string) error {
go func(ch <-chan khepri.Stats) { go func(ch <-chan khepri.Stats) {
status := func(d time.Duration) { status := func(sec uint64) {
fmt.Printf("\x1b[2K\r[%s] %3.2f%% %s/s %s / %s ETA %s", fmt.Printf("\x1b[2K\r[%s] %3.2f%% %s/s %s / %s ETA %s",
format_duration(uint64(d/time.Second)), format_duration(sec),
float64(stats.Bytes)/float64(arch.Stats.Bytes)*100, float64(stats.Bytes)/float64(arch.Stats.Bytes)*100,
format_bytes(bps), format_bytes(bps),
format_bytes(stats.Bytes), format_bytes(arch.Stats.Bytes), format_bytes(stats.Bytes), format_bytes(arch.Stats.Bytes),
@ -129,16 +129,16 @@ func commandBackup(be backend.Server, key *khepri.Key, args []string) error {
stats.Other += s.Other stats.Other += s.Other
stats.Bytes += s.Bytes stats.Bytes += s.Bytes
status(time.Since(start)) status(uint64(time.Since(start) / time.Second))
case <-ticker.C: case <-ticker.C:
d := time.Since(start) sec := uint64(time.Since(start) / time.Second)
bps = stats.Bytes * uint64(time.Second) / uint64(d) bps = stats.Bytes / sec
if bps > 0 { if bps > 0 {
eta = (arch.Stats.Bytes - stats.Bytes) / bps eta = (arch.Stats.Bytes - stats.Bytes) / bps
} }
status(d) status(sec)
} }
} }
}(ch) }(ch)