tyler.durden/auto-cpufreq
1
0
Fork 0
mirror of https://github.com/AdnanHodzic/auto-cpufreq.git synced 2025-07-26 07:04:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the error linked to the path of the battery and generalize the solution (improve battery path detection) (#847)

Browse Source
This commit is contained in:
Universel 2025-05-27 18:32:55 +02:00 committed by GitHub
parent eaf8dd1bab
commit a9a76de6ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
auto_cpufreq/modules/system_info.py
View File

@ -15,6 +15,7 @@ from auto_cpufreq.globals import (
IS_INSTALLED_WITH_SNAP, IS_INSTALLED_WITH_SNAP,
POWER_SUPPLY_DIR, POWER_SUPPLY_DIR,
) )
from typing import Optional
@dataclass @dataclass
@ -213,78 +214,81 @@ class SystemInfo:
except Exception as e: except Exception as e:
return None, None return None, None
@staticmethod
def read_file(path: str) -> Optional[str]:
try:
with open(path, "r") as f:
return f.read().strip()
except (FileNotFoundError, OSError):
return None
@staticmethod
def get_battery_path() -> Optional[str]:
try:
for entry in os.listdir(POWER_SUPPLY_DIR):
path = os.path.join(POWER_SUPPLY_DIR, entry)
type_path = os.path.join(path, "type")
if os.path.isfile(type_path):
content = SystemInfo.read_file(type_path)
if content and content.lower() == "battery":
return path
except Exception:
return None
return None
@staticmethod @staticmethod
def battery_info() -> BatteryInfo: def battery_info() -> BatteryInfo:
def read_file(path: str) -> str | None:
try:
with open(path, "r") as f:
return f.read().strip()
except FileNotFoundError:
return None
power_supplies: List[str] = sorted(os.listdir(POWER_SUPPLY_DIR)) battery_path = SystemInfo.get_battery_path()
if not power_supplies: # By default, AC is considered connected if no battery is detected
return BatteryInfo( is_ac_plugged = True
is_charging=None,
is_ac_plugged=True,
charging_start_threshold=None,
charging_stop_threshold=None,
battery_level=None,
power_consumption=None,
)
is_ac_plugged = None
is_charging = None is_charging = None
battery_level = None battery_level = None
power_consumption = None power_consumption = None
charging_start_threshold = None charging_start_threshold = None
charging_stop_threshold = None charging_stop_threshold = None
for supply in power_supplies: if not battery_path:
if any(item in supply for item in get_power_supply_ignore_list()):
continue
supply_type: str | None = read_file(f"{POWER_SUPPLY_DIR}{supply}/type") # No battery detected
return BatteryInfo(
is_charging=None,
is_ac_plugged=is_ac_plugged,
charging_start_threshold=None,
charging_stop_threshold=None,
battery_level=None,
power_consumption=None,
)
# Reading AC info (Hands)
for supply in os.listdir(POWER_SUPPLY_DIR):
supply_path = os.path.join(POWER_SUPPLY_DIR, supply)
supply_type = SystemInfo.read_file(os.path.join(supply_path, "type"))
if supply_type == "Mains": if supply_type == "Mains":
power_supply_online: str | None = read_file( online = SystemInfo.read_file(os.path.join(supply_path, "online"))
f"{POWER_SUPPLY_DIR}{supply}/online" is_ac_plugged = online == "1"
)
is_ac_plugged = power_supply_online == "1"
elif supply_type == "Battery": # Reading battery information
battery_status: str | None = read_file( battery_status = SystemInfo.read_file(os.path.join(battery_path, "status"))
f"{POWER_SUPPLY_DIR}{supply}/status" battery_capacity = SystemInfo.read_file(os.path.join(battery_path, "capacity"))
) energy_rate = (
battery_percentage: str | None = read_file( SystemInfo.read_file(os.path.join(battery_path, "power_now"))
f"{POWER_SUPPLY_DIR}{supply}/capacity" or SystemInfo.read_file(os.path.join(battery_path, "current_now"))
) )
energy_rate: str | None = read_file( charge_start_threshold = SystemInfo.read_file(os.path.join(battery_path, "charge_start_threshold"))
f"{POWER_SUPPLY_DIR}{supply}/power_now" charge_stop_threshold = SystemInfo.read_file(os.path.join(battery_path, "charge_stop_threshold"))
)
charge_start_threshold: str | None = read_file(
f"{POWER_SUPPLY_DIR}{supply}/charge_start_threshold"
)
charge_stop_threshold: str | None = read_file(
f"{POWER_SUPPLY_DIR}{supply}/charge_stop_threshold"
)
is_charging: bool | None = ( is_charging = battery_status.lower() == "charging" if battery_status else None
battery_status.lower() == "charging" if battery_status else None battery_level = int(battery_capacity) if battery_capacity and battery_capacity.isdigit() else None
) power_consumption = float(energy_rate) / 1_000_000 if energy_rate \
battery_level: int | None = ( and energy_rate.replace('.', '', 1).isdigit() else None
int(battery_percentage) if battery_percentage else None charging_start_threshold = int(charge_start_threshold) if charge_start_threshold \
) and charge_start_threshold.isdigit() else None
power_consumption: float | None = ( charging_stop_threshold = int(charge_stop_threshold) if charge_stop_threshold \
float(energy_rate) / 1_000_000 if energy_rate else None and charge_stop_threshold.isdigit() else None
)
charging_start_threshold: int | None = (
int(charge_start_threshold) if charge_start_threshold else None
)
charging_stop_threshold: int | None = (
int(charge_stop_threshold) if charge_stop_threshold else None
)
return BatteryInfo( return BatteryInfo(
is_charging=is_charging, is_charging=is_charging,