show file count [BC break]

closes dundee#55

Makefile

@@ -1,5 +1,5 @@
 NAME := gdu
-MAJOR_VER := v4
+MAJOR_VER := v5
 PACKAGE := github.com/dundee/$(NAME)/$(MAJOR_VER)
 CMD_GDU := cmd/gdu
 VERSION := $(shell git describe --tags 2>/dev/null)

README.md

@@ -64,7 +64,7 @@ Using curl:
 
 [Go](https://pkg.go.dev/github.com/dundee/gdu):
 
-    go get -u github.com/dundee/gdu/v4/cmd/gdu
+    go get -u github.com/dundee/gdu/v5/cmd/gdu
 
 
 ## Usage

cmd/gdu/app/app.go

@@ -7,12 +7,12 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/dundee/gdu/v4/build"
-	"github.com/dundee/gdu/v4/internal/common"
-	"github.com/dundee/gdu/v4/pkg/analyze"
-	"github.com/dundee/gdu/v4/pkg/device"
-	"github.com/dundee/gdu/v4/stdout"
-	"github.com/dundee/gdu/v4/tui"
+	"github.com/dundee/gdu/v5/build"
+	"github.com/dundee/gdu/v5/internal/common"
+	"github.com/dundee/gdu/v5/pkg/analyze"
+	"github.com/dundee/gdu/v5/pkg/device"
+	"github.com/dundee/gdu/v5/stdout"
+	"github.com/dundee/gdu/v5/tui"
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
 )

cmd/gdu/app/app_test.go

@@ -6,10 +6,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/dundee/gdu/v4/internal/testapp"
-	"github.com/dundee/gdu/v4/internal/testdev"
-	"github.com/dundee/gdu/v4/internal/testdir"
-	"github.com/dundee/gdu/v4/pkg/device"
+	"github.com/dundee/gdu/v5/internal/testapp"
+	"github.com/dundee/gdu/v5/internal/testdev"
+	"github.com/dundee/gdu/v5/internal/testdir"
+	"github.com/dundee/gdu/v5/pkg/device"
 	"github.com/stretchr/testify/assert"
 )
 

cmd/gdu/main.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/dundee/gdu/v4/cmd/gdu/app"
-	"github.com/dundee/gdu/v4/pkg/device"
+	"github.com/dundee/gdu/v5/cmd/gdu/app"
+	"github.com/dundee/gdu/v5/pkg/device"
 	"github.com/gdamore/tcell/v2"
 	"github.com/mattn/go-isatty"
 	"github.com/rivo/tview"

go.mod

@@ -1,4 +1,4 @@
-module github.com/dundee/gdu/v4
+module github.com/dundee/gdu/v5
 
 go 1.16
 

internal/common/ignore.go

@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/dundee/gdu/v4/pkg/analyze"
+	"github.com/dundee/gdu/v5/pkg/analyze"
 )
 
 // CreateIgnorePattern creates one pattern from all path patterns

internal/common/ignore_test.go

@@ -3,7 +3,7 @@ package common_test
 import (
 	"testing"
 
-	"github.com/dundee/gdu/v4/internal/common"
+	"github.com/dundee/gdu/v5/internal/common"
 	"github.com/stretchr/testify/assert"
 )
 

internal/common/ui.go

@@ -4,7 +4,7 @@ import (
 	"io/fs"
 	"regexp"
 
-	"github.com/dundee/gdu/v4/pkg/analyze"
+	"github.com/dundee/gdu/v5/pkg/analyze"
 )
 
 // UI struct

internal/testanalyze/analyze.go

@@ -3,7 +3,7 @@ package testanalyze
 import (
 	"errors"
 
-	"github.com/dundee/gdu/v4/pkg/analyze"
+	"github.com/dundee/gdu/v5/pkg/analyze"
 )
 
 // MockedAnalyzer returns dir with files with diferent size exponents

internal/testapp/app.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"sync"
 
-	"github.com/dundee/gdu/v4/internal/common"
+	"github.com/dundee/gdu/v5/internal/common"
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
 )

internal/testdev/dev.go

@@ -1,6 +1,6 @@
 package testdev
 
-import "github.com/dundee/gdu/v4/pkg/device"
+import "github.com/dundee/gdu/v5/pkg/device"
 
 // DevicesInfoGetterMock is mock of DevicesInfoGetter
 type DevicesInfoGetterMock struct {

pkg/analyze/dir_test.go

@@ -5,7 +5,7 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/dundee/gdu/v4/internal/testdir"
+	"github.com/dundee/gdu/v5/internal/testdir"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/analyze/file_test.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/dundee/gdu/v4/internal/testdir"
+	"github.com/dundee/gdu/v5/internal/testdir"
 	"github.com/stretchr/testify/assert"
 )
 

stdout/stdout.go

@@ -10,9 +10,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/dundee/gdu/v4/internal/common"
-	"github.com/dundee/gdu/v4/pkg/analyze"
-	"github.com/dundee/gdu/v4/pkg/device"
+	"github.com/dundee/gdu/v5/internal/common"
+	"github.com/dundee/gdu/v5/pkg/analyze"
+	"github.com/dundee/gdu/v5/pkg/device"
 	"github.com/fatih/color"
 )
 

stdout/stdout_test.go

@@ -4,10 +4,10 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/dundee/gdu/v4/internal/testanalyze"
-	"github.com/dundee/gdu/v4/internal/testdev"
-	"github.com/dundee/gdu/v4/internal/testdir"
-	"github.com/dundee/gdu/v4/pkg/device"
+	"github.com/dundee/gdu/v5/internal/testanalyze"
+	"github.com/dundee/gdu/v5/internal/testdev"
+	"github.com/dundee/gdu/v5/internal/testdir"
+	"github.com/dundee/gdu/v5/pkg/device"
 	"github.com/stretchr/testify/assert"
 )
 

tui/actions.go

@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/dundee/gdu/v4/pkg/analyze"
-	"github.com/dundee/gdu/v4/pkg/device"
+	"github.com/dundee/gdu/v5/pkg/analyze"
+	"github.com/dundee/gdu/v5/pkg/device"
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
 )

tui/actions_test.go

@@ -4,11 +4,11 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/dundee/gdu/v4/internal/testanalyze"
-	"github.com/dundee/gdu/v4/internal/testapp"
-	"github.com/dundee/gdu/v4/internal/testdir"
-	"github.com/dundee/gdu/v4/pkg/analyze"
-	"github.com/dundee/gdu/v4/pkg/device"
+	"github.com/dundee/gdu/v5/internal/testanalyze"
+	"github.com/dundee/gdu/v5/internal/testapp"
+	"github.com/dundee/gdu/v5/internal/testdir"
+	"github.com/dundee/gdu/v5/pkg/analyze"
+	"github.com/dundee/gdu/v5/pkg/device"
 	"github.com/gdamore/tcell/v2"
 	"github.com/stretchr/testify/assert"
 )

tui/format.go

@@ -3,7 +3,7 @@ package tui
 import (
 	"fmt"
 
-	"github.com/dundee/gdu/v4/pkg/analyze"
+	"github.com/dundee/gdu/v5/pkg/analyze"
 )
 
 // file size constants
@@ -17,6 +17,16 @@ const (
 	EB
 )
 
+// file count constants
+const (
+	K int = 1e3
+	M int = 1e6
+	G int = 1e9
+	T int = 1e12
+	P int = 1e15
+	E int = 1e18
+)
+
 func (ui *UI) formatFileRow(item analyze.Item) string {
 	var part int
 
@@ -42,6 +52,15 @@ func (ui *UI) formatFileRow(item analyze.Item) string {
 
 	row += getUsageGraph(part)
 
+	if ui.showItemCount {
+		if ui.UseColors {
+			row += "[#e67100::b]"
+		} else {
+			row += "[::b]"
+		}
+		row += fmt.Sprintf("%11s ", ui.formatCount(item.GetItemCount()))
+	}
+
 	if item.IsDir() {
 		if ui.UseColors {
 			row += "[#3498db::b]/"
@@ -88,3 +107,26 @@ func (ui *UI) formatSize(size int64, reverseColor bool, transparentBg bool) stri
 		return fmt.Sprintf("%d%s B", size, color)
 	}
 }
+
+func (ui *UI) formatCount(count int) string {
+	row := ""
+	color := "[-::]"
+
+	switch {
+	case count >= E:
+		row += fmt.Sprintf("%.1f%sE", float64(count)/float64(E), color)
+	case count >= P:
+		row += fmt.Sprintf("%.1f%sP", float64(count)/float64(P), color)
+	case count >= T:
+		row += fmt.Sprintf("%.1f%sT", float64(count)/float64(T), color)
+	case count >= G:
+		row += fmt.Sprintf("%.1f%sG", float64(count)/float64(G), color)
+	case count >= M:
+		row += fmt.Sprintf("%.1f%sM", float64(count)/float64(M), color)
+	case count >= K:
+		row += fmt.Sprintf("%.1f%sk", float64(count)/float64(K), color)
+	default:
+		row += fmt.Sprintf("%d%s", count, color)
+	}
+	return row
+}

tui/format_test.go

@@ -3,7 +3,7 @@ package tui
 import (
 	"testing"
 
-	"github.com/dundee/gdu/v4/internal/testapp"
+	"github.com/dundee/gdu/v5/internal/testapp"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -19,3 +19,16 @@ func TestFormatSize(t *testing.T) {
 	assert.Equal(t, "1.0[white:black:-] PiB", ui.formatSize(1<<50, false, false))
 	assert.Equal(t, "1.0[white:black:-] EiB", ui.formatSize(1<<60, false, false))
 }
+
+func TestFormatCount(t *testing.T) {
+	app := testapp.CreateMockedApp(true)
+	ui := CreateUI(app, false, false)
+
+	assert.Equal(t, "1[-::]", ui.formatCount(1))
+	assert.Equal(t, "1.0[-::]k", ui.formatCount(1<<10))
+	assert.Equal(t, "1.0[-::]M", ui.formatCount(1<<20))
+	assert.Equal(t, "1.1[-::]G", ui.formatCount(1<<30))
+	assert.Equal(t, "1.1[-::]T", ui.formatCount(1<<40))
+	assert.Equal(t, "1.1[-::]P", ui.formatCount(1<<50))
+	assert.Equal(t, "1.2[-::]E", ui.formatCount(1<<60))
+}

tui/keys.go

@@ -1,7 +1,7 @@
 package tui
 
 import (
-	"github.com/dundee/gdu/v4/pkg/analyze"
+	"github.com/dundee/gdu/v5/pkg/analyze"
 	"github.com/gdamore/tcell/v2"
 )
 
@@ -53,13 +53,20 @@ func (ui *UI) keyPressed(key *tcell.EventKey) *tcell.EventKey {
 			ui.showDir()
 			ui.table.Select(row, column)
 		}
+	case 'c':
+		ui.showItemCount = !ui.showItemCount
+		if ui.currentDir != nil {
+			row, column := ui.table.GetSelection()
+			ui.showDir()
+			ui.table.Select(row, column)
+		}
 	case 'r':
 		if ui.currentDir != nil {
 			ui.rescanDir()
 		}
 	case 's':
 		ui.setSorting("size")
-	case 'c':
+	case 'C':
 		ui.setSorting("itemCount")
 	case 'n':
 		ui.setSorting("name")

tui/keys_test.go

@@ -3,10 +3,10 @@ package tui
 import (
 	"testing"
 
-	"github.com/dundee/gdu/v4/internal/testanalyze"
-	"github.com/dundee/gdu/v4/internal/testapp"
-	"github.com/dundee/gdu/v4/internal/testdir"
-	"github.com/dundee/gdu/v4/pkg/analyze"
+	"github.com/dundee/gdu/v5/internal/testanalyze"
+	"github.com/dundee/gdu/v5/internal/testapp"
+	"github.com/dundee/gdu/v5/internal/testdir"
+	"github.com/dundee/gdu/v5/pkg/analyze"
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
 	"github.com/stretchr/testify/assert"
@@ -242,6 +242,48 @@ func TestSortByApparentSize(t *testing.T) {
 	assert.True(t, ui.ShowApparentSize)
 }
 
+func TestShowFileCount(t *testing.T) {
+	app := testapp.CreateMockedApp(true)
+	ui := CreateUI(app, true, false)
+	ui.Analyzer = &testanalyze.MockedAnalyzer{}
+	ui.PathChecker = testdir.MockedPathChecker
+	ui.done = make(chan struct{})
+	ui.AnalyzePath("test_dir", nil)
+
+	<-ui.done // wait for analyzer
+
+	assert.Equal(t, "test_dir", ui.currentDir.Name)
+
+	for _, f := range ui.app.(*testapp.MockedApp).UpdateDraws {
+		f()
+	}
+
+	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'c', 0))
+
+	assert.True(t, ui.showItemCount)
+}
+
+func TestShowFileCountBW(t *testing.T) {
+	app := testapp.CreateMockedApp(true)
+	ui := CreateUI(app, false, false)
+	ui.Analyzer = &testanalyze.MockedAnalyzer{}
+	ui.PathChecker = testdir.MockedPathChecker
+	ui.done = make(chan struct{})
+	ui.AnalyzePath("test_dir", nil)
+
+	<-ui.done // wait for analyzer
+
+	assert.Equal(t, "test_dir", ui.currentDir.Name)
+
+	for _, f := range ui.app.(*testapp.MockedApp).UpdateDraws {
+		f()
+	}
+
+	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'c', 0))
+
+	assert.True(t, ui.showItemCount)
+}
+
 func TestRescan(t *testing.T) {
 	parentDir := &analyze.Dir{
 		File: &analyze.File{
@@ -297,7 +339,7 @@ func TestSorting(t *testing.T) {
 
 	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 's', 0))
 	assert.Equal(t, "size", ui.sortBy)
-	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'c', 0))
+	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'C', 0))
 	assert.Equal(t, "itemCount", ui.sortBy)
 	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'n', 0))
 	assert.Equal(t, "name", ui.sortBy)