refactor: type DeviceInfo battery status/health and counts

Author: EverythingSuckz

internal/adb/adb_device_info.go

@@ -29,9 +29,9 @@ type DeviceInfo struct {
 
 	BatteryPct    float64 // [0,1] when known, negative when unknown
 
-	BatteryStatus string
+	BatteryStatus BatteryStatus
 	BatteryTemp   string
-	BatteryHealth string
+	BatteryHealth BatteryHealth
 
 	StorageTotal   string
 	StorageUsed    string
@@ -41,13 +41,13 @@ type DeviceInfo struct {
 
 	RAM         string
 	CPUPlatform string
-	CPUCores    string
+	CPUCores    int // -1 when unknown
 
 	WifiSSID  string
 	IPAddress string
 
 	Uptime         string
-	AppCount       string
+	AppCount       int // -1 when unknown
 	AndroidDisplay string
 	DensityDisplay string
 }
@@ -180,15 +180,15 @@ func (c *Client) GetDeviceInfo(ctx context.Context, serial string) (DeviceInfo,
 		}
 	}
 
-	appCount := fieldUnknown
+	appCount := -1
 	if len(appOut) > 0 {
 		count := 0
 		for _, line := range strings.Split(string(appOut), "\n") {
 			if strings.HasPrefix(strings.TrimSpace(line), "package:") {
 				count++
 			}
 		}
-		appCount = strconv.Itoa(count)
+		appCount = count
 	}
 
 	prop := func(key string) string {

internal/adb/fixture_test.go

@@ -31,11 +31,11 @@ func TestFixtureDumpsysBattery(t *testing.T) {
 	if level != 73 {
 		t.Errorf("level = %d, want 73", level)
 	}
-	if got := parseBatteryStatus(status); got != "Charging" {
-		t.Errorf("battery status = %q, want %q", got, "Charging")
+	if got := parseBatteryStatus(status); got != BatteryStatusCharging {
+		t.Errorf("battery status = %v, want %v", got, BatteryStatusCharging)
 	}
-	if got := parseBatteryHealth(health); got != "Good" {
-		t.Errorf("battery health = %q, want %q", got, "Good")
+	if got := parseBatteryHealth(health); got != BatteryHealthGood {
+		t.Errorf("battery health = %v, want %v", got, BatteryHealthGood)
 	}
 	if got := parseBatteryTemp(temp); got != "31.2°C" {
 		t.Errorf("battery temp = %q, want %q", got, "31.2°C")
@@ -73,8 +73,8 @@ func TestFixtureMeminfo(t *testing.T) {
 func TestFixtureCpuinfoArm(t *testing.T) {
 	out := loadFixture(t, "cpuinfo_arm.txt")
 	// 8 per-core "processor" entries; the ARM "Processor" header line must NOT count
-	if got := parseCPUCores(out); got != "8" {
-		t.Errorf("parseCPUCores = %q, want %q", got, "8")
+	if got := parseCPUCores(out); got != 8 {
+		t.Errorf("parseCPUCores = %d, want 8", got)
 	}
 }
 

internal/adb/parse_helpers.go

@@ -33,44 +33,78 @@ func parseDumpsysBattery(output string) (level int, status, temp, health string)
 	return
 }
 
-func parseBatteryStatus(code string) string {
-	switch code {
-	case "1":
-		return "Unknown"
-	case "2":
+// BatteryStatus mirrors android.os.BatteryManager.BATTERY_STATUS_*.
+type BatteryStatus int
+
+const (
+	BatteryStatusUnknown     BatteryStatus = 1
+	BatteryStatusCharging    BatteryStatus = 2
+	BatteryStatusDischarging BatteryStatus = 3
+	BatteryStatusNotCharging BatteryStatus = 4
+	BatteryStatusFull        BatteryStatus = 5
+)
+
+func (s BatteryStatus) String() string {
+	switch s {
+	case BatteryStatusCharging:
 		return "Charging"
-	case "3":
+	case BatteryStatusDischarging:
 		return "Discharging"
-	case "4":
+	case BatteryStatusNotCharging:
 		return "Not charging"
-	case "5":
+	case BatteryStatusFull:
 		return "Full"
 	default:
 		return "Unknown"
 	}
 }
 
-func parseBatteryHealth(code string) string {
-	switch code {
-	case "1":
-		return "Unknown"
-	case "2":
+// BatteryHealth mirrors android.os.BatteryManager.BATTERY_HEALTH_*.
+type BatteryHealth int
+
+const (
+	BatteryHealthUnknown     BatteryHealth = 1
+	BatteryHealthGood        BatteryHealth = 2
+	BatteryHealthOverheat    BatteryHealth = 3
+	BatteryHealthDead        BatteryHealth = 4
+	BatteryHealthOverVoltage BatteryHealth = 5
+	BatteryHealthFailure     BatteryHealth = 6
+	BatteryHealthCold        BatteryHealth = 7
+)
+
+func (h BatteryHealth) String() string {
+	switch h {
+	case BatteryHealthGood:
 		return "Good"
-	case "3":
+	case BatteryHealthOverheat:
 		return "Overheat"
-	case "4":
+	case BatteryHealthDead:
 		return "Dead"
-	case "5":
+	case BatteryHealthOverVoltage:
 		return "Over voltage"
-	case "6":
+	case BatteryHealthFailure:
 		return "Failure"
-	case "7":
+	case BatteryHealthCold:
 		return "Cold"
 	default:
 		return "Unknown"
 	}
 }
 
+func parseBatteryStatus(code string) BatteryStatus {
+	if n, err := strconv.Atoi(strings.TrimSpace(code)); err == nil {
+		return BatteryStatus(n)
+	}
+	return BatteryStatusUnknown
+}
+
+func parseBatteryHealth(code string) BatteryHealth {
+	if n, err := strconv.Atoi(strings.TrimSpace(code)); err == nil {
+		return BatteryHealth(n)
+	}
+	return BatteryHealthUnknown
+}
+
 func parseBatteryTemp(raw string) string {
 	val, err := strconv.Atoi(strings.TrimSpace(raw))
 	if err != nil {
@@ -172,7 +206,8 @@ func parseMemTotal(memInfoOutput string) string {
 }
 
 // case-sensitive "processor" prefix + numeric value excludes the ARM header line "Processor : AArch64 ...".
-func parseCPUCores(cpuInfoOutput string) string {
+// returns -1 when no per-core entries are found.
+func parseCPUCores(cpuInfoOutput string) int {
 	count := 0
 	for _, line := range strings.Split(cpuInfoOutput, "\n") {
 		trimmed := strings.TrimSpace(line)
@@ -189,9 +224,9 @@ func parseCPUCores(cpuInfoOutput string) string {
 		count++
 	}
 	if count == 0 {
-		return "-"
+		return -1
 	}
-	return strconv.Itoa(count)
+	return count
 }
 
 // returns the index of the value after "SSID:" in s, rejecting matches inside "BSSID:". -1 if not found.

internal/adb/parse_helpers_test.go

@@ -7,44 +7,54 @@ import (
 
 func TestParseBatteryStatus(t *testing.T) {
 	tests := []struct {
-		input string
-		want  string
+		input    string
+		want     BatteryStatus
+		wantText string
 	}{
-		{"2", "Charging"},
-		{"3", "Discharging"},
-		{"4", "Not charging"},
-		{"5", "Full"},
-		{"1", "Unknown"},
-		{"", "Unknown"},
-		{"garbage", "Unknown"},
-		{"99", "Unknown"},
+		{"2", BatteryStatusCharging, "Charging"},
+		{"3", BatteryStatusDischarging, "Discharging"},
+		{"4", BatteryStatusNotCharging, "Not charging"},
+		{"5", BatteryStatusFull, "Full"},
+		{"1", BatteryStatusUnknown, "Unknown"},
+		{"", BatteryStatusUnknown, "Unknown"},
+		{"garbage", BatteryStatusUnknown, "Unknown"},
+		{"99", BatteryStatus(99), "Unknown"}, // unknown int code falls back to "Unknown" text
 	}
 	for _, tt := range tests {
-		if got := parseBatteryStatus(tt.input); got != tt.want {
-			t.Errorf("parseBatteryStatus(%q) = %q, want %q", tt.input, got, tt.want)
+		got := parseBatteryStatus(tt.input)
+		if got != tt.want {
+			t.Errorf("parseBatteryStatus(%q) = %d, want %d", tt.input, got, tt.want)
+		}
+		if got.String() != tt.wantText {
+			t.Errorf("parseBatteryStatus(%q).String() = %q, want %q", tt.input, got.String(), tt.wantText)
 		}
 	}
 }
 
 func TestParseBatteryHealth(t *testing.T) {
 	tests := []struct {
-		input string
-		want  string
+		input    string
+		want     BatteryHealth
+		wantText string
 	}{
-		{"1", "Unknown"},
-		{"2", "Good"},
-		{"3", "Overheat"},
-		{"4", "Dead"},
-		{"5", "Over voltage"},
-		{"6", "Failure"},
-		{"7", "Cold"},
-		{"", "Unknown"},
-		{"garbage", "Unknown"},
-		{"99", "Unknown"},
+		{"1", BatteryHealthUnknown, "Unknown"},
+		{"2", BatteryHealthGood, "Good"},
+		{"3", BatteryHealthOverheat, "Overheat"},
+		{"4", BatteryHealthDead, "Dead"},
+		{"5", BatteryHealthOverVoltage, "Over voltage"},
+		{"6", BatteryHealthFailure, "Failure"},
+		{"7", BatteryHealthCold, "Cold"},
+		{"", BatteryHealthUnknown, "Unknown"},
+		{"garbage", BatteryHealthUnknown, "Unknown"},
+		{"99", BatteryHealth(99), "Unknown"},
 	}
 	for _, tt := range tests {
-		if got := parseBatteryHealth(tt.input); got != tt.want {
-			t.Errorf("parseBatteryHealth(%q) = %q, want %q", tt.input, got, tt.want)
+		got := parseBatteryHealth(tt.input)
+		if got != tt.want {
+			t.Errorf("parseBatteryHealth(%q) = %d, want %d", tt.input, got, tt.want)
+		}
+		if got.String() != tt.wantText {
+			t.Errorf("parseBatteryHealth(%q).String() = %q, want %q", tt.input, got.String(), tt.wantText)
 		}
 	}
 }
@@ -148,21 +158,21 @@ func TestParseCPUCores(t *testing.T) {
 	tests := []struct {
 		name  string
 		input string
-		want  string
+		want  int
 	}{
-		{"two cores", "processor\t: 0\nBogoMIPS\t: 52.00\nprocessor\t: 1\n", "2"},
+		{"two cores", "processor\t: 0\nBogoMIPS\t: 52.00\nprocessor\t: 1\n", 2},
 		// ARM header line "Processor : AArch64 ..." must NOT be counted —
 		// the device has 2 cores, not 3.
-		{"arm header excluded", "Processor\t: AArch64 Processor rev 4 (aarch64)\nprocessor\t: 0\nprocessor\t: 1\n", "2"},
-		{"empty", "", "-"},
-		{"no matches", "no processor lines here", "-"},
+		{"arm header excluded", "Processor\t: AArch64 Processor rev 4 (aarch64)\nprocessor\t: 0\nprocessor\t: 1\n", 2},
+		{"empty", "", -1},
+		{"no matches", "no processor lines here", -1},
 		// Non-numeric value should be ignored.
-		{"non-numeric value", "processor\t: foo\nprocessor\t: 0\n", "1"},
-		{"eight cores", "processor\t: 0\nprocessor\t: 1\nprocessor\t: 2\nprocessor\t: 3\nprocessor\t: 4\nprocessor\t: 5\nprocessor\t: 6\nprocessor\t: 7\n", "8"},
+		{"non-numeric value", "processor\t: foo\nprocessor\t: 0\n", 1},
+		{"eight cores", "processor\t: 0\nprocessor\t: 1\nprocessor\t: 2\nprocessor\t: 3\nprocessor\t: 4\nprocessor\t: 5\nprocessor\t: 6\nprocessor\t: 7\n", 8},
 	}
 	for _, tt := range tests {
 		if got := parseCPUCores(tt.input); got != tt.want {
-			t.Errorf("parseCPUCores(%q) = %q, want %q", tt.input, got, tt.want)
+			t.Errorf("parseCPUCores(%q) = %d, want %d", tt.input, got, tt.want)
 		}
 	}
 }

internal/ui/device_info_panel.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"image/color"
 	"log"
+	"strconv"
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/canvas"
@@ -427,9 +428,9 @@ func (v *infoView) apply(info adb.DeviceInfo) {
 	v.batteryBar.Refresh()
 
 	v.batteryPills.Objects = []fyne.CanvasObject{
-		buildInfoPill(icons.ZapIcon, info.BatteryStatus, batteryStatusColor(info.BatteryStatus)),
+		buildInfoPill(icons.ZapIcon, info.BatteryStatus.String(), batteryStatusColor(info.BatteryStatus)),
 		buildInfoPill(icons.ThermometerIcon, info.BatteryTemp, pillTeal),
-		buildInfoPill(icons.HeartIcon, info.BatteryHealth, pillTeal),
+		buildInfoPill(icons.HeartIcon, info.BatteryHealth.String(), pillTeal),
 	}
 	v.batteryPills.Refresh()
 
@@ -444,18 +445,26 @@ func (v *infoView) apply(info adb.DeviceInfo) {
 	v.density.Set(info.DensityDisplay)
 
 	v.cpuPlatform.Set(info.CPUPlatform)
-	v.cpuCores.Set(info.CPUCores)
+	v.cpuCores.Set(formatCount(info.CPUCores))
 	v.ram.Set(info.RAM)
 
 	v.wifiSSID.Set(info.WifiSSID)
 	v.ip.Set(info.IPAddress)
 
 	v.androidVer.Set(info.AndroidDisplay)
 	v.uptime.Set(info.Uptime)
-	v.appCount.Set(info.AppCount)
+	v.appCount.Set(formatCount(info.AppCount))
 	v.buildID.Set(info.BuildID)
 }
 
+// formatCount renders a possibly-unknown count: "-" for negative, decimal otherwise.
+func formatCount(n int) string {
+	if n < 0 {
+		return "-"
+	}
+	return strconv.Itoa(n)
+}
+
 func (dip *DeviceInfoPanel) buildDisconnectedView(serial string) fyne.CanvasObject {
 	name := dip.deviceDisplayName(serial)
 	heroArea := buildSmallHero(name, "● Disconnected", pillGray)

internal/ui/device_info_widgets.go

@@ -10,6 +10,7 @@ import (
 	"fyne.io/fyne/v2/theme"
 	"fyne.io/fyne/v2/widget"
 
+	"mirroid/internal/adb"
 	"mirroid/internal/icons"
 )
 
@@ -151,11 +152,11 @@ func buildInfoPill(icon fyne.Resource, text string, pillColor color.Color) fyne.
 	return container.New(&badgeLayout{padX: pillPadX, padY: badgePadY}, bg, row)
 }
 
-func batteryStatusColor(status string) color.Color {
-	switch strings.ToLower(strings.TrimSpace(status)) {
-	case "charging", "full":
+func batteryStatusColor(status adb.BatteryStatus) color.Color {
+	switch status {
+	case adb.BatteryStatusCharging, adb.BatteryStatusFull:
 		return pillGreen
-	case "discharging":
+	case adb.BatteryStatusDischarging:
 		return pillRed
 	default:
 		return pillGray