tree-wide: Migrate from using x/text/message directly to using textui

2 files changed, 11 insertions, 15 deletions

diff --git a/lib/btrfsprogs/btrfsinspect/print_addrspace.go b/lib/btrfsprogs/btrfsinspect/print_addrspace.go
index 7436d5b..cd90288 100644
--- a/lib/btrfsprogs/btrfsinspect/print_addrspace.go
+++ b/lib/btrfsprogs/btrfsinspect/print_addrspace.go
@@ -9,10 +9,9 @@ import (
 	"io"
 	"sort"
 
-	"golang.org/x/text/message"
-
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/textui"
 )
 
 func PrintLogicalSpace(out io.Writer, fs *btrfs.FS) {
@@ -40,10 +39,9 @@ func PrintLogicalSpace(out io.Writer, fs *btrfs.FS) {
 		prevBeg = mapping.LAddr
 		prevEnd = mapping.LAddr.Add(mapping.Size)
 	}
-	p := message.NewPrinter(message.MatchLanguage("en"))
-	p.Fprintf(out, "total logical holes      = %v (%d)\n", sumHole, int64(sumHole))
-	p.Fprintf(out, "total logical chunks     = %v (%d)\n", sumChunk, int64(sumChunk))
-	p.Fprintf(out, "total logical addr space = %v (%d)\n", prevEnd, int64(prevEnd))
+	textui.Fprintf(out, "total logical holes      = %v (%d)\n", sumHole, int64(sumHole))
+	textui.Fprintf(out, "total logical chunks     = %v (%d)\n", sumChunk, int64(sumChunk))
+	textui.Fprintf(out, "total logical addr space = %v (%d)\n", prevEnd, int64(prevEnd))
 }
 
 func PrintPhysicalSpace(out io.Writer, fs *btrfs.FS) {
@@ -70,8 +68,7 @@ func PrintPhysicalSpace(out io.Writer, fs *btrfs.FS) {
 		sumExt += mapping.Size
 		prevEnd = mapping.PAddr.Addr.Add(mapping.Size)
 	}
-	p := message.NewPrinter(message.MatchLanguage("en"))
-	p.Fprintf(out, "total physical holes      = %v (%d)\n", sumHole, int64(sumHole))
-	p.Fprintf(out, "total physical extents    = %v (%d)\n", sumExt, int64(sumExt))
-	p.Fprintf(out, "total physical addr space = %v (%d)\n", prevEnd, int64(prevEnd))
+	textui.Fprintf(out, "total physical holes      = %v (%d)\n", sumHole, int64(sumHole))
+	textui.Fprintf(out, "total physical extents    = %v (%d)\n", sumExt, int64(sumExt))
+	textui.Fprintf(out, "total physical addr space = %v (%d)\n", prevEnd, int64(prevEnd))
 }
diff --git a/lib/btrfsprogs/btrfsinspect/rebuildmappings/rebuildmappings.go b/lib/btrfsprogs/btrfsinspect/rebuildmappings/rebuildmappings.go
index f1959b4..5bf1347 100644
--- a/lib/btrfsprogs/btrfsinspect/rebuildmappings/rebuildmappings.go
+++ b/lib/btrfsprogs/btrfsinspect/rebuildmappings/rebuildmappings.go
@@ -9,13 +9,13 @@ import (
 	"fmt"
 
 	"github.com/datawire/dlib/dlog"
-	"golang.org/x/text/message"
 
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect"
 	"git.lukeshu.com/btrfs-progs-ng/lib/containers"
 	"git.lukeshu.com/btrfs-progs-ng/lib/maps"
+	"git.lukeshu.com/btrfs-progs-ng/lib/textui"
 )
 
 func getNodeSize(fs *btrfs.FS) (btrfsvol.AddrDelta, error) {
@@ -158,7 +158,6 @@ func RebuildMappings(ctx context.Context, fs *btrfs.FS, scanResults btrfsinspect
 	dlog.Info(ctx, "... done searching for fuzzy block groups")
 
 	dlog.Info(ctx, "report:")
-	p := message.NewPrinter(message.MatchLanguage("en"))
 
 	unmappedPhysicalRegions := ListUnmappedPhysicalRegions(fs)
 	var unmappedPhysical btrfsvol.AddrDelta
@@ -169,20 +168,20 @@ func RebuildMappings(ctx context.Context, fs *btrfs.FS, scanResults btrfsinspect
 			unmappedPhysical += region.End.Sub(region.Beg)
 		}
 	}
-	dlog.Info(ctx, p.Sprintf("... %d KiB of unmapped physical space (across %d regions)", int(unmappedPhysical/1024), numUnmappedPhysical))
+	dlog.Info(ctx, fmt.Sprintf("... %d KiB of unmapped physical space (across %d regions)", textui.Humanized(int(unmappedPhysical/1024)), textui.Humanized(numUnmappedPhysical)))
 
 	unmappedLogicalRegions := ListUnmappedLogicalRegions(fs, logicalSums)
 	var unmappedLogical btrfsvol.AddrDelta
 	for _, region := range unmappedLogicalRegions {
 		unmappedLogical += region.Size()
 	}
-	dlog.Info(ctx, p.Sprintf("... %d KiB of unmapped summed logical space (across %d regions)", int(unmappedLogical/1024), len(unmappedLogicalRegions)))
+	dlog.Info(ctx, fmt.Sprintf("... %d KiB of unmapped summed logical space (across %d regions)", textui.Humanized(int(unmappedLogical/1024)), textui.Humanized(len(unmappedLogicalRegions))))
 
 	var unmappedBlockGroups btrfsvol.AddrDelta
 	for _, bg := range bgs {
 		unmappedBlockGroups += bg.Size
 	}
-	dlog.Info(ctx, p.Sprintf("... %d KiB of unmapped block groups (across %d groups)", int(unmappedBlockGroups/1024), len(bgs)))
+	dlog.Info(ctx, fmt.Sprintf("... %d KiB of unmapped block groups (across %d groups)", textui.Humanized(int(unmappedBlockGroups/1024)), textui.Humanized(len(bgs))))
 
 	dlog.Info(ctx, "detailed report:")
 	for _, devID := range maps.SortedKeys(unmappedPhysicalRegions) {