Own api ,cleanup and other improvements

Author: Protonosgit

README.md

@@ -77,6 +77,13 @@ Clicking on the update button will check for version numbers first before initia
 
 2. Auto apply spicetify after updates (or block them completely)
 
+## Manager API
+
+Due to rate limiting I decided to create my own relay for the official Github api.
+It just returns the latest release tag from the spicetify-cli repo.   
+You can monitor the status here: [![Netlify Status](https://api.netlify.com/api/v1/badges/a32b6502-e8ec-45a7-b3e3-4af087f5d38e/deploy-status)](https://app.netlify.com/sites/spicetifymanagerapi/deploys)   
+There might be more efficient ways to do this so feel free to suggest any improvements as an issue!
+
 
 ## Acknowledgements
 - [Spicetify](https://spicetify.app/)

components/popups.py

@@ -14,6 +14,14 @@ def infoDialog(title, text):
     info_dialog.setText(text)
     info_dialog.exec()
 
+def confirmDialog(title, text):
+    confirm_dialog = QMessageBox()
+    confirm_dialog.setWindowTitle(title)
+    confirm_dialog.setText(text)
+    confirm_dialog.setStandardButtons(QMessageBox.StandardButton.Ok)
+    confirm_dialog.exec()
+    
+
 def windowsNotification(title, message):
     notification.notify(
         title=title,

components/shellbridge.py

@@ -1,4 +1,3 @@
-
 import sys
 import os
 import subprocess
@@ -16,24 +15,24 @@ def run(self):
             if sys.platform == 'win32':
                 self.progress_signal.emit("Downloading Spicetify...")
                 subprocess.run('powershell.exe -Command "iwr -useb https://raw.githubusercontent.com/spicetify/spicetify-cli/master/install.ps1 | iex"',check=True)
-                self.progress_signal.emit("Creating backup...")
+                self.progress_signal.emit("Cleaning up...")
                 subprocess.run('spicetify clear -n -q',check=True)
-                subprocess.run('spicetify backup apply -n -q enable-devtools -n -q',check=True)
-                self.progress_signal.emit("Installing Marketplace...")
-                subprocess.run('powershell.exe -Command "iwr -useb https://raw.githubusercontent.com/spicetify/spicetify-marketplace/main/resources/install.ps1 | iex"',check=True)
-            else:
-                self.progress_signal.emit("Downloading Spicetify...")
-                subprocess.run('curl -fsSL https://raw.githubusercontent.com/spicetify/spicetify-cli/master/install.sh | sh',check=True)
                 self.progress_signal.emit("Creating backup...")
-                subprocess.run('spicetify clear',check=True)
-                subprocess.run('spicetify backup apply enable-devtools',check=True)
+                subprocess.run('spicetify backup -n -q',check=True)
+                self.progress_signal.emit("Enabling devtools...")
+                subprocess.run('spicetify enable-devtools -n -q',check=True)
+                self.progress_signal.emit("Applying modification...")
+                subprocess.run('spicetify apply -n -q',check=True)
                 self.progress_signal.emit("Installing Marketplace...")
-                subprocess.run('curl -fsSL https://raw.githubusercontent.com/spicetify/spicetify-marketplace/main/resources/install.sh | sh',check=True)
+                subprocess.run('powershell.exe -Command "iwr -useb https://raw.githubusercontent.com/spicetify/spicetify-marketplace/main/resources/install.ps1 | iex"',check=True)
         except Exception as e:
             print("Error detected!")
             print(e)
             self.progress_signal.emit("fail")
+        finally:
+            self.progress_signal.emit("done")
         self.finished_signal.emit()
+
 # Update spicetify task
 class UpdateSpicetify(QThread):
     finished_signal = pyqtSignal()
@@ -49,6 +48,7 @@ def run(self):
         print("Apply started")
         subprocess.check_output('spicetify apply -n -q')
         self.finished_signal.emit()
+
 # Unisnatll spicetify task
 class UninstallSpicetify(QThread):
     finished_signal = pyqtSignal()
@@ -85,18 +85,6 @@ def run(self):
         except:
             print("Error while running custom command!")
 
-
-#Checks github for latest spicetify version
-def getLatestRelease():
-    url = f"https://api.github.com/repos/spicetify/spicetify-cli/releases/latest"
-    response = requests.get(url)
-
-    if response.status_code == 200:
-        latest_release = response.json()
-        tag_name = latest_release["tag_name"]
-        return tag_name
-    else:
-        return None
 
 #Checks if spicetify is installed by checking appdata folder
 def checkInstalled():
@@ -119,8 +107,8 @@ def checkSpotifyRunning():
         if 'Spotify.exe' in process.info['name']:
             return True
     return False
+
 #Try blocking spotify updates by changing permissions (Windows only) 
-#Warning this function is unstable!
 def blockSpotifyUpdate(active):
     if active:
         try:
@@ -145,7 +133,7 @@ def blockSpotifyUpdate(active):
             print(f'Error: {e.returncode}. patcher failed.')
             return e.returncode
 
-# Checks if spotify updates are blocked (unfinished)
+# Checks if spotify updates are blocked !WIP!
 def checkSpotifyBlockedUpdate():
 
     directory_path = r'C:\path\to\directory'

components/tools.py

@@ -1,6 +1,23 @@
 import configparser
+import requests
 
+#Reads config files
 def readConfig(file_path,section,key):
     config = configparser.ConfigParser()
     config.read(file_path)
-    return config[section][key]
+    return config[section][key]
+
+#Checks for the latest spicetify version
+def getLatestRelease():
+    try:
+        url = f"https://spicetifymanagerapi.netlify.app/.netlify/functions/api/latest/spicetifycli"
+        response = requests.get(url)
+
+        if response.status_code == 200:
+            latest_release = response.json()
+            tag_name = latest_release["tag_name"]
+            return tag_name
+        else:
+            return '0.0.0'
+    except:
+        return '0.0.0'

manager_window.py

@@ -5,12 +5,12 @@
 import sys
 import subprocess
 from PyQt6.QtWidgets import  QMainWindow
-from PyQt6.QtCore import Qt
+from PyQt6.QtCore import Qt, QUrl
 from PyQt6.uic import loadUi
 from PyQt6.QtGui import QDesktopServices
 from components.popups import errorDialog, infoDialog, windowsNotification
-from components.shellbridge import InstallSpicetify, UpdateSpicetify, ApplySpicetify, UninstallSpicetify, CustomCommand, getLatestRelease,checkApplied,blockSpotifyUpdate
-
+from components.shellbridge import InstallSpicetify, UpdateSpicetify, ApplySpicetify, UninstallSpicetify, CustomCommand,checkApplied,blockSpotifyUpdate
+from components.tools import getLatestRelease
 from components.afterinstall_popup import Popup
 
 
@@ -39,38 +39,28 @@ def __init__(self):
 
         self.bt_master.clicked.connect(self.masterButton)
         self.bt_uninstall.clicked.connect(self.startRemoval)
+        self.bt_refresh.clicked.connect(self.SystemSoftStatusCheck)
         self.bt_cmd.clicked.connect(self.Custom)
         self.check_noupdate.stateChanged.connect(self.DisableUpdate)
 
 
     # Execute once window is loaded before listeners are enabled
     def InitWindow(self):
         self.SystemSoftStatusCheck()
+        print('Made by Protonos')
 
-    #Update user about progress while installing spicetify
-    def progressmaster(self, action):
-        if (action == "fail"):
-            self.l_status.setStyleSheet("color: red")
-            self.l_status.setText("Installation has failed")
-            errorDialog("The installation of Spicetify has failed due to an unrecoverable error! Check logs or ask for help.")
-        else:
-            self.l_status.setStyleSheet("color: Orange")
-            self.l_status.setText(action)
-            self.l_versioninfo.setText("This process may take a few minutes!")
-
-
-    # Launch installer task !WIP
+    # Master trigger for all requests
     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')
+            QDesktopServices.openUrl(QUrl('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_refresh.setEnabled(False)
             self.bt_uninstall.setEnabled(False)
             self.l_status.setText("Installling Spicetify...")
             self.l_versioninfo.setText('⏳Please wait⏳')
@@ -81,7 +71,7 @@ def masterButton(self):
         elif self.managermode == 3:
             self.setCursor(Qt.CursorShape.WaitCursor)
             self.bt_master.setEnabled(False)
-            self.bt_update.setEnabled(False)
+            self.bt_refresh.setEnabled(False)
             self.bt_uninstall.setEnabled(False)
             self.l_status.setText("Running apply")
             self.l_versioninfo.setText('⏳Please wait⏳')
@@ -97,22 +87,32 @@ def masterButton(self):
         elif self.managermode == 5:
             self.setCursor(Qt.CursorShape.WaitCursor)
             self.bt_master.setEnabled(False)
-            self.bt_update.setEnabled(False)
+            self.bt_refresh.setEnabled(False)
             self.bt_uninstall.setEnabled(False)
             self.l_status.setText("Updating patcher")
             self.l_versioninfo.setText('⏳Please wait⏳')
             self.iprocess = UpdateSpicetify()
             self.iprocess.finished_signal.connect(self.update_finished)
             self.iprocess.start()
+
+    #Update user about progress while installing spicetify
+    def progressmaster(self, action):
+        if (action == "fail"):
+            self.l_status.setStyleSheet("color: red")
+            self.l_status.setText("⚠️ Installer has crashed ⚠️")
+            errorDialog("The installation of Spicetify has failed due to an unrecoverable error! Check logs or ask for help.")
         else:
-            print("Error selection overshoot!")
+            self.l_status.setStyleSheet("color: Orange")
+            self.l_status.setText(action)
+            self.l_versioninfo.setText("This process may take a few minutes!")
+
 
 
     # Launch uninstaller task
     def startRemoval(self):
         self.setCursor(Qt.CursorShape.WaitCursor)
         self.bt_uninstall.setEnabled(False)
-        self.bt_update.setEnabled(False)
+        self.bt_refresh.setEnabled(False)
         self.bt_master.setEnabled(False)
         self.l_status.setStyleSheet("color: Orange")
         self.l_status.setText("Uninstalling Spicetify...")
@@ -192,11 +192,11 @@ def SystemSoftStatusCheck(self):
 
     def installerUiUpdate(self):
         self.setCursor(Qt.CursorShape.ArrowCursor)
-        self.bt_update.setEnabled(True)
+        self.bt_refresh.setEnabled(True)
         self.bt_uninstall.setEnabled(True)
         self.bt_master.setEnabled(True)
 
-        if(self.isSpotifyInstalled):
+        if (self.isSpotifyInstalled):
 
             if(self.isSpicetifyInstalled):
 

requirements.txt

@@ -335,7 +335,7 @@ QPushButton{
       </property>
       <layout class="QHBoxLayout" name="advanced">
        <item>
-        <widget class="QPushButton" name="bt_update">
+        <widget class="QPushButton" name="bt_refresh">
          <property name="font">
           <font>
            <pointsize>-1</pointsize>
@@ -350,7 +350,7 @@ QPushButton{
 }</string>
          </property>
          <property name="text">
-          <string>Update</string>
+          <string>Refresh</string>
          </property>
          <property name="icon">
           <iconset>