New status checking system

Author: Protonosgit

README.md

@@ -22,7 +22,9 @@ Contributers wellcome!
 - [x] Custom cli commands
 - [ ] Automatically update spicetify and apply patches after spotify update
 
-## Installation and Running
+ Currently Windows only!
+ If would like to improve support for other Platforms feel free to do so!
+ ## Installation and Running
 
 Download project from Github and install dependencies
 

components/shellbridge.py

@@ -42,6 +42,14 @@ def run(self):
         subprocess.run('spicetify upgrade')
         subprocess.run('spicetify update')
         self.finished_signal.emit()
+
+# Apply task
+class ApplySpicetify(QThread):
+    finished_signal = pyqtSignal()
+    def run(self):
+        print("Apply started")
+        subprocess.check_output('spicetify apply')
+        self.finished_signal.emit()
 # Uninstaller task
 class UninstallSpicetify(QThread):
     finished_signal = pyqtSignal()

manager_window.py

@@ -7,8 +7,9 @@
 from PyQt6.QtWidgets import  QMainWindow
 from PyQt6.QtCore import Qt
 from PyQt6.uic import loadUi
+from PyQt6.QtGui import QDesktopServices
 from components.popups import errorDialog, infoDialog, windowsNotification
-from components.shellbridge import InstallSpicetify, UpdateSpicetify, UninstallSpicetify, CustomCommand, getLatestRelease,checkApplied,blockSpotifyUpdate
+from components.shellbridge import InstallSpicetify, UpdateSpicetify, ApplySpicetify, UninstallSpicetify, CustomCommand, getLatestRelease,checkApplied,blockSpotifyUpdate
 
 from components.afterinstall_popup import Popup
 
@@ -17,12 +18,13 @@ class Manager(QMainWindow):
     #Setup click listeners and load ui and do initial setup
     def __init__(self):
         super().__init__()
-        self.installmode = True
+
         self.isSpotifyInstalled = False
         self.isSpicetifyInstalled = False
         self.isApplied = False
         self.isBackedUp = False
         self.isActive = False
+        self.managermode = 0
 
         self.LOCALSPOTIFYVER = ''
         self.LATESTSPOTIFYVER = ''
@@ -35,7 +37,7 @@ def __init__(self):
 
         self.InitWindow()
 
-        self.bt_install.clicked.connect(self.startInstaller)
+        self.bt_master.clicked.connect(self.masterButton)
         self.bt_update.clicked.connect(self.startUpdate)
         self.bt_uninstall.clicked.connect(self.startRemoval)
         self.bt_cmd.clicked.connect(self.Custom)
@@ -45,7 +47,6 @@ def __init__(self):
     # Execute once window is loaded before listeners are enabled
     def InitWindow(self):
         self.SystemSoftStatusCheck()
-        self.checkSpicetify()
 
     #Update user about progress while installing spicetify
     def progressmaster(self, action):
@@ -58,40 +59,64 @@ def progressmaster(self, action):
             self.l_status.setText(action)
             self.l_versioninfo.setText("This process may take a few minutes!")
 
-    # Launch installer task
-    def startInstaller(self):
-        self.setCursor(Qt.CursorShape.WaitCursor)
-        self.bt_install.setEnabled(False)
-        self.bt_update.setEnabled(False)
-        self.bt_uninstall.setEnabled(False)
-        self.iprocess = InstallSpicetify()
-        self.iprocess.finished_signal.connect(self.setup_finished)
-        self.iprocess.progress_signal.connect(self.progressmaster)
-        self.iprocess.start()
-    def launchSpotify(self):
-        os.startfile(os.path.join( os.path.expanduser('~'), 'AppData','Roaming/Spotify/Spotify.exe'))
-    # Applies spicetify
-    def activateSpicetify(self):
-        subprocess.check_output('spicetify apply')
-        self.checkSpicetify()
+
+    # Launch installer task !WIP
+    def masterButton(self):
+        if self.managermode == 0:
+            os.startfile(os.path.join( os.path.expanduser('~'), 'AppData','Roaming/Spotify/Spotify.exe'))
+            self.SystemSoftStatusCheck()
+        if self.managermode == 1:
+            QDesktopServices.openUrl('https://download.scdn.co/SpotifySetup.exe')
+            self.SystemSoftStatusCheck()
+        elif self.managermode == 2:
+            self.setCursor(Qt.CursorShape.WaitCursor)
+            self.bt_master.setEnabled(False)
+            self.bt_update.setEnabled(False)
+            self.bt_uninstall.setEnabled(False)
+            self.l_status.setText("Installling Spicetify...")
+            self.iprocess = InstallSpicetify()
+            self.iprocess.finished_signal.connect(self.setup_finished)
+            self.iprocess.progress_signal.connect(self.progressmaster)
+            self.iprocess.start()
+        elif self.managermode == 3:
+            self.setCursor(Qt.CursorShape.WaitCursor)
+            self.bt_master.setEnabled(False)
+            self.bt_update.setEnabled(False)
+            self.bt_uninstall.setEnabled(False)
+            self.l_status.setText("Running apply")
+            self.iprocess = ApplySpicetify()
+            self.iprocess.finished_signal.connect(self.apply_finished)
+            self.iprocess.start()
+        elif self.managermode == 4:
+            killpath1 = os.path.join(os.path.join( os.path.expanduser('~'), 'AppData','Roaming'), 'Spotify', 'Apps', 'login.spa')
+            killpath2 = os.path.join(os.path.join( os.path.expanduser('~'), 'AppData','Roaming'), 'Spotify', 'Apps', 'xpui.spa')
+            os.remove(killpath1)
+            os.remove(killpath2)
+            self.SystemSoftStatusCheck()
+        else:
+            print("Error selection overshoot!")
+        
+
     # Launch uninstaller task
     def startRemoval(self):
         self.setCursor(Qt.CursorShape.WaitCursor)
         self.bt_uninstall.setEnabled(False)
         self.bt_update.setEnabled(False)
-        self.bt_install.setEnabled(False)
+        self.bt_master.setEnabled(False)
         self.l_status.setStyleSheet("color: Orange")
         self.l_status.setText("Uninstalling Spicetify...")
         self.iprocess = UninstallSpicetify()
         self.iprocess.finished_signal.connect(self.uninstall_finished)
         self.iprocess.start()
+
+
     # Launch updater task
     def startUpdate(self):
         try:
             self.setCursor(Qt.CursorShape.WaitCursor)
             self.bt_update.setEnabled(False)
             self.bt_uninstall.setEnabled(False)
-            self.bt_install.setEnabled(False)
+            self.bt_master.setEnabled(False)
             self.l_status.setStyleSheet("color: Orange")
             self.l_status.setText("Checking for updates...")
             localversion = subprocess.check_output('spicetify --version',shell=True).decode("utf-8").strip()
@@ -102,7 +127,7 @@ def startUpdate(self):
                 self.setCursor(Qt.CursorShape.ArrowCursor)
                 self.bt_update.setEnabled(True)
                 self.bt_uninstall.setEnabled(True)
-                self.bt_install.setEnabled(True)
+                self.bt_master.setEnabled(True)
             else:
                 self.l_status.setStyleSheet("color: Orange")
                 self.l_status.setText("Updating...")
@@ -117,89 +142,46 @@ def Custom(self):
         self.iprocess = CustomCommand(self.combo_cmd.currentIndex())
         self.iprocess.finished_signal.connect(self.uninstall_finished)
         self.iprocess.start()
+
+
     # Disables Spotify self update function using permissions
     def DisableUpdate(self):
         if not (blockSpotifyUpdate(self.check_noupdate.isChecked())):
-            infoDialog("Success", " The process has finished !")
+            windowsNotification("Spicetify Manager", "Update supression failed!")
         else:
-            errorDialog("The process has failed ! You might need to remove the Update folder from Spotify manually.")
+            windowsNotification("Spicetify Manager", "Update supression activated!")
 
 
     #Called when spicetify is installed or not?
     def setup_finished(self):
-        self.checkSpicetify()
+        self.SystemSoftStatusCheck()
         dialog = Popup(self)
         dialog.exec()
+        windowsNotification("Spicetify Manager", "Spicetify has been installed!")
+    #Called when spicetify is applied
+    def apply_finished(self):
+        self.SystemSoftStatusCheck()
+        windowsNotification("Spicetify Manager", "Spicetify has been applied!")
     #Called when spicetify is updated
     def update_finished(self):
-        self.checkSpicetify()
+        self.SystemSoftStatusCheck()
+        windowsNotification("Spicetify Manager", "Spicetify has been updated!")
     #Called when spicetify is uninstalled
     def uninstall_finished(self):
-        self.checkSpicetify()
+        self.SystemSoftStatusCheck()
+        windowsNotification("Spicetify Manager", "Spicetify has been uninstalled!")
 
-    # Check if spicetify is installed and applied (mainly ui work)
-    def checkSpicetify(self):
-        try:
-            self.setCursor(Qt.CursorShape.ArrowCursor)
-            folder_path = os.path.join(os.path.join( os.path.expanduser('~'), 'AppData','Local'), 'spicetify')
-            if os.path.exists(folder_path) and os.path.isdir(folder_path):
-                if not checkApplied():
-                    self.l_status.setText("Spicetify is not activated yet")
-                    self.l_status.setStyleSheet("color: orange")
-                    self.l_versioninfo.setText('Please press activate to apply any modifications')
-                    self.bt_uninstall.setEnabled(True)
-                    self.bt_update.setEnabled(True)
-                    self.bt_install.setEnabled(True)
-                    if self.installmode:
-                        self.installmode = False
-                        self.bt_install.setText("Activate")
-                        self.bt_install.clicked.disconnect(self.startInstaller)
-                    else:
-                        self.bt_install.clicked.disconnect(self.launchSpotify)
-                    self.bt_install.clicked.connect(self.activateSpicetify)
-                else:
-                    self.l_status.setText("Spotify is spiced up!")
-                    self.l_status.setStyleSheet("color: green")
-                    versionoutput = subprocess.check_output('spicetify --version',shell=True)
-                    self.l_versioninfo.setText('Version: '+versionoutput.decode("utf-8"))
-                    self.bt_uninstall.setEnabled(True)
-                    self.bt_update.setEnabled(True)
-                    self.bt_install.setEnabled(True)
-                    if self.installmode:
-                        self.installmode = False
-                        self.bt_install.setText("Launch Spotify")
-                        self.bt_install.clicked.disconnect(self.startInstaller)
-                        self.bt_install.clicked.connect(self.launchSpotify)
-            else:
-                self.l_status.setText("Spicetify is not installed")
-                self.l_status.setStyleSheet("color: red")
-                self.l_versioninfo.setText("")
-                self.bt_uninstall.setEnabled(False)
-                self.bt_update.setEnabled(False)
-                self.bt_install.setEnabled(True)
-                if not self.installmode:
-                    self.installmode = True
-                    self.bt_install.setText("Install")
-                    self.bt_install.clicked.disconnect(self.launchSpotify)
-                    self.bt_install.clicked.connect(self.startInstaller)
-        except Exception as e:
-            print("E: Error while checking Spicetify!")
-            print(e)
-            self.l_status.setText("Spicetify is not installed")
-
-   # Spicetify status check (NEW attempt)
+   # Spicetify status check V2
     def SystemSoftStatusCheck(self):
         spotipath = os.path.join(os.path.join( os.path.expanduser('~'), 'AppData','Roaming'), 'Spotify', 'Spotify.exe')
         if os.path.exists(spotipath):
             self.isSpotifyInstalled = True
-            windowsNotification("Spicetify Manager", "Spicetify is installed!")
         else:
             self.isSpotifyInstalled = False
 
-        # maybe also check executable in local appdata
-        spicypath1 = os.path.join(os.path.join( os.path.expanduser('~'), 'AppData','Local'), 'spicetify')
-        spicypath2 = os.path.join(os.path.join( os.path.expanduser('~'), 'AppData','Roaming'), 'Spotify')
-        if os.path.exists(spicypath1) and os.path.isdir(spicypath2):
+        # maybe (also) check executable in local appdata
+        spicypath = os.path.join(os.path.join( os.path.expanduser('~'), 'AppData','Local'), 'spicetify', 'spicetify.exe')
+        if os.path.exists(spicypath):
             self.isSpicetifyInstalled = True
             self.LOCALSPICETIFYVER = subprocess.check_output('spicetify --version',shell=True).decode("utf-8").strip()
         else:
@@ -218,21 +200,46 @@ def SystemSoftStatusCheck(self):
             self.isActive = False
         else:
             self.isActive = True
-
 
-    
+        self.installerUiUpdate()
+
     def installerUiUpdate(self):
+        self.setCursor(Qt.CursorShape.ArrowCursor)
+        self.bt_update.setEnabled(True)
+        self.bt_uninstall.setEnabled(True)
+        self.bt_master.setEnabled(True)
         if(self.isSpotifyInstalled):
-            pass
-        else:
-            pass
-
-        if(self.isSpicetifyInstalled):
-            pass
-        else:
-            pass
-
-        if(self.isActive):
-            pass
+            if(self.isSpicetifyInstalled):
+                if(self.isApplied):
+                    if(self.isActive):
+                        #Implement update checker here
+                        self.l_status.setText("Spotify is spiced up!")
+                        self.l_status.setStyleSheet("color: lime")
+                        self.bt_master.setText("Launch Spotify")
+                        self.l_versioninfo.setText('Version: '+self.LOCALSPICETIFYVER)
+                        self.managermode = 0
+                    else:
+                        self.l_status.setText("Spicetify is inactive")
+                        self.l_status.setStyleSheet("color: yellow")
+                        self.l_versioninfo.setText('Press activate to activate Spicetify')
+                        self.bt_master.setText("Activate")
+                        self.managermode = 4
+                else:
+                    self.l_status.setText("Spicetify is not applied yet")
+                    self.l_status.setStyleSheet("color: orange")
+                    self.l_versioninfo.setText('Press apply to enable modifications')
+                    self.bt_master.setText("Apply")
+                    self.managermode = 3
+            else:
+                self.l_status.setText("Spicetify is not installed")
+                self.l_status.setStyleSheet("color: White")
+                self.l_versioninfo.setText('Press install to start the process')
+                #self.l_versioninfo.setText('Latest version: '+self.LATESTSPICETIFYVER)
+                self.bt_master.setText("Install")
+                self.managermode = 2
         else:
-            pass
+            self.l_status.setText("Spotify is not installed")
+            self.l_status.setStyleSheet("color: red")
+            self.l_versioninfo.setText('Download Spotify from the official website')
+            self.bt_master.setText("Download")
+            self.managermode = 1

res/manager.ui

@@ -279,7 +279,7 @@ QPushButton:pressed
      <enum>QTabWidget::North</enum>
     </property>
     <property name="currentIndex">
-     <number>1</number>
+     <number>0</number>
     </property>
     <widget class="QWidget" name="tab_1">
      <property name="styleSheet">
@@ -292,7 +292,7 @@ QPushButton:pressed
      <attribute name="title">
       <string>Simple</string>
      </attribute>
-     <widget class="QPushButton" name="bt_install">
+     <widget class="QPushButton" name="bt_master">
       <property name="enabled">
        <bool>true</bool>
       </property>