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

Remove needs_confirmation & Readme update

Browse Source
This commit is contained in:
Adnan Hodzic 2025-04-13 23:01:00 +02:00
parent f9b9fe42c9
commit b6493edc70
2 changed files with 96 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -21,11 +21,11 @@ If you're having a problem with auto-cpufreq, before ([submitting an issue](http
Example of auto-cpufreq GUI (available >= v2.0) Example of auto-cpufreq GUI (available >= v2.0)
<img src="https://github.com/user-attachments/assets/9c7715c4-16b7-4a5c-86be-4c390276d9e8" width="480" alt="Example of auto-cpufreq desktop entry (icon)" /> <img src="https://github.com/user-attachments/assets/4b83b67c-8c1e-4ef0-ad2d-ffc1b9dc16de" width="480" alt="Example of auto-cpufreq GUI (available >= v2.0)" />
Example of `auto-cpufreq --stats` CLI output Example of `auto-cpufreq --stats` CLI output
<img src="https://github.com/user-attachments/assets/9c7715c4-16b7-4a5c-86be-4c390276d9e8" width="480" alt="Example of auto-cpufreq desktop entry (icon)"/> <img src="https://github.com/user-attachments/assets/9c7715c4-16b7-4a5c-86be-4c390276d9e8" width="480" alt="Example of auto-cpufreq CLI output"/>
## Looking for developers and co-maintainers ## Looking for developers and co-maintainers

234
auto_cpufreq/bin/auto_cpufreq.py
View File

@ -12,7 +12,7 @@ from shutil import rmtree
from auto_cpufreq.battery_scripts.battery import * from auto_cpufreq.battery_scripts.battery import *
from auto_cpufreq.config.config import config as conf, find_config_file from auto_cpufreq.config.config import config as conf, find_config_file
from auto_cpufreq.core import * from auto_cpufreq.core import *
from auto_cpufreq.globals import GITHUB, IS_INSTALLED_WITH_AUR, IS_INSTALLED_WITH_SNAP, SNAP_DAEMON_CHECK from auto_cpufreq.globals import GITHUB, IS_INSTALLED_WITH_AUR, IS_INSTALLED_WITH_SNAP
from auto_cpufreq.modules.system_monitor import ViewType, SystemMonitor from auto_cpufreq.modules.system_monitor import ViewType, SystemMonitor
# import everything from power_helper, including bluetooth_disable and bluetooth_enable # import everything from power_helper, including bluetooth_disable and bluetooth_enable
from auto_cpufreq.power_helper import * from auto_cpufreq.power_helper import *
@ -35,9 +35,7 @@ from threading import Thread
@click.option("--version", is_flag=True, help="Show currently installed version") @click.option("--version", is_flag=True, help="Show currently installed version")
@click.option("--donate", is_flag=True, help="Support the project") @click.option("--donate", is_flag=True, help="Support the project")
def main(monitor, live, daemon, install, update, remove, force, config, stats, get_state, def main(monitor, live, daemon, install, update, remove, force, config, stats, get_state,
bluetooth_boot_off, bluetooth_boot_off, bluetooth_boot_on, debug, version, donate):
bluetooth_boot_on,
debug, version, donate):
# display info if config file is used # display info if config file is used
config_path = find_config_file(config) config_path = find_config_file(config)
conf.set_path(config_path) conf.set_path(config_path)
@ -45,25 +43,22 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
if conf.has_config(): if conf.has_config():
print("\nUsing settings defined in " + config_path + " file") print("\nUsing settings defined in " + config_path + " file")
# Check for empty arguments first if len(sys.argv) == 1:
is_empty_run = len(sys.argv) == 1
# set governor override unless None or invalid, but not if it's an empty run
if not is_empty_run and force is not None:
not_running_daemon_check()
root_check()
set_override(force)
# Handle empty run after potential force override is processed or skipped
if is_empty_run:
print("\n" + "-" * 32 + " auto-cpufreq " + "-" * 33 + "\n") print("\n" + "-" * 32 + " auto-cpufreq " + "-" * 33 + "\n")
print("Automatic CPU speed & power optimizer for Linux") print("Automatic CPU speed & power optimizer for Linux")
print("\nExample usage:\nauto-cpufreq --monitor") print("\nExample usage:\nauto-cpufreq --monitor")
print("\n-----\n") print("\n-----\n")
run(["auto-cpufreq", "--help"]) run(["auto-cpufreq", "--help"])
footer() footer()
# Handle other flags if it's not an empty run
else: else:
# set governor override unless None or invalid
if force is not None:
not_running_daemon_check()
root_check() # Calling root_check before set_override as it will require sudo access
set_override(force) # Calling set override, only if force has some values
if monitor: if monitor:
root_check() root_check()
battery_setup() battery_setup()
@ -75,21 +70,15 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
gnome_power_detect() gnome_power_detect()
tlp_service_detect() tlp_service_detect()
# Determine if confirmation is needed if IS_INSTALLED_WITH_SNAP or tlp_stat_exists or (systemctl_exists and not bool(gnome_power_status)):
needs_confirmation = IS_INSTALLED_WITH_SNAP or tlp_stat_exists
# Check gnome_power_status only if relevant variables exist
if not IS_INSTALLED_WITH_SNAP and 'systemctl_exists' in globals() and systemctl_exists and 'gnome_power_status' in locals() and not bool(gnome_power_status):
needs_confirmation = True
if needs_confirmation:
try: try:
input("press Enter to continue or Ctrl + c to exit...") input("press Enter to continue or Ctrl + c to exit...")
except KeyboardInterrupt: except KeyboardInterrupt:
conf.notifier.stop() conf.notifier.stop()
sys.exit(0) sys.exit(0)
monitor_instance = SystemMonitor(suggestion=True, type=ViewType.MONITOR) monitor = SystemMonitor(suggestion=True, type=ViewType.MONITOR)
monitor_instance.run(on_quit=conf.notifier.stop) monitor.run(on_quit=conf.notifier.stop)
elif live: elif live:
root_check() root_check()
battery_setup() battery_setup()
@ -103,13 +92,7 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
tuned_stop_live() tuned_stop_live()
tlp_service_detect() tlp_service_detect()
# Determine if confirmation is needed if IS_INSTALLED_WITH_SNAP or tlp_stat_exists or (systemctl_exists and not bool(gnome_power_status)):
needs_confirmation = IS_INSTALLED_WITH_SNAP or tlp_stat_exists
# Check gnome_power_status only if relevant variables exist
if not IS_INSTALLED_WITH_SNAP and 'systemctl_exists' in globals() and systemctl_exists and 'gnome_power_status' in locals() and not bool(gnome_power_status):
needs_confirmation = True
if needs_confirmation:
try: try:
input("press Enter to continue or Ctrl + c to exit...") input("press Enter to continue or Ctrl + c to exit...")
except KeyboardInterrupt: except KeyboardInterrupt:
@ -118,19 +101,18 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
cpufreqctl() cpufreqctl()
def live_daemon(): def live_daemon():
# Redirect stdout to suppress prints
class NullWriter: class NullWriter:
def write(self, _): pass def write(self, _): pass
def flush(self): pass def flush(self): pass
original_stdout = sys.stdout
try: try:
sys.stdout = NullWriter() sys.stdout = NullWriter()
while True: while True:
time.sleep(1) time.sleep(1)
set_autofreq() set_autofreq()
except Exception as e: # Catch specific exceptions if possible except:
print(f"Error in live daemon thread: {e}", file=original_stdout) # Log errors pass
finally:
sys.stdout = original_stdout # Ensure stdout is restored
def live_daemon_off(): def live_daemon_off():
gnome_power_start_live() gnome_power_start_live()
@ -141,12 +123,12 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
thread = Thread(target=live_daemon, daemon=True) thread = Thread(target=live_daemon, daemon=True)
thread.start() thread.start()
monitor_instance = SystemMonitor(type=ViewType.LIVE) monitor = SystemMonitor(type=ViewType.LIVE)
monitor_instance.run(on_quit=live_daemon_off) monitor.run(on_quit=live_daemon_off)
elif daemon: elif daemon:
config_info_dialog() config_info_dialog()
root_check() root_check()
file_stats() # This function from core.py likely uses the stats paths internally file_stats()
if IS_INSTALLED_WITH_SNAP and SNAP_DAEMON_CHECK == "enabled": if IS_INSTALLED_WITH_SNAP and SNAP_DAEMON_CHECK == "enabled":
gnome_power_detect_snap() gnome_power_detect_snap()
tlp_service_detect_snap() tlp_service_detect_snap()
@ -155,142 +137,83 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
tlp_service_detect() tlp_service_detect()
battery_setup() battery_setup()
conf.notifier.start() conf.notifier.start()
print("Starting auto-cpufreq daemon...") # Add startup message while True:
try: try:
# Initial setup before loop footer()
gov_check() gov_check()
cpufreqctl() cpufreqctl()
distro_info() # Show info once on start distro_info()
sysinfo() # Show info once on start sysinfo()
while True:
set_autofreq() set_autofreq()
time.sleep(2) # Use simple sleep instead of countdown countdown(2)
except KeyboardInterrupt: except KeyboardInterrupt: break
print("\nDaemon interrupted. Restoring settings...")
finally: # Ensure cleanup happens
conf.notifier.stop() conf.notifier.stop()
cpufreqctl_restore() # Restore system state when daemon stops
footer()
elif install: elif install:
root_check() root_check()
if IS_INSTALLED_WITH_SNAP: if IS_INSTALLED_WITH_SNAP:
running_daemon_check() running_daemon_check()
gnome_power_detect_snap() gnome_power_detect_snap()
tlp_service_detect_snap() tlp_service_detect_snap()
bluetooth_notif_snap() # Warn about bluetooth boot setting bluetooth_notif_snap()
gov_check() gov_check()
run("snapctl set daemon=enabled", shell=True, check=True) run("snapctl set daemon=enabled", shell=True)
run("snapctl start --enable auto-cpufreq", shell=True, check=True) run("snapctl start --enable auto-cpufreq", shell=True)
else: else:
running_daemon_check() running_daemon_check()
gov_check() gov_check()
deploy_daemon() # This function from core.py likely uses stats paths deploy_daemon()
deploy_complete_msg() deploy_complete_msg()
elif update: elif update:
root_check() root_check()
custom_dir = "/opt/auto-cpufreq/source" custom_dir = "/opt/auto-cpufreq/source"
update_flag_present = False
args_to_remove = []
# Simplified update argument parsing
if "--update" in sys.argv:
update_flag_present = True
args_to_remove.append("--update")
# Simple check if next arg exists and isn't another flag
idx = sys.argv.index("--update")
if idx + 1 < len(sys.argv) and not sys.argv[idx+1].startswith('--'):
custom_dir = sys.argv[idx+1]
args_to_remove.append(custom_dir)
else:
for arg in sys.argv: for arg in sys.argv:
if arg.startswith("--update="): if arg.startswith("--update="):
update_flag_present = True custom_dir = arg.split("=")[1]
custom_dir = arg.split("=", 1)[1] sys.argv.remove(arg)
args_to_remove.append(arg)
break # Found it, no need to check further
# Remove the parsed arguments if "--update" in sys.argv:
# This prevents them from being misinterpreted later if code relies on sys.argv directly update = True
_original_argv = sys.argv[:] # Make a copy if needed elsewhere sys.argv.remove("--update")
sys.argv = [arg for arg in sys.argv if arg not in args_to_remove] if len(sys.argv) == 2: custom_dir = sys.argv[1]
if update_flag_present:
if IS_INSTALLED_WITH_SNAP: if IS_INSTALLED_WITH_SNAP:
print("Detected auto-cpufreq was installed using snap") print("Detected auto-cpufreq was installed using snap")
# refresh snap directly using this command
# path wont work in this case
print("Please update using snap package manager, i.e: `sudo snap refresh auto-cpufreq`.") print("Please update using snap package manager, i.e: `sudo snap refresh auto-cpufreq`.")
elif IS_INSTALLED_WITH_AUR: #check for AUR
print("Arch-based distribution with AUR support detected. Please refresh auto-cpufreq using your AUR helper.") elif IS_INSTALLED_WITH_AUR: print("Arch-based distribution with AUR support detected. Please refresh auto-cpufreq using your AUR helper.")
else: else:
is_new_update = check_for_update() is_new_update = check_for_update()
if not is_new_update: return if not is_new_update: return
ans = input(f"Update source will be placed in '{custom_dir}'.\nDo you want to update auto-cpufreq to the latest release? [Y/n]: ").strip().lower() ans = input("Do you want to update auto-cpufreq to the latest release? [Y/n]: ").strip().lower()
if not os.path.exists(custom_dir): os.makedirs(custom_dir)
if os.path.exists(os.path.join(custom_dir, "auto-cpufreq")): rmtree(os.path.join(custom_dir, "auto-cpufreq"))
if ans in ['', 'y', 'yes']: if ans in ['', 'y', 'yes']:
# Ensure directory exists remove_daemon()
os.makedirs(custom_dir, exist_ok=True) remove_complete_msg()
auto_cpufreq_subdir = os.path.join(custom_dir, "auto-cpufreq") new_update(custom_dir)
if os.path.isdir(auto_cpufreq_subdir): print("enabling daemon")
print(f"Removing existing source sub-directory: {auto_cpufreq_subdir}") run(["auto-cpufreq", "--install"])
try: print("auto-cpufreq is installed with the latest version")
rmtree(auto_cpufreq_subdir) run(["auto-cpufreq", "--version"])
except OSError as e: else: print("Aborted")
print(f"Error removing directory {auto_cpufreq_subdir}: {e}")
print("Update aborted.")
return # Stop update if cleanup fails
print("Removing existing installation (if any)...")
remove_daemon() # Call remove logic first
# remove_complete_msg() # Optional message
print(f"Downloading new version to {custom_dir}...")
new_update(custom_dir) # Download the update
print("Running installer for the updated version...")
# Use subprocess.run to call the install command of the main script
install_result = run([_original_argv[0], "--install"], check=False) # Use original script path
if install_result.returncode == 0:
print("\nUpdate and installation successful.")
run([_original_argv[0], "--version"])
else:
print("\nError during installation after update. Please check messages above.")
else:
print("Update aborted.")
# else: # If neither --update nor --update= was found
# Potentially show help or an error if update was expected
# print("Update command not used correctly.")
# run([_original_argv[0], "--help"])
elif remove: elif remove:
root_check() root_check()
if IS_INSTALLED_WITH_SNAP: if IS_INSTALLED_WITH_SNAP:
run("snapctl stop auto-cpufreq", shell=True, check=False) run("snapctl set daemon=disabled", shell=True)
run("snapctl set daemon=disabled", shell=True, check=True) run("snapctl stop --disable auto-cpufreq", shell=True)
# run("snapctl disable auto-cpufreq", shell=True, check=True) # Deprecated? Use stop --disable if auto_cpufreq_stats_path.exists():
run("snapctl stop --disable auto-cpufreq", shell=True, check=True) # Correct way to stop and disable if auto_cpufreq_stats_file is not None:
# Check if stats path/file variables exist before using them
# These should be available from 'from auto_cpufreq.core import *'
if 'auto_cpufreq_stats_path' in globals() and auto_cpufreq_stats_path.exists():
# Close file handle safely
if 'auto_cpufreq_stats_file' in globals() and auto_cpufreq_stats_file is not None:
if not auto_cpufreq_stats_file.closed:
try:
auto_cpufreq_stats_file.close() auto_cpufreq_stats_file.close()
except Exception as e:
print(f"Warning: Could not close stats file handle: {e}")
# Set to None after closing or if already closed
# auto_cpufreq_stats_file = None # Modifying imported var might be tricky
# Remove the file
try:
auto_cpufreq_stats_path.unlink() auto_cpufreq_stats_path.unlink()
print(f"Removed stats file: {auto_cpufreq_stats_path}") # ToDo:
except OSError as e: # {the following snippet also used in --update, update it there too(if required)}
print(f"Warning: Could not remove stats file {auto_cpufreq_stats_path}: {e}") # * undo bluetooth boot disable
# Reminders
gnome_power_rm_reminder_snap() gnome_power_rm_reminder_snap()
bluetooth_on_notif_snap() else: remove_daemon()
else:
remove_daemon() # Defined in core.py, handles service removal and cleanup including stats file
remove_complete_msg() remove_complete_msg()
elif stats: elif stats:
not_running_daemon_check() not_running_daemon_check()
@ -302,26 +225,19 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
gnome_power_detect() gnome_power_detect()
tlp_service_detect() tlp_service_detect()
# Determine if confirmation is needed if IS_INSTALLED_WITH_SNAP or tlp_stat_exists or (systemctl_exists and not bool(gnome_power_status)):
needs_confirmation = IS_INSTALLED_WITH_SNAP or tlp_stat_exists
# Check gnome_power_status only if relevant variables exist
if not IS_INSTALLED_WITH_SNAP and 'systemctl_exists' in globals() and systemctl_exists and 'gnome_power_status' in locals() and not bool(gnome_power_status):
needs_confirmation = True
if needs_confirmation:
try: try:
input("press Enter to continue or Ctrl + c to exit...") input("press Enter to continue or Ctrl + c to exit...")
except KeyboardInterrupt: except KeyboardInterrupt:
# conf.notifier might not be started for stats mode conf.notifier.stop()
sys.exit(0) sys.exit(0)
monitor_instance = SystemMonitor(type=ViewType.STATS) monitor = SystemMonitor(type=ViewType.STATS)
monitor_instance.run() monitor.run()
elif get_state: elif get_state:
not_running_daemon_check() not_running_daemon_check()
override = get_override() override = get_override()
print(override) print(override)
elif bluetooth_boot_off: elif bluetooth_boot_off:
if IS_INSTALLED_WITH_SNAP: if IS_INSTALLED_WITH_SNAP:
footer() footer()
@ -343,6 +259,7 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
bluetooth_enable() bluetooth_enable()
footer() footer()
elif debug: elif debug:
# ToDo: add status of GNOME Power Profile service status
config_info_dialog() config_info_dialog()
root_check() root_check()
battery_get_thresholds() battery_get_thresholds()
@ -356,11 +273,7 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
python_info() python_info()
print() print()
device_info() device_info()
# Check charging status function exists and call it
if 'charging' in globals() and callable(charging):
print(f"Battery is: {'' if charging() else 'dis'}charging") print(f"Battery is: {'' if charging() else 'dis'}charging")
else:
print("Battery status unavailable.")
print() print()
app_res_use() app_res_use()
get_load() get_load()
@ -378,16 +291,5 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
print("Show your appreciation by donating!") print("Show your appreciation by donating!")
print(GITHUB+"#donate") print(GITHUB+"#donate")
footer() footer()
# else: # Optional: Handle unrecognized flags if not caught by click
# print(f"Error: Unrecognized arguments.")
# run([_original_argv[0], "--help"])
if __name__ == "__main__": main()
if __name__ == "__main__":
try:
import click
except ImportError:
print("Error: Required dependency 'click' not found. Please install it (e.g., pip install click)")
sys.exit(1)
# Call main entry point
main()