From 0134da5e505f99560fbe405301a768294d557215 Mon Sep 17 00:00:00 2001 From: purple wazard Date: Mon, 15 Apr 2024 09:03:58 -0500 Subject: [PATCH] added warnings to laptop_acpi --- auto_cpufreq/battery_scripts/battery.py | 2 -- auto_cpufreq/battery_scripts/ideapad_acpi.py | 22 ++++++++++++-------- auto_cpufreq/battery_scripts/thinkpad.py | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/auto_cpufreq/battery_scripts/battery.py b/auto_cpufreq/battery_scripts/battery.py index 904aa63..dad2891 100644 --- a/auto_cpufreq/battery_scripts/battery.py +++ b/auto_cpufreq/battery_scripts/battery.py @@ -42,5 +42,3 @@ def battery_get_thresholds(): else: return - - diff --git a/auto_cpufreq/battery_scripts/ideapad_acpi.py b/auto_cpufreq/battery_scripts/ideapad_acpi.py index ca5f928..7ac3afa 100644 --- a/auto_cpufreq/battery_scripts/ideapad_acpi.py +++ b/auto_cpufreq/battery_scripts/ideapad_acpi.py @@ -5,11 +5,12 @@ from auto_cpufreq.core import get_config def set_battery(value, mode, bat): - try: + path = f"/sys/class/power_supply/BAT{bat}/charge_{mode}_threshold" + if os.path.isfile(path): subprocess.check_output( - f"echo {value} | tee /sys/class/power_supply/BAT{bat}/charge_{mode}_threshold", shell=True, text=True) - except Exception as e: - print(f"Error writing to file_path: {e}") + f"echo {value} | tee {path}", shell=True, text=True) + else: + print(f"WARNING: {path} does NOT exist") def get_threshold_value(mode): @@ -33,12 +34,15 @@ def ideapad_acpi_setup(): if not config["battery"]["enable_thresholds"] == "true": return - battery_count = len([name for name in os.listdir( - "/sys/class/power_supply/") if name.startswith('BAT')]) + if os.path.exists("/sys/class/power_supply/"): + battery_count = len([name for name in os.listdir( + "/sys/class/power_supply/") if name.startswith('BAT')]) - for bat in range(battery_count): - set_battery(get_threshold_value("start"), "start", bat) - set_battery(get_threshold_value("stop"), "stop", bat) + for bat in range(battery_count): + set_battery(get_threshold_value("start"), "start", bat) + set_battery(get_threshold_value("stop"), "stop", bat) + else: + print("WARNING: could NOT access /sys/class/power_supply") def ideapad_acpi_print_thresholds(): diff --git a/auto_cpufreq/battery_scripts/thinkpad.py b/auto_cpufreq/battery_scripts/thinkpad.py index b7c0e30..3a39c7b 100644 --- a/auto_cpufreq/battery_scripts/thinkpad.py +++ b/auto_cpufreq/battery_scripts/thinkpad.py @@ -34,7 +34,7 @@ def thinkpad_setup(): if not config["battery"]["enable_thresholds"] == "true": return - if os.path.isfile("/sys/class/power_supply/"): + if os.path.exists("/sys/class/power_supply/"): battery_count = len([name for name in os.listdir( "/sys/class/power_supply/") if name.startswith('BAT')])