Split start on boot and watchwitch and fixed checkbox glitches

Author: Protonosgit

components/statusInfo.py

@@ -50,7 +50,7 @@ def checkSpotifyRunning():
         return False
 
 
-def checkWatchWitch():
+def checkWatchWitchPatched():
     try:
         witchpath = os.path.join(os.path.join(os.path.expanduser(
             '~'), 'AppData', 'Roaming'), 'Spotify', 'Apps', 'xpui', 'index.html')
@@ -65,18 +65,17 @@ def checkWatchWitch():
         return False
 
 
-def isManagerOnBoot():
+def isAddedToStartup():
     try:
         key = winreg.OpenKey(winreg.HKEY_CURRENT_USER,
                              "Software\Microsoft\Windows\CurrentVersion\Run", 0, winreg.KEY_READ)
-        _, value, _ = winreg.QueryValueEx(key, "SpicetifyManager")
+        value, regtype = winreg.QueryValueEx(key, "SpicetifyManager")
         winreg.CloseKey(key)
         return True
     except FileNotFoundError:
         return False
     except Exception as e:
-        print("Error while checking if added to startup")
-        print(e)
+        print(f"An error occurred: {e}")
         return False
 
 

main.py

@@ -8,7 +8,7 @@
 from PyQt6.QtCore import Qt, QUrl, QThread
 from PyQt6.uic import loadUi
 from PyQt6.QtGui import QDesktopServices, QMovie, QIcon
-from components.popups import errorDialog, infoDialog, windowsToast, confirmationModal, spicetifyStatusToast
+from components.popups import errorDialog, warnDialog, windowsToast, confirmationModal, spicetifyStatusToast
 from components.shellbridge import InstallSpicetify, UpdateSpicetify, ApplySpicetify, UninstallSpicetify, CustomCommand, blockSpotifyUpdate
 from components.statusInfo import *
 from components.tools import *
@@ -31,7 +31,8 @@ def __init__(self):
         self.isApplied = False
         self.isActive = False
         self.isMarketInstalled = False
-        self.isWatchWitched = False
+        self.isWatchWitchPatched = False
+        self.isRunningOnBoot = False
         self.isAutoClosing = False
         self.managermode = 0
 
@@ -70,6 +71,7 @@ def __init__(self):
         self.check_noupdate.stateChanged.connect(self.DisableUpdate)
         self.check_watchwitch.stateChanged.connect(self.PatchWatchWitch)
         self.check_autoclose.stateChanged.connect(self.AutoClose)
+        self.check_startonboot.stateChanged.connect(self.startOnBoot)
 
     # Execute once window is loaded before listeners are enabled
 
@@ -81,6 +83,7 @@ def InitWindow(self):
         self.background_graphics.show()
         movie.start()
 
+    # Display manager window
     def showManagerWindow(self):
         self.InitWindow()
         self.show()
@@ -255,28 +258,32 @@ def DisableUpdate(self):
                 pass
                 windowsToast("Update supression updated", "")
 
-    # Apply Watchwitch server
+    # Enable Watchwitch server
     def PatchWatchWitch(self):
-        folder_path = os.path.join(os.path.join(os.path.expanduser(
+        writeConfig('Manager', 'watchwitch', str(
+            self.check_watchwitch.isChecked()))
+        watchwitchInjector(self.check_watchwitch.isChecked())
+        if not self.check_startonboot.isChecked() and self.check_watchwitch.isChecked():
+            warnDialog(
+                "Start on boot is not enabled! \nThe server will not start on boot!")
+
+    # Auto close manager after completing actions (does not check for status!)
+    def AutoClose(self):
+        writeConfig('Manager', 'autoclose', str(
+            self.check_autoclose.isChecked()))
+
+    # Start on boot
+    def startOnBoot(self):
+        managerpath = os.path.join(os.path.join(os.path.expanduser(
             '~'), 'AppData', 'Local'), 'spicetify', 'Manager.exe')
-        if os.path.exists(folder_path):
-            writeConfig('Manager', 'watchwitch', str(
-                self.check_watchwitch.isChecked()))
-            watchwitchInjector(self.check_watchwitch.isChecked())
-            addToStartup(self.check_watchwitch.isChecked())
-        else:
-            self.check_watchwitch.setChecked(False)
+        addToStartup(self.check_startonboot.isChecked())
+        if not os.path.exists(managerpath):
             folder_path = os.path.join(os.path.join(
                 os.path.expanduser('~'), 'AppData', 'Local'), 'spicetify')
             reply = confirmationModal(
-                'Executeable not found', 'Please put the manager executeable in the "localappdata/spicetify/Manager.exe" folder! \n Do you want to open the folder?')
+                'Executeable not found', 'Please put the manager executeable in the "localappdata/spicetify/Manager.exe" folder or else the manager will not start! \n Do you want to open the folder?')
             if reply == QMessageBox.StandardButton.Yes:
                 os.startfile(folder_path)
-    # Auto close manager after completing actions (does not check for status!)
-
-    def AutoClose(self):
-        writeConfig('Manager', 'autoclose', str(
-            self.check_autoclose.isChecked()))
 
     # Called when spicetify is installed or not
 
@@ -323,13 +330,15 @@ def statusUpdate(self):
                     'spicetify --version', shell=True).decode("utf-8").strip()
 
             if self.isApplied:
-                self.isWatchWitched = checkWatchWitch()
+                self.isWatchWitchPatched = checkWatchWitchPatched()
 
             if (readConfig('Manager', 'autoclose') == 'True'):
                 self.isAutoClosing = True
             else:
                 self.isAutoClosing = False
 
+            self.isRunningOnBoot = isAddedToStartup()
+
         except Exception as e:
             print('Error while checking spicetify status')
             print(e)
@@ -409,8 +418,9 @@ def uiUpdate(self):
             self.managermode = 1
 
         self.check_noupdate.setChecked(checkUpdateSupression())
-        self.check_watchwitch.setChecked(self.isWatchWitched)
+        self.check_watchwitch.setChecked(self.isWatchWitchPatched)
         self.check_autoclose.setChecked(self.isAutoClosing)
+        self.check_startonboot.setChecked(self.isRunningOnBoot)
 
     def checkUpdateAvailable(self):
         if (managerUpdateCheck()):
@@ -448,7 +458,7 @@ def run(self):
 
 
 # Runs the server if enabled
-if (isManagerOnBoot()):
+if (readConfig('Manager', 'watchwitch') == 'True'):
     watchwitch = WerkzeugThread()
     watchwitch.start()
 

res/manager.ui

@@ -424,7 +424,7 @@ QPushButton:hover
       <property name="geometry">
        <rect>
         <x>10</x>
-        <y>240</y>
+        <y>350</y>
         <width>781</width>
         <height>51</height>
        </rect>
@@ -509,8 +509,8 @@ QPushButton:hover
      <widget class="QLabel" name="section">
       <property name="geometry">
        <rect>
-        <x>40</x>
-        <y>210</y>
+        <x>30</x>
+        <y>320</y>
         <width>401</width>
         <height>20</height>
        </rect>
@@ -528,7 +528,7 @@ QPushButton:hover
       <property name="geometry">
        <rect>
         <x>20</x>
-        <y>30</y>
+        <y>20</y>
         <width>381</width>
         <height>31</height>
        </rect>
@@ -555,7 +555,7 @@ QPushButton:hover
       <property name="geometry">
        <rect>
         <x>20</x>
-        <y>70</y>
+        <y>100</y>
         <width>381</width>
         <height>31</height>
        </rect>
@@ -582,7 +582,7 @@ QPushButton:hover
       <property name="geometry">
        <rect>
         <x>20</x>
-        <y>150</y>
+        <y>180</y>
         <width>381</width>
         <height>31</height>
        </rect>
@@ -609,7 +609,7 @@ QPushButton:hover
       <property name="geometry">
        <rect>
         <x>20</x>
-        <y>110</y>
+        <y>140</y>
         <width>381</width>
         <height>31</height>
        </rect>
@@ -629,6 +629,30 @@ QPushButton:hover
        </size>
       </property>
      </widget>
+     <widget class="QCheckBox" name="check_startonboot">
+      <property name="geometry">
+       <rect>
+        <x>20</x>
+        <y>60</y>
+        <width>381</width>
+        <height>31</height>
+       </rect>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">QCheckBox:!enabled{
+	color: rgba(255, 255, 255, 120);
+}</string>
+      </property>
+      <property name="text">
+       <string>Start manager on boot</string>
+      </property>
+      <property name="iconSize">
+       <size>
+        <width>50</width>
+        <height>50</height>
+       </size>
+      </property>
+     </widget>
     </widget>
     <widget class="QWidget" name="tab_3">
      <attribute name="icon">