Add bluetooth controls to the GUI, and fix bluetooth conf updates for commented lines (#917)

* Add bluetooth controls to the GUI, and fix bluetooth conf updates with commented lines

* Show config file in use and move bluetooth options to advanced settings

Author: cypherpower

auto_cpufreq/core.py

@@ -870,6 +870,13 @@ def sysinfo():
     driver = getoutput("cpufreqctl.auto-cpufreq --driver")
     print("Driver: " + driver)
 
+    config_path = config.path if config.has_config() else None
+    if config_path is None:
+        from auto_cpufreq.config.config import find_config_file
+        config_path = find_config_file(None)
+    if os.path.isfile(config_path):
+        print(f"\nUsing settings defined in {config_path}")
+
     # get usage and freq info of cpus
     usage_per_cpu = psutil.cpu_percent(interval=1, percpu=True)
     # psutil current freq not used, gives wrong values with offline cpu's
@@ -936,9 +943,12 @@ def sysinfo():
 
     if offline_cpus: print(f"\nDisabled CPUs: {','.join(offline_cpus)}")
 
-    # print current fan speed
+    # print current fan speed (only if > 0)
     current_fans = list(psutil.sensors_fans())
-    for current_fan in current_fans: print("\nCPU fan speed:", psutil.sensors_fans()[current_fan][0].current, "RPM")
+    for current_fan in current_fans:
+        fan_speed = psutil.sensors_fans()[current_fan][0].current
+        if fan_speed:
+            print(f"\nCPU fan speed: {fan_speed} RPM")
 
 def read_stats():
     if os.path.isfile(auto_cpufreq_stats_path): call(["tail", "-n 50", "-f", str(auto_cpufreq_stats_path)], stderr=DEVNULL)

auto_cpufreq/gui/app.py

@@ -9,8 +9,9 @@
 
 from auto_cpufreq.core import check_for_update, is_running
 from auto_cpufreq.globals import GITHUB, IS_INSTALLED_WITH_SNAP
-from auto_cpufreq.gui.objects import CPUFreqStatsLabel, CurrentGovernorBox, DaemonNotRunningView, DropDownMenu, MonitorModeView, RadioButtonView, CPUTurboOverride, SystemStatsLabel, UpdateDialog
+from auto_cpufreq.gui.objects import BatteryInfoBox, BluetoothBootControl, CPUFreqScalingBox, CurrentGovernorBox, DaemonNotRunningView, DropDownMenu, MonitorModeView, RadioButtonView, CPUTurboOverride, SystemStatsLabel, SystemStatisticsBox, UpdateDialog
 from auto_cpufreq.gui.objects import get_stats
+from auto_cpufreq.power_helper import bluetoothctl_exists
 
 if IS_INSTALLED_WITH_SNAP:
     CSS_FILE = "/snap/auto-cpufreq/current/style.css"
@@ -40,7 +41,7 @@ def main(self):
         self.hbox.pack_start(self.systemstats, False, False, 0)
         self.add(self.hbox)
 
-        self.vbox_right = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=52)
+        self.vbox_right = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=15)
 
         self.menu = DropDownMenu(self)
         self.hbox.pack_end(self.menu, False, False, 0)
@@ -51,8 +52,17 @@ def main(self):
         if "Warning: CPU turbo is not available" not in get_stats():
             self.vbox_right.pack_start(CPUTurboOverride(), False, False, 0)
 
-        self.cpufreqstats = CPUFreqStatsLabel()
-        self.vbox_right.pack_start(self.cpufreqstats, False, False, 0)
+        self.batteryinfo = BatteryInfoBox()
+        self.vbox_right.pack_start(self.batteryinfo, False, False, 0)
+
+        self.cpufreqscaling = CPUFreqScalingBox()
+        self.vbox_right.pack_start(self.cpufreqscaling, False, False, 0)
+
+        self.systemstats_box = SystemStatisticsBox()
+        self.vbox_right.pack_start(self.systemstats_box, False, False, 0)
+
+        if bluetoothctl_exists:
+            self.vbox_right.pack_start(BluetoothBootControl(), False, False, 0)
 
         self.hbox.pack_start(self.vbox_right, False, False, 0)
 
@@ -121,4 +131,6 @@ def refresh_in_thread(self):
     def _refresh(self):
         self.systemstats.refresh()
         self.currentgovernor.refresh()
-        self.cpufreqstats.refresh()
+        self.batteryinfo.refresh()
+        self.cpufreqscaling.refresh()
+        self.systemstats_box.refresh()