Rework config and reload config on file change/creation/deletion

auto_cpufreq/battery_scripts/battery.py

@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
 import subprocess
-from auto_cpufreq.core import get_config, root_check
+from auto_cpufreq.core import root_check
 
 from auto_cpufreq.battery_scripts.thinkpad import *
 from auto_cpufreq.battery_scripts.ideapad import *
+from auto_cpufreq.utils.config import config
 
 
 def lsmod(module):
@@ -16,7 +17,7 @@ def lsmod(module):
 
 
 def battery_start_threshold():
-    conf = get_config()
+    conf = config.get_config()
     if conf.has_option("battery", "start_threshold"):
         start_threshold = conf["battery"]["start_threshold"]
         return int(start_threshold)
@@ -25,7 +26,7 @@ def battery_start_threshold():
 
 
 def battery_stop_threshold():
-    conf = get_config()
+    conf = config.get_config()
     if conf.has_option("battery", "stop_threshold"):
         stop_threshold = conf["battery"]["stop_threshold"]
         return int(stop_threshold)
@@ -35,7 +36,7 @@ def battery_stop_threshold():
 
 def battery_setup():
     root_check()
-    conf = get_config()
+    conf = config.get_config()
     if conf.has_option("battery", "enable_thresholds"):
         if conf["battery"]["enable_thresholds"] == "true":
             if lsmod("thinkpad_acpi"):
@@ -53,7 +54,7 @@ def battery_setup():
 
 
 def battery_get_thresholds():
-    conf = get_config()
+    conf = config.get_config()
     if conf.has_option("battery", "enable_thresholds"):
         if conf["battery"]["enable_thresholds"] == "true":
             print("-" * 30)

auto_cpufreq/bin/auto_cpufreq.py

@@ -14,6 +14,7 @@
 from auto_cpufreq.core import *
 from auto_cpufreq.power_helper import *
 from auto_cpufreq.battery_scripts.battery import *
+from auto_cpufreq.utils.config import config as conf
 # cli
 @click.command()
 @click.option("--monitor", is_flag=True, help="Monitor and see suggestions for CPU optimizations")
@@ -40,8 +41,9 @@
 def main(config, daemon, debug, update, install, remove, live, log, monitor, stats, version, donate, force, get_state, completions):
 
     # display info if config file is used
+    conf.set_path(config)
     def config_info_dialog():
-        if get_config(config) and hasattr(get_config, "using_cfg_file"):
+        if conf.has_config():
             print("\nUsing settings defined in " + config + " file")
 
     # set governor override unless None or invalid

auto_cpufreq/core.py

@@ -12,7 +12,6 @@
 import click
 import pickle
 import warnings
-import configparser
 # import pkg_resources
 import importlib.metadata
 from math import isclose
@@ -27,6 +26,7 @@
 
 sys.path.append("../")
 from auto_cpufreq.power_helper import *
+from auto_cpufreq.utils.config import config
 
 warnings.filterwarnings("ignore")
 
@@ -84,16 +84,6 @@ def file_stats():
     auto_cpufreq_stats_file = open(auto_cpufreq_stats_path, "w")
     sys.stdout = auto_cpufreq_stats_file
 
-def get_config(config_file=""):
-    if not hasattr(get_config, "config"):
-        get_config.config = configparser.ConfigParser()
-
-        if os.path.isfile(config_file):
-            get_config.config.read(config_file)
-            get_config.using_cfg_file = True
-
-    return get_config.config
-
 def get_override():
     if os.path.isfile(governor_override_state):
         with open(governor_override_state, "rb") as store:
@@ -638,7 +628,7 @@ def set_frequencies():
     if not hasattr(set_frequencies, "min_limit"):
         set_frequencies.min_limit = int(getoutput(f"cpufreqctl.auto-cpufreq --frequency-min-limit"))
 
-    conf = get_config()
+    conf = config.get_config()
 
     for freq_type in frequency.keys():
         value = None
@@ -679,7 +669,7 @@ def set_frequencies():
 
 # set powersave and enable turbo
 def set_powersave():
-    conf = get_config()
+    conf = config.get_config()
     if conf.has_option("battery", "governor"):
         gov = conf["battery"]["governor"]
     else:
@@ -902,7 +892,7 @@ def mon_powersave():
 
 # set performance and enable turbo
 def set_performance():
-    conf = get_config()
+    conf = config.get_config()
     if conf.has_option("charger", "governor"):
         gov = conf["charger"]["governor"]
     else:

auto_cpufreq/utils/config.py

@@ -0,0 +1,40 @@
+from configparser import ConfigParser, ParsingError
+from auto_cpufreq.utils.config_event_handler import ConfigEventHandler
+import pyinotify
+import os
+
+class _Config:
+    def __init__(self) -> None:
+        self.path: str = ""
+        self._config: ConfigParser = ConfigParser()
+        self.watch_manager: pyinotify.WatchManager = pyinotify.WatchManager()
+        self.config_handler = ConfigEventHandler(self)
+
+        # check for file changes using threading
+        notifier: pyinotify.ThreadedNotifierNotifier = pyinotify.ThreadedNotifier(
+            self.watch_manager, self.config_handler)
+        notifier.start()
+
+    def set_path(self, path: str) -> None:
+        self.path = path;
+        mask = pyinotify.IN_CREATE | pyinotify.IN_DELETE | pyinotify.IN_MODIFY
+        self.watch_manager.add_watch(os.path.dirname(path), mask=mask)
+        if os.path.isfile(path):
+            self.update_config()
+
+
+    def has_config(self) -> bool:
+        return os.path.isfile(self.path)
+
+    def get_config(self) -> ConfigParser:
+        return self._config
+
+    def update_config(self) -> None:
+        # create new ConfigParser to prevent old data from remaining
+        self._config = ConfigParser()
+        try:
+            self._config.read(self.path)
+        except ParsingError as e:
+            print(f"The following error occured while parsing the config file: \n{e}")
+
+config = _Config()

auto_cpufreq/utils/config_event_handler.py

@@ -0,0 +1,20 @@
+import pyinotify
+
+class ConfigEventHandler(pyinotify.ProcessEvent):
+    def __init__(self, config) -> None:
+        self.config = config
+
+    # activates when file is modified
+    def process_IN_MODIFY(self, event: pyinotify.Event) -> None:
+        if event.pathname.rstrip("~") == self.config.path:
+            self.config.update_config()
+
+    # activates when file is deleted
+    def process_IN_DELETE(self, event: pyinotify.Event) -> None:
+        if event.pathname.rstrip("~") == self.config.path:
+            self.config.update_config()
+
+    # activates when file is created
+    def process_IN_CREATE(self, event: pyinotify.Event) -> None:
+        if event.pathname.rstrip("~") == self.config.path:
+            self.config.update_config()

nix/default.nix

@@ -15,7 +15,7 @@ python310Packages.buildPythonPackage {
 
   buildInputs = with pkgs; [gtk3 python310Packages.poetry-core];
 
-  propagatedBuildInputs = with python310Packages; [requests pygobject3 click distro psutil setuptools poetry-dynamic-versioning];
+  propagatedBuildInputs = with python310Packages; [requests pygobject3 click distro psutil setuptools poetry-dynamic-versioning pyinotify];
 
   doCheck = false;
   pythonImportsCheck = ["auto_cpufreq"];

pyproject.toml

@@ -27,6 +27,7 @@ click = "^8.1.0"
 distro = "^1.8.0"
 requests = "^2.31.0"
 PyGObject = "^3.46.0"
+pyinotify = "^0.9.6"
 
 [tool.poetry.group.dev.dependencies]
 poetry = "^1.6.1"