Fixed background status check and improved toast actions

components/popups.py

@@ -1,4 +1,4 @@
-from PyQt6.QtWidgets import QErrorMessage, QMessageBox
+from PyQt6.QtWidgets import QMessageBox
 from windows_toasts import WindowsToaster, Toast, ToastButton, InteractableWindowsToaster
 
 # !!!
@@ -40,15 +40,13 @@ def windowsToast(title, message):
     toastbuilder.text_fields = [title, message]
     toaster.show_toast(toastbuilder)
 
-# Unused
 
-
-def winUpdateToast():
-    # unused due to limitations related to the window manager in main.py
+def spicetifyStatusToast(message):
     interactableToaster = InteractableWindowsToaster('Spicetify Manager')
-    newToast = Toast(['Spicetify is not active'], 'Spicetify Manager')
+    newToast = Toast([message])
 
-    newToast.AddAction(ToastButton('Open Manager', 'response=decent'))
+    newToast.AddAction(ToastButton('Open manager', 'response=decent'))
     newToast.AddAction(ToastButton('Ignore', 'response=bad'))
 
     interactableToaster.show_toast(newToast)
+    return newToast

components/statusInfo.py

@@ -154,17 +154,17 @@ def checkMarketplaceInstalled():
 
 def spicetifyStatusCheck():
     try:
-        LOCALSPICETIFYVER = subprocess.check_output(
-            'spicetify --version', shell=True).decode("utf-8").strip()
-        LATESTSPICETIFYVER = getLatestSpicetifyRelease().replace("v", "").strip()
-        linkpath = os.path.join(os.path.join(os.path.expanduser(
-            '~'), 'AppData', 'Roaming'), 'Spotify', 'Apps', 'login.spa')
-        if os.path.exists(linkpath):
-            if (LOCALSPICETIFYVER == LATESTSPICETIFYVER):
-                return 0
+        if checkSpicetifyInstalled():
+            spicetifylatest = getLatestSpicetifyRelease().replace("v", "").strip()
+            spicetifylocal = subprocess.check_output(
+                'spicetify --version', shell=True).decode("utf-8").strip()
+            if checkSpicetifyActive():
+                if spicetifylatest == spicetifylocal:
+                    return 0
+                else:
+                    return 2
             else:
                 return 1
-        else:
-            return 2
+        return 0
     except:
         return 0

main.py

@@ -8,13 +8,14 @@
 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
+from components.popups import errorDialog, infoDialog, windowsToast, confirmationModal, spicetifyStatusToast
 from components.shellbridge import InstallSpicetify, UpdateSpicetify, ApplySpicetify, UninstallSpicetify, CustomCommand, blockSpotifyUpdate
 from components.statusInfo import *
 from components.tools import *
 from components.dialog_windows import AfterInstall
 from werkzeug.wrappers import Request, Response
 from werkzeug.serving import run_simple
+from windows_toasts import ToastActivatedEventArgs
 
 initConfig()
 
@@ -451,12 +452,19 @@ def run(self):
 def alertSpicetifyStatus():
     status = spicetifyStatusCheck()
     if status == 2:
-        windowsToast("Spicetify Manager", "Update available!")
+        spicetifyStatusToast(
+            'A new version of Spicetify is available').on_activated = toast_callback
     elif status == 1:
-        windowsToast("Spicetify Manager", "Not applied!")
+        spicetifyStatusToast(
+            'Spicetify is not working correctly').on_activated = toast_callback
+
+
+def toast_callback(activatedEventArgs: ToastActivatedEventArgs):
+    print('For some f***ing reason this is not working pls help')
 
 
 # start the app
+manager = None
 if __name__ == "__main__":
     manager = Manager()
     manager.run()