kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix merge issue

Browse source
This commit is contained in:
Guillaume J. Charmes 2013-06-14 16:08:08 -07:00
parent 60fd7d686d
commit 76a568fc97
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
utils/utils.go
View file

@ -86,7 +86,7 @@ func (r *progressReader) Read(p []byte) (n int, err error) {
}
if r.readProgress-r.lastUpdate > updateEvery || err != nil {
if r.readTotal > 0 {
fmt.Fprintf(r.output, r.template, HumanSize(r.readProgress), HumanSize(r.readTotal), fmt.Sprintf("%.0f%%", float64(r.readProgress)/float64(r.readTotal)*100))
fmt.Fprintf(r.output, r.template, HumanSize(int64(r.readProgress)), HumanSize(int64(r.readTotal)), fmt.Sprintf("%.0f%%", float64(r.readProgress)/float64(r.readTotal)*100))
} else {
fmt.Fprintf(r.output, r.template, r.readProgress, "?", "n/a")
}
@ -110,18 +110,6 @@ func ProgressReader(r io.ReadCloser, size int, output io.Writer, template []byte
return &progressReader{r, NewWriteFlusher(output), size, 0, 0, tpl, sf}
}
func HumanSize(origSize int) string {
size := float64(origSize)
for _, unit := range []string{"b", "Kb", "Mb", "Gb", "Tb"} {
if int(size)/1024 == 0 {
return fmt.Sprintf("%.03f%s", size, unit)
} else {
size = size / 1024
}
}
return strconv.Itoa(origSize)
}
// HumanDuration returns a human-readable approximation of a duration
// (eg. "About a minute", "4 hours ago", etc.)
func HumanDuration(d time.Duration) string {