Add Clones property to Snapshot for caching and update table handling for Clones column

Author: markusressel

internal/ui/snapshot_browser/table_container.go

@@ -62,7 +62,7 @@ func createSnapshotBrowserTableCells(row int, columns []*table.Column, entry *da
 			ratio := entry.Snapshot.Properties.CompressionRatio
 			cellText = fmt.Sprintf("%.2fx", ratio)
 		case columnClones:
-			cellText = fmt.Sprintf("%d", entry.Snapshot.GetClones())
+			cellText = fmt.Sprintf("%d", entry.Snapshot.Properties.Clones)
 		}
 		cell := tview.NewTableCell(cellText).
 			SetTextColor(cellColor).SetAlign(cellAlign)
@@ -93,7 +93,16 @@ func createSnapshotBrowserTableSortFunction(entries []*data.SnapshotBrowserEntry
 			ratioB := b.Snapshot.Properties.CompressionRatio
 			result = big.NewFloat(ratioA).Cmp(big.NewFloat(ratioB))
 		case columnClones:
-			result = int(b.Snapshot.GetClones() - a.Snapshot.GetClones())
+			clonesA := a.Snapshot.Properties.Clones
+			clonesB := b.Snapshot.Properties.Clones
+			switch {
+			case clonesA < clonesB:
+				result = -1
+			case clonesA > clonesB:
+				result = 1
+			default:
+				result = 0
+			}
 		}
 		if inverted {
 			result *= -1

internal/ui/snapshot_browser/table_container_test.go

@@ -0,0 +1,66 @@
+package snapshot_browser
+
+import (
+	"math"
+	"testing"
+	"zfs-file-history/internal/data"
+	"zfs-file-history/internal/data/diff_state"
+	"zfs-file-history/internal/ui/table"
+	"zfs-file-history/internal/zfs"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCreateSnapshotBrowserTableCells_ClonesColumn(t *testing.T) {
+	entry := &data.SnapshotBrowserEntry{
+		Snapshot: &zfs.Snapshot{
+			Name: "snap-a",
+			Properties: zfs.SnapshotProperties{
+				Clones: 42,
+			},
+		},
+		DiffState: diff_state.Unknown,
+	}
+
+	cells := createSnapshotBrowserTableCells(0, []*table.Column{columnClones}, entry)
+
+	if assert.Len(t, cells, 1) {
+		assert.Equal(t, "42", cells[0].Text)
+	}
+}
+
+func TestCreateSnapshotBrowserTableSortFunction_ClonesAscendingAndDescending(t *testing.T) {
+	entries := []*data.SnapshotBrowserEntry{
+		newSnapshotEntryWithClones("low", 0),
+		newSnapshotEntryWithClones("high", math.MaxUint64),
+		newSnapshotEntryWithClones("mid", 1),
+	}
+
+	ascending := append([]*data.SnapshotBrowserEntry{}, entries...)
+	createSnapshotBrowserTableSortFunction(ascending, columnClones, false)
+	assert.Equal(t, []string{"low", "mid", "high"}, snapshotNames(ascending))
+
+	descending := append([]*data.SnapshotBrowserEntry{}, entries...)
+	createSnapshotBrowserTableSortFunction(descending, columnClones, true)
+	assert.Equal(t, []string{"high", "mid", "low"}, snapshotNames(descending))
+}
+
+func newSnapshotEntryWithClones(name string, clones uint64) *data.SnapshotBrowserEntry {
+	return &data.SnapshotBrowserEntry{
+		Snapshot: &zfs.Snapshot{
+			Name: name,
+			Properties: zfs.SnapshotProperties{
+				Clones: clones,
+			},
+		},
+		DiffState: diff_state.Unknown,
+	}
+}
+
+func snapshotNames(entries []*data.SnapshotBrowserEntry) []string {
+	result := make([]string, 0, len(entries))
+	for _, entry := range entries {
+		result = append(result, entry.Snapshot.Name)
+	}
+	return result
+}

internal/zfs/snapshot.go

@@ -428,6 +428,7 @@ type SnapshotProperties struct {
 	Used             uint64
 	Referenced       uint64
 	CompressionRatio float64
+	Clones           uint64
 }
 
 func (s *Snapshot) FetchDetails() {
@@ -436,6 +437,7 @@ func (s *Snapshot) FetchDetails() {
 		Used:             s.GetUsed(),
 		Referenced:       s.GetReferenced(),
 		CompressionRatio: s.GetRatio(),
+		Clones:           s.GetClones(),
 	}
 }