From 04a9c00b1278f8473ded6c4f951c7496f226c128 Mon Sep 17 00:00:00 2001
From: Adnan Hodzic <adnan@hodzic.org>
Date: Fri, 11 Sep 2020 09:02:19 +0200
Subject: [PATCH] refactor of get_current_gov func and its use

---
 bin/auto-cpufreq |  1 +
 source/core.py   | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/bin/auto-cpufreq b/bin/auto-cpufreq
index f1a1abb..a141496 100755
--- a/bin/auto-cpufreq
+++ b/bin/auto-cpufreq
@@ -102,6 +102,7 @@ def main(monitor, live, daemon, install, log, debug):
             print("")
             sysinfo()
             display_load()
+            get_current_gov()
             get_turbo()
             footer()
         elif install:
diff --git a/source/core.py b/source/core.py
index 1a6cbae..bb3e7ea 100644
--- a/source/core.py
+++ b/source/core.py
@@ -36,6 +36,13 @@ load1m, _, _ = os.getloadavg()
 # get CPU utilization as a percentage
 cpuload = psutil.cpu_percent(interval=1)
 
+# auto-cpufreq log file
+auto_cpufreq_log_file = Path("/var/log/auto-cpufreq.log")
+auto_cpufreq_log_file_snap = Path("/var/snap/auto-cpufreq/current/auto-cpufreq.log")
+
+# daemon check
+dcheck = getoutput("snapctl get daemon")
+
 # ToDo: read version from snap/snapcraft.yaml and write to $SNAP/version for use with snap installs
 def app_version():
     print("Build git commit:", check_output(["git", "describe", "--always"]).strip().decode())
@@ -117,16 +124,7 @@ def get_avail_performance():
 
 
 def get_current_gov():
-    return getoutput("cpufreqctl --governor").strip().split(" ")[0]
-
-
-# auto-cpufreq log file
-auto_cpufreq_log_file = Path("/var/log/auto-cpufreq.log")
-auto_cpufreq_log_file_snap = Path("/var/snap/auto-cpufreq/current/auto-cpufreq.log")
-
-# daemon check
-dcheck = getoutput("snapctl get daemon")
-
+    return print("Currently using:", getoutput("cpufreqctl --governor").strip().split(" ")[0], "governor")
 
 def cpufreqctl():
     """
@@ -382,11 +380,13 @@ def mon_autofreq():
     # determine which governor should be used
     if charging():
         print("Battery is: charging")
-        print(f"Suggesting use of \"{get_avail_performance()}\" governor\nCurrently using:", get_current_gov())
+        get_current_gov()
+        print(f"Suggesting use of \"{get_avail_performance()}\" governor")
         mon_performance()
     else:
         print("Battery is: discharging")
-        print(f"Suggesting use of \"{get_avail_powersave()}\" governor\nCurrently using:", get_current_gov())
+        get_current_gov()
+        print(f"Suggesting use of \"{get_avail_powersave()}\" governor")
         mon_powersave()
 
 def python_info():