mirror of
https://github.com/tw93/Mole.git
synced 2026-02-15 05:15:10 +00:00
add cpu temp display and optimize user check
This commit is contained in:
@@ -106,7 +106,7 @@ perform_purge() {
|
||||
fi
|
||||
|
||||
# Calculate how much to show on each side
|
||||
local side_len=$(( (max_len - 3) / 2 ))
|
||||
local side_len=$(((max_len - 3) / 2))
|
||||
local start="${path:0:$side_len}"
|
||||
local end="${path: -$side_len}"
|
||||
echo "${start}...${end}"
|
||||
@@ -126,7 +126,7 @@ perform_purge() {
|
||||
|
||||
# Get current spinner character
|
||||
local spin_char="${spinner_chars:$spinner_idx:1}"
|
||||
spinner_idx=$(( (spinner_idx + 1) % ${#spinner_chars} ))
|
||||
spinner_idx=$(((spinner_idx + 1) % ${#spinner_chars}))
|
||||
|
||||
# Show title on first line, spinner and scanning info on second line
|
||||
if [[ -n "$display_path" ]]; then
|
||||
|
||||
@@ -203,7 +203,7 @@ func getScoreStyle(score int) lipgloss.Style {
|
||||
|
||||
func buildCards(m MetricsSnapshot, _ int) []cardData {
|
||||
cards := []cardData{
|
||||
renderCPUCard(m.CPU),
|
||||
renderCPUCard(m.CPU, m.Thermal),
|
||||
renderMemoryCard(m.Memory),
|
||||
renderDiskCard(m.Disks, m.DiskIO),
|
||||
renderBatteryCard(m.Batteries, m.Thermal),
|
||||
@@ -225,9 +225,18 @@ func hasSensorData(sensors []SensorReading) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func renderCPUCard(cpu CPUStatus) cardData {
|
||||
func renderCPUCard(cpu CPUStatus, thermal ThermalStatus) cardData {
|
||||
var lines []string
|
||||
lines = append(lines, fmt.Sprintf("Total %s %5.1f%%", progressBar(cpu.Usage), cpu.Usage))
|
||||
|
||||
// Line 1: Usage + Temp (Format: 15% @ 30.4°C)
|
||||
usageBar := progressBar(cpu.Usage)
|
||||
|
||||
headerText := fmt.Sprintf("%5.1f%%", cpu.Usage)
|
||||
if thermal.CPUTemp > 0 {
|
||||
headerText += fmt.Sprintf(" @ %s°C", colorizeTemp(thermal.CPUTemp))
|
||||
}
|
||||
|
||||
lines = append(lines, fmt.Sprintf("Total %s %s", usageBar, headerText))
|
||||
|
||||
if cpu.PerCoreEstimated {
|
||||
lines = append(lines, subtleStyle.Render("Per-core data unavailable (using averaged load)"))
|
||||
@@ -527,12 +536,7 @@ func renderBatteryCard(batts []BatteryStatus, thermal ThermalStatus) cardData {
|
||||
}
|
||||
|
||||
if thermal.CPUTemp > 0 {
|
||||
tempText := fmt.Sprintf("%.0f°C", thermal.CPUTemp)
|
||||
if thermal.CPUTemp > 80 {
|
||||
tempText = dangerStyle.Render(tempText)
|
||||
} else if thermal.CPUTemp > 60 {
|
||||
tempText = warnStyle.Render(tempText)
|
||||
}
|
||||
tempText := colorizeTemp(thermal.CPUTemp) + "°C" // Reuse common color logic
|
||||
healthParts = append(healthParts, tempText)
|
||||
}
|
||||
|
||||
@@ -641,12 +645,12 @@ func colorizeBattery(percent float64, s string) string {
|
||||
|
||||
func colorizeTemp(t float64) string {
|
||||
switch {
|
||||
case t >= 85:
|
||||
case t >= 76:
|
||||
return dangerStyle.Render(fmt.Sprintf("%.1f", t))
|
||||
case t >= 70:
|
||||
case t >= 56:
|
||||
return warnStyle.Render(fmt.Sprintf("%.1f", t))
|
||||
default:
|
||||
return subtleStyle.Render(fmt.Sprintf("%.1f", t))
|
||||
return okStyle.Render(fmt.Sprintf("%.1f", t))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -375,7 +375,6 @@ scan_purge_targets() {
|
||||
while IFS= read -r item; do
|
||||
# Check if we should abort (scanning file removed by Ctrl+C)
|
||||
if [[ ! -f "$stats_dir/purge_scanning" ]]; then
|
||||
rm -f "$output_file.raw"
|
||||
return
|
||||
fi
|
||||
|
||||
@@ -413,7 +412,6 @@ scan_purge_targets() {
|
||||
while IFS= read -r item; do
|
||||
# Check if we should abort (scanning file removed by Ctrl+C)
|
||||
if [[ ! -f "$stats_dir/purge_scanning" ]]; then
|
||||
rm -f "$output_file.raw"
|
||||
return
|
||||
fi
|
||||
|
||||
|
||||
@@ -260,11 +260,20 @@ get_user_home() {
|
||||
}
|
||||
|
||||
get_invoking_user() {
|
||||
if [[ -n "${SUDO_USER:-}" && "${SUDO_USER:-}" != "root" ]]; then
|
||||
echo "$SUDO_USER"
|
||||
if [[ -n "${_MOLE_INVOKING_USER_CACHE:-}" ]]; then
|
||||
echo "$_MOLE_INVOKING_USER_CACHE"
|
||||
return 0
|
||||
fi
|
||||
echo "${USER:-}"
|
||||
|
||||
local user
|
||||
if [[ -n "${SUDO_USER:-}" && "${SUDO_USER:-}" != "root" ]]; then
|
||||
user="$SUDO_USER"
|
||||
else
|
||||
user="${USER:-}"
|
||||
fi
|
||||
|
||||
export _MOLE_INVOKING_USER_CACHE="$user"
|
||||
echo "$user"
|
||||
}
|
||||
|
||||
get_invoking_uid() {
|
||||
|
||||
@@ -117,7 +117,7 @@ setup() {
|
||||
|
||||
elapsed=$(( (end - start) / 1000000 ))
|
||||
|
||||
[ "$elapsed" -lt 200 ]
|
||||
[ "$elapsed" -lt 500 ]
|
||||
}
|
||||
|
||||
@test "get_darwin_major caches correctly" {
|
||||
|
||||
Reference in New Issue
Block a user