1
0
mirror of https://github.com/tw93/Mole.git synced 2026-02-12 05:18:59 +00:00

refactor: modernize Go code

This commit is contained in:
Oleksandr Redko
2026-01-06 11:52:05 +02:00
parent 62ef283943
commit 158af1e1ba
12 changed files with 55 additions and 119 deletions

View File

@@ -127,10 +127,7 @@ func animTick() tea.Cmd {
func animTickWithSpeed(cpuUsage float64) tea.Cmd {
// Higher CPU = faster animation.
interval := 300 - int(cpuUsage*2.5)
if interval < 50 {
interval = 50
}
interval := max(300-int(cpuUsage*2.5), 50)
return tea.Tick(time.Duration(interval)*time.Millisecond, func(time.Time) tea.Msg { return animTickMsg{} })
}

View File

@@ -68,11 +68,10 @@ func collectBatteries() (batts []BatteryStatus, err error) {
}
func parsePMSet(raw string, health string, cycles int, capacity int) []BatteryStatus {
lines := strings.Split(raw, "\n")
var out []BatteryStatus
var timeLeft string
for _, line := range lines {
for line := range strings.Lines(raw) {
// Time remaining.
if strings.Contains(line, "remaining") {
parts := strings.Fields(line)
@@ -128,8 +127,7 @@ func getCachedPowerData() (health string, cycles int, capacity int) {
return "", 0, 0
}
lines := strings.Split(out, "\n")
for _, line := range lines {
for line := range strings.Lines(out) {
lower := strings.ToLower(line)
if strings.Contains(lower, "cycle count") {
if _, after, found := strings.Cut(line, ":"); found {
@@ -183,8 +181,7 @@ func collectThermal() ThermalStatus {
// Fan info from cached system_profiler.
out := getSystemPowerOutput()
if out != "" {
lines := strings.Split(out, "\n")
for _, line := range lines {
for line := range strings.Lines(out) {
lower := strings.ToLower(line)
if strings.Contains(lower, "fan") && strings.Contains(lower, "speed") {
if _, after, found := strings.Cut(line, ":"); found {
@@ -200,8 +197,7 @@ func collectThermal() ThermalStatus {
ctxPower, cancelPower := context.WithTimeout(context.Background(), 500*time.Millisecond)
defer cancelPower()
if out, err := runCmd(ctxPower, "ioreg", "-rn", "AppleSmartBattery"); err == nil {
lines := strings.Split(out, "\n")
for _, line := range lines {
for line := range strings.Lines(out) {
line = strings.TrimSpace(line)
// Battery temperature ("Temperature" = 3055).

View File

@@ -68,13 +68,12 @@ func readBluetoothCTLDevices() ([]BluetoothDevice, error) {
}
func parseSPBluetooth(raw string) []BluetoothDevice {
lines := strings.Split(raw, "\n")
var devices []BluetoothDevice
var currentName string
var connected bool
var battery string
for _, line := range lines {
for line := range strings.Lines(raw) {
trim := strings.TrimSpace(line)
if len(trim) == 0 {
continue
@@ -112,10 +111,9 @@ func parseSPBluetooth(raw string) []BluetoothDevice {
}
func parseBluetoothctl(raw string) []BluetoothDevice {
lines := strings.Split(raw, "\n")
var devices []BluetoothDevice
current := BluetoothDevice{}
for _, line := range lines {
for line := range strings.Lines(raw) {
trim := strings.TrimSpace(line)
if strings.HasPrefix(trim, "Device ") {
if current.Name != "" {
@@ -123,8 +121,8 @@ func parseBluetoothctl(raw string) []BluetoothDevice {
}
current = BluetoothDevice{Name: strings.TrimPrefix(trim, "Device "), Connected: false}
}
if strings.HasPrefix(trim, "Name:") {
current.Name = strings.TrimSpace(strings.TrimPrefix(trim, "Name:"))
if after, ok := strings.CutPrefix(trim, "Name:"); ok {
current.Name = strings.TrimSpace(after)
}
if strings.HasPrefix(trim, "Connected:") {
current.Connected = strings.Contains(trim, "yes")

View File

@@ -156,7 +156,7 @@ func isExternalDisk(device string) (bool, error) {
found bool
external bool
)
for _, line := range strings.Split(out, "\n") {
for line := range strings.Lines(out) {
trim := strings.TrimSpace(line)
if strings.HasPrefix(trim, "Internal:") {
found = true

View File

@@ -61,9 +61,8 @@ func (c *Collector) collectGPU(now time.Time) ([]GPUStatus, error) {
return nil, err
}
lines := strings.Split(strings.TrimSpace(out), "\n")
var gpus []GPUStatus
for _, line := range lines {
for line := range strings.Lines(strings.TrimSpace(out)) {
fields := strings.Split(line, ",")
if len(fields) < 4 {
continue

View File

@@ -28,8 +28,7 @@ func collectHardware(totalRAM uint64, disks []DiskStatus) HardwareInfo {
out, err := runCmd(ctx, "system_profiler", "SPHardwareDataType")
if err == nil {
lines := strings.Split(out, "\n")
for _, line := range lines {
for line := range strings.Lines(out) {
lower := strings.ToLower(strings.TrimSpace(line))
// Prefer "Model Name" over "Model Identifier".
if strings.Contains(lower, "model name:") {
@@ -85,10 +84,9 @@ func collectHardware(totalRAM uint64, disks []DiskStatus) HardwareInfo {
// parseRefreshRate extracts the highest refresh rate from system_profiler display output.
func parseRefreshRate(output string) string {
lines := strings.Split(output, "\n")
maxHz := 0
for _, line := range lines {
for line := range strings.Lines(output) {
lower := strings.ToLower(line)
// Look for patterns like "@ 60Hz", "@ 60.00Hz", or "Refresh Rate: 120 Hz".
if strings.Contains(lower, "hz") {
@@ -100,8 +98,7 @@ func parseRefreshRate(output string) string {
}
continue
}
if strings.HasSuffix(field, "hz") {
numStr := strings.TrimSuffix(field, "hz")
if numStr, ok := strings.CutSuffix(field, "hz"); ok {
if numStr == "" && i > 0 {
numStr = fields[i-1]
}

View File

@@ -66,10 +66,7 @@ func getMoleFrame(animFrame int, termWidth int) string {
body := moleBody[bodyIdx]
moleWidth := 15
maxPos := termWidth - moleWidth
if maxPos < 0 {
maxPos = 0
}
maxPos := max(termWidth-moleWidth, 0)
cycleLength := maxPos * 2
if cycleLength == 0 {
@@ -197,10 +194,7 @@ func renderCPUCard(cpu CPUStatus) cardData {
}
sort.Slice(cores, func(i, j int) bool { return cores[i].val > cores[j].val })
maxCores := 3
if len(cores) < maxCores {
maxCores = len(cores)
}
maxCores := min(len(cores), 3)
for i := 0; i < maxCores; i++ {
c := cores[i]
lines = append(lines, fmt.Sprintf("Core%-2d %s %5.1f%%", c.idx+1, progressBar(c.val), c.val))
@@ -356,10 +350,7 @@ func formatDiskLine(label string, d DiskStatus) string {
}
func ioBar(rate float64) string {
filled := int(rate / 10.0)
if filled > 5 {
filled = 5
}
filled := min(int(rate/10.0), 5)
if filled < 0 {
filled = 0
}
@@ -391,10 +382,7 @@ func renderProcessCard(procs []ProcessInfo) cardData {
}
func miniBar(percent float64) string {
filled := int(percent / 20)
if filled > 5 {
filled = 5
}
filled := min(int(percent/20), 5)
if filled < 0 {
filled = 0
}
@@ -437,10 +425,7 @@ func renderNetworkCard(netStats []NetworkStatus, proxy ProxyStatus) cardData {
}
func netBar(rate float64) string {
filled := int(rate / 2.0)
if filled > 5 {
filled = 5
}
filled := min(int(rate/2.0), 5)
if filled < 0 {
filled = 0
}
@@ -551,10 +536,7 @@ func renderSensorsCard(sensors []SensorReading) cardData {
func renderCard(data cardData, width int, height int) string {
titleText := data.icon + " " + data.title
lineLen := width - lipgloss.Width(titleText) - 2
if lineLen < 4 {
lineLen = 4
}
lineLen := max(width-lipgloss.Width(titleText)-2, 4)
header := titleStyle.Render(titleText) + " " + lineStyle.Render(strings.Repeat("╌", lineLen))
content := header + "\n" + strings.Join(data.lines, "\n")
@@ -576,7 +558,7 @@ func progressBar(percent float64) string {
filled := int(percent / 100 * float64(total))
var builder strings.Builder
for i := 0; i < total; i++ {
for i := range total {
if i < filled {
builder.WriteString("█")
} else {
@@ -597,7 +579,7 @@ func batteryProgressBar(percent float64) string {
filled := int(percent / 100 * float64(total))
var builder strings.Builder
for i := 0; i < total; i++ {
for i := range total {
if i < filled {
builder.WriteString("█")
} else {