go/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-01-13 20:38:12 +02:00
Code Issues Releases Activity

ncdu: introduce key u to toggle human-readable

Browse Source
This commit is contained in:
albertony 2021-04-02 20:17:32 +02:00
parent d24f87c6a9
commit 774efeabf0
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/ncdu/ncdu.go
View File

@ -72,6 +72,7 @@ func helpText() (tr []string) {
" c toggle counts", " c toggle counts",
" g toggle graph", " g toggle graph",
" a toggle average size in directory", " a toggle average size in directory",
" u toggle human-readable format",
" n,s,C,A sort by name,size,count,average size", " n,s,C,A sort by name,size,count,average size",
" d delete file/directory", " d delete file/directory",
} }
@ -107,6 +108,7 @@ type UI struct {
showGraph bool // toggle showing graph showGraph bool // toggle showing graph
showCounts bool // toggle showing counts showCounts bool // toggle showing counts
showDirAverageSize bool // toggle average size showDirAverageSize bool // toggle average size
humanReadable bool // toggle human-readable format
sortByName int8 // +1 for normal, 0 for off, -1 for reverse sortByName int8 // +1 for normal, 0 for off, -1 for reverse
sortBySize int8 sortBySize int8
sortByCount int8 sortByCount int8
@ -372,24 +374,24 @@ func (u *UI) Draw() error {
} }
extras := "" extras := ""
if u.showCounts { if u.showCounts {
ss := operations.CountStringField(count, u.humanReadable, 9) + " "
if count > 0 { if count > 0 {
extras += fmt.Sprintf("%8v ", fs.CountSuffix(count)) extras += ss
} else { } else {
extras += " " extras += strings.Repeat(" ", len(ss))
} }
} }
var averageSize float64 var averageSize float64
if count > 0 { if count > 0 {
averageSize = float64(size) / float64(count) averageSize = float64(size) / float64(count)
} }
if u.showDirAverageSize { if u.showDirAverageSize {
ss := operations.SizeStringField(int64(averageSize), u.humanReadable, 9) + " "
if averageSize > 0 { if averageSize > 0 {
extras += fmt.Sprintf("%9v ", fs.SizeSuffix(int64(averageSize))) extras += ss
} else { } else {
extras += " " extras += strings.Repeat(" ", len(ss))
} }
} }
if showEmptyDir { if showEmptyDir {
if isDir && count == 0 && fileFlag == ' ' { if isDir && count == 0 && fileFlag == ' ' {
@ -406,7 +408,7 @@ func (u *UI) Draw() error {
} }
extras += "[" + graph[graphBars-bars:2*graphBars-bars] + "] " extras += "[" + graph[graphBars-bars:2*graphBars-bars] + "] "
} }
Linef(0, y, w, fg, bg, ' ', "%c %9v %s%c%s%s", fileFlag, fs.SizeSuffix(size), extras, mark, path.Base(entry.Remote()), message) Linef(0, y, w, fg, bg, ' ', "%c %s %s%c%s%s", fileFlag, operations.SizeStringField(size, u.humanReadable, 12), extras, mark, path.Base(entry.Remote()), message)
y++ y++
} }
} }
@ -420,7 +422,7 @@ func (u *UI) Draw() error {
message = " [listing in progress]" message = " [listing in progress]"
} }
size, count := u.d.Attr() size, count := u.d.Attr()
Linef(0, h-1, w, termbox.ColorBlack, termbox.ColorWhite, ' ', "Total usage: %v, Objects: %d%s", fs.SizeSuffix(size), count, message) Linef(0, h-1, w, termbox.ColorBlack, termbox.ColorWhite, ' ', "Total usage: %s, Objects: %s%s", operations.SizeString(size, u.humanReadable), operations.CountString(count, u.humanReadable), message)
} }
// Show the box on top if required // Show the box on top if required
@ -727,6 +729,7 @@ func NewUI(f fs.Fs) *UI {
showGraph: true, showGraph: true,
showCounts: false, showCounts: false,
showDirAverageSize: false, showDirAverageSize: false,
humanReadable: true,
sortByName: 0, // +1 for normal, 0 for off, -1 for reverse sortByName: 0, // +1 for normal, 0 for off, -1 for reverse
sortBySize: 1, sortBySize: 1,
sortByCount: 0, sortByCount: 0,
@ -834,6 +837,8 @@ outer:
u.displayPath() u.displayPath()
case 'd': case 'd':
u.delete() u.delete()
case 'u':
u.humanReadable = !u.humanReadable
case '?': case '?':
u.togglePopupBox(helpText()) u.togglePopupBox(helpText())