From 249e86e8df18f01942e1e14e809b2ddcf0fd050f Mon Sep 17 00:00:00 2001
From: "NGnius (Graham)" <ngniusness@gmail.com>
Date: Sat, 28 May 2022 11:15:19 -0400
Subject: [PATCH] Automatically disable jupiter-fan-control when appropriate;
 hide warning about it

---
 main.py        | 31 +++++++++++++++++++++++++++++--
 main_view.html |  2 +-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/main.py b/main.py
index 4cd2a64..f35b04f 100644
--- a/main.py
+++ b/main.py
@@ -3,6 +3,7 @@ import os
 import json
 import asyncio
 import pathlib
+import subprocess
 
 VERSION = "0.6.0"
 HOME_DIR = str(pathlib.Path(os.getcwd()).parent.parent.resolve())
@@ -208,16 +209,16 @@ class Plugin:
         self.modified_settings = True
         if tick >= len(self.FAN_SPEEDS):
             # automatic mode
+            self.enable_jupiter_fan_control(self)
             self.auto_fan = True
             write_to_sys("/sys/class/hwmon/hwmon5/recalculate", 0)
             write_to_sys("/sys/class/hwmon/hwmon5/fan1_target", 4099) # 4099 is default
-            #subprocess.Popen("systemctl start jupiter-fan-control.service", stdout=subprocess.PIPE, shell=True).wait()
         else:
             # manual voltage
+            self.disable_jupiter_fan_control(self)
             self.auto_fan = False
             write_to_sys("/sys/class/hwmon/hwmon5/recalculate", 1)
             write_to_sys("/sys/class/hwmon/hwmon5/fan1_target", self.FAN_SPEEDS[tick])
-            #subprocess.Popen("systemctl stop jupiter-fan-control.service", stdout=subprocess.PIPE, shell=True).wait()
 
     async def get_fan_tick(self) -> int:
         fan_target = read_fan_target()
@@ -241,6 +242,27 @@ class Plugin:
     async def fantastic_installed(self) -> bool:
         return os.path.exists(FANTASTIC_INSTALL_DIR)
 
+    def disable_jupiter_fan_control(self):
+        active = subprocess.Popen(["systemctl", "is-active", "jupiter-fan-control.service"]).wait() == 0
+        if active:
+            logging.info("Stopping jupiter-fan-control.service so it doesn't interfere")
+            # only disable if currently active
+            self.jupiter_fan_control_was_disabled = True
+            stop_p = subprocess.Popen(["systemctl", "stop", "jupiter-fan-control.service"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            stop_p.wait()
+            logging.debug("systemctl stop jupiter-fan-control.service stdout:\n" + stop_p.stdout.read().decode())
+            logging.debug("systemctl stop jupiter-fan-control.service stderr:\n" + stop_p.stderr.read().decode())
+
+    def enable_jupiter_fan_control(self):
+        if self.jupiter_fan_control_was_disabled:
+            logging.info("Starting jupiter-fan-control.service so it doesn't interfere")
+            # only re-enable if I disabled it
+            self.jupiter_fan_control_was_disabled = False
+            start_p = subprocess.Popen(["systemctl", "start", "jupiter-fan-control.service"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            start_p.wait()
+            logging.debug("systemctl start jupiter-fan-control.service stdout:\n" + start_p.stdout.read().decode())
+            logging.debug("systemctl start jupiter-fan-control.service stderr:\n" + start_p.stderr.read().decode())
+
     # Battery stuff
 
     async def get_charge_now(self) -> int:
@@ -255,6 +277,7 @@ class Plugin:
     # Asyncio-compatible long-running code, executed in a task when the plugin is loaded
     async def _main(self):
         # startup: load & apply settings
+        self.jupiter_fan_control_was_disabled = False
         if os.path.exists(DEFAULT_SETTINGS_LOCATION):
             settings = read_json(DEFAULT_SETTINGS_LOCATION)
             logging.debug(f"Loaded settings from {DEFAULT_SETTINGS_LOCATION}: {settings}")
@@ -374,8 +397,12 @@ class Plugin:
         write_gpu_ppt(2, settings["gpu"]["fastppt"])
         # Fan
         if not (os.path.exists(FANTASTIC_INSTALL_DIR) or settings["fan"]["auto"]):
+            self.disable_jupiter_fan_control(self)
             write_to_sys("/sys/class/hwmon/hwmon5/recalculate", 1)
             write_to_sys("/sys/class/hwmon/hwmon5/fan1_target", settings["fan"]["target"])
+        elif settings["fan"]["auto"] and not os.path.exists(FANTASTIC_INSTALL_DIR):
+            self.enable_jupiter_fan_control(self)
+
 
     def guess_settings(self):
         self.cpus = []
diff --git a/main_view.html b/main_view.html
index 583d9a9..9b23608 100644
--- a/main_view.html
+++ b/main_view.html
@@ -608,7 +608,7 @@
                     <div class="gamepaddialog_FieldLabelRow_H9WOq">
                         <div class="gamepaddialog_FieldLabel_3b0U-">Fan RPM</div>
                     </div>
-                    <div class="gamepaddialog_FieldDescription_2OJfk">Requires disabling updated fan control</div>
+                    <div class="gamepaddialog_FieldDescription_2OJfk" style="display:none;">Requires disabling updated fan control</div>
                     <div class="gamepaddialog_FieldChildren_14_HB">
                     <div id="fanNotch" class="gamepadslider_SliderControlAndNotches_1Cccx Focusable" tabindex="0" style="--normalized-slider-value:0.33;" onmousemove="onSlideFanNotch(event)">
                         <div class="gamepadslider_SliderControl_3o137">