bumped supported + better eventloop

Author: ohitstom

Spicetify-Easyinstall.py

@@ -6,14 +6,9 @@
 
 import asyncio
 import sys
-import logging
 
 # Only start if running as main and not import
 if __name__ == "__main__":
-    
-    # Setup logging preferences
-    logging.getLogger('aiohttp.server').setLevel(logging.CRITICAL)
-
     # Setup logging console to file output
     from modules import logger
 
@@ -36,13 +31,14 @@
     globals.app.setStyleSheet(gui.QSS)
 
     # Configure asyncio loop to work with PyQt5
+    asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
     loop = QEventLoop(globals.app)
     asyncio.set_event_loop(loop)
-    asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
     # Setup GUI
     globals.gui = gui.MainWindow()
     globals.gui.show()
+    
     # Set off loop
     with loop:
-        sys.exit(loop.run_forever())
+        sys.exit(loop.run_until_complete(globals.gui.exit_request.wait()))

modules/core.py

@@ -349,46 +349,52 @@ async def install(launch=False, latest=False):
     # The code below will cache pixmaps of each themes showcase screenshots.
 
     print(f"(11/{steps_count}) Caching pixmaps...")
-    if os.path.exists('pix_cache.txt'):
-        os.remove('pix_cache.txt')
-    open('pix_cache.txt', 'w').close()
-    globals.pix_cache.clear()
+    try:
+        if os.path.exists('pix_cache.txt'):
+            os.remove('pix_cache.txt')
+        open('pix_cache.txt', 'w').close()
+        globals.pix_cache.clear()
 
-    themes = utils.list_config_available("themes")
-    backgrounds = utils.theme_images()
-    for theme in themes:
-        background=str(backgrounds[themes.index(theme)])
-        if background != "None":
-            Brightness = gui.brightness(background)   
-            pixmapByteArray = gui.buttonPixmap(bg=background, rounded=True, width=284, height=160, typing="ByteArray")
-            globals.pix_cache[background] = [pixmapByteArray, Brightness]                
-            with open('pix_cache.txt', 'a') as f:
-                f.write(f'{background}: {str(pixmapByteArray.toBase64())}, {Brightness}\n') 
+        themes = utils.list_config_available("themes")
+        backgrounds = utils.theme_images()
+        for theme in themes:
+            background=str(backgrounds[themes.index(theme)])
+            if background != "None":
+                Brightness = gui.brightness(background)   
+                pixmapByteArray = gui.buttonPixmap(bg=background, rounded=True, width=284, height=160, typing="ByteArray")
+                globals.pix_cache[background] = [pixmapByteArray, Brightness]                
+                with open('pix_cache.txt', 'a') as f:
+                    f.write(f'{background}: {str(pixmapByteArray.toBase64())}, {Brightness}\n') 
+    except:
+        print("Pixmaps could not be cached, this does not hinder your install.\nHowever customization page might take a second to load.")
     print("Finished caching pixmaps!\n")
 
     # >[Section 12]<
     # The code below will cache descriptions of each extensions "//description" header.
 
     print(f"(12/{steps_count}) Caching descriptions...")
-    if os.path.exists('desc_cache.txt'):
-        os.remove('desc_cache.txt')
-    else:
-        open('desc_cache.txt', 'w').close()
-    globals.desc_cache.clear()
+    try:
+        if os.path.exists('desc_cache.txt'):
+            os.remove('desc_cache.txt')
+        else:
+            open('desc_cache.txt', 'w').close()
+        globals.desc_cache.clear()
 
-    extensions=[]
-    descriptions = utils.extension_descriptions()
-    for extension in utils.list_config_available("extensions"):
-        if extension.lower()[:-3] not in [x.lower() for x in utils.list_config_available("themes")]:
-            extensions.append(extension)
+        extensions=[]
+        descriptions = utils.extension_descriptions()
+        for extension in utils.list_config_available("extensions"):
+            if extension.lower()[:-3] not in [x.lower() for x in utils.list_config_available("themes")]:
+                extensions.append(extension)
 
-    for extension in extensions:
-        if extension[:-3] not in globals.desc_cache:
-            globals.desc_cache[extension[:-3]] = descriptions[extensions.index(extension)]
-            with open("desc_cache.txt", "a") as f:
-                f.write(
-                    f'{extension[:-3]}: {descriptions[extensions.index(extension)]}\n'
+        for extension in extensions:
+            if extension[:-3] not in globals.desc_cache:
+                globals.desc_cache[extension[:-3]] = descriptions[extensions.index(extension)]
+                with open("desc_cache.txt", "a") as f:
+                    f.write(
+                        f'{extension[:-3]}: {descriptions[extensions.index(extension)]}\n'
                 )
+    except:
+        print("Descriptions could not be cached, this does not hinder your install.\nHowever the extensions page may take a second to load.")
     print("Finished caching extension descriptions!\n")
 
     if latest:
@@ -694,47 +700,49 @@ async def update_addons(shipped=False):
 
         else:
             utils.verbose_print(f"{unpacked_name} wasnt downloaded successfully...")
-        print("Finished downloading 'custom' addons!\n")
+    print("Finished downloading 'custom' addons!\n")
 
-        print(f"(4/{steps_count}) Caching pixmaps...")
-        if os.path.exists('pix_cache.txt'):
-            os.remove('pix_cache.txt')
-        open('pix_cache.txt', 'w').close()
-        globals.pix_cache.clear()
 
-        themes = utils.list_config_available("themes")
-        backgrounds = utils.theme_images()
-        for theme in themes:
-            background=str(backgrounds[themes.index(theme)])
-            if background != "None":
-                Brightness = gui.brightness(background)   
-                pixmapByteArray = gui.buttonPixmap(bg=background, rounded=True, width=284, height=160, typing="ByteArray")
-                globals.pix_cache[background] = [pixmapByteArray, Brightness]                
-                with open('pix_cache.txt', 'a') as f:
-                    f.write(f'{background}: {str(pixmapByteArray.toBase64())}, {Brightness}\n') 
-        print("Finished caching pixmaps!\n")
+    print(f"(4/{steps_count}) Caching pixmaps...")
+    if os.path.exists('pix_cache.txt'):
+        os.remove('pix_cache.txt')
+    open('pix_cache.txt', 'w').close()
+    globals.pix_cache.clear()
 
-        print(f"(5/{steps_count}) Caching descriptions...")
-        if os.path.exists('desc_cache.txt'):
-            os.remove('desc_cache.txt')
-        else:
-            open('desc_cache.txt', 'w').close()
-        globals.desc_cache.clear()
+    themes = utils.list_config_available("themes")
+    backgrounds = utils.theme_images()
+    for theme in themes:
+        background=str(backgrounds[themes.index(theme)])
+        if background != "None":
+            Brightness = gui.brightness(background)   
+            pixmapByteArray = gui.buttonPixmap(bg=background, rounded=True, width=284, height=160, typing="ByteArray")
+            globals.pix_cache[background] = [pixmapByteArray, Brightness]                
+            with open('pix_cache.txt', 'a') as f:
+                f.write(f'{background}: {str(pixmapByteArray.toBase64())}, {Brightness}\n') 
+    print("Finished caching pixmaps!\n")
 
-        extensions=[]
-        descriptions = utils.extension_descriptions()
-        for extension in utils.list_config_available("extensions"):
-            if extension.lower()[:-3] not in [x.lower() for x in utils.list_config_available("themes")]:
-                extensions.append(extension)
+    
+    print(f"(5/{steps_count}) Caching descriptions...")
+    if os.path.exists('desc_cache.txt'):
+        os.remove('desc_cache.txt')
+    else:
+        open('desc_cache.txt', 'w').close()
+    globals.desc_cache.clear()
 
-        for extension in extensions:
-            if extension[:-3] not in globals.desc_cache:
-                globals.desc_cache[extension[:-3]] = descriptions[extensions.index(extension)]
-                with open("desc_cache.txt", "a") as f:
-                    f.write(
-                        f'{extension[:-3]}: {descriptions[extensions.index(extension)]}\n'
-                    )
-        print("Finished caching extension descriptions!\n")
+    extensions=[]
+    descriptions = utils.extension_descriptions()
+    for extension in utils.list_config_available("extensions"):
+        if extension.lower()[:-3] not in [x.lower() for x in utils.list_config_available("themes")]:
+            extensions.append(extension)
+
+    for extension in extensions:
+        if extension[:-3] not in globals.desc_cache:
+            globals.desc_cache[extension[:-3]] = descriptions[extensions.index(extension)]
+            with open("desc_cache.txt", "a") as f:
+                f.write(
+                    f'{extension[:-3]}: {descriptions[extensions.index(extension)]}\n'
+                )
+    print("Finished caching extension descriptions!\n")
 
 
 async def update_app():

modules/globals.py

@@ -7,20 +7,20 @@
 ## All '__xyz__' variables are temporary variables used for re-assigning.
 
 # Github Variables
-RELEASE = "3.1"
+RELEASE = "3.2"
 HOMEPAGE = "https://github.com/ohitstom/spicetify-easyinstall"
 WATERMARK = "Spicetify EasyInstall by OhItsTom and WillyJL" 
 
 # Download URLS
-SPOTIFY_URL = "https://upgrade.scdn.co/upgrade/client/win32-x86/spotify_installer-1.1.91.824.g07f1e963-9.exe"
-THEMES_URL = "https://codeload.github.com/spicetify/spicetify-themes/zip/dcf9a4d805ec6cdc9b6ee70d908b04879aea8207"
-ADDONS_URL = "https://codeload.github.com/spicetify/spicetify-cli/zip/5a8a4ae048d1962a2c3663f26a161fec88ebcc49"
+SPOTIFY_URL = "https://upgrade.scdn.co/upgrade/client/win32-x86/spotify_installer-1.1.94.864.g540a4cc6-12.exe"
+THEMES_URL = "https://codeload.github.com/spicetify/spicetify-themes/zip/0f7a687e76c525e4013a7f82ccb15e11cc30475a"
+ADDONS_URL = "https://codeload.github.com/spicetify/spicetify-cli/zip/1bda2cffa39bb71d8bad6ff58c9712d1d60aef0a"
 __SPOTIFY_URL__ = SPOTIFY_URL
 __THEMES_URL__ = THEMES_URL
 __ADDONS_URL__ = ADDONS_URL
 
 # Version Variables
-SPICETIFY_VERSION = "2.11.1"
+SPICETIFY_VERSION = "2.13.1"
 SPOTIFY_VERSION = "/".join(SPOTIFY_URL.split("/")[-1:])
 THEMES_VERSION = f"spicetify-themes-{'/'.join(THEMES_URL.split('/')[-1:])}"
 ADDONS_VERSION = f"spicetify-cli-{'/'.join(ADDONS_URL.split('/')[-1:])}"
@@ -75,11 +75,11 @@
 }
 
 CUSTOM_APPS = {
-    "https://codeload.github.com/spicetify/spicetify-marketplace/zip/cdc3e1dde8acc89237c65dc752c5f65ec7d422ed": f"{spice_config}\\CustomApps\\marketplace.zip",
+    "https://codeload.github.com/spicetify/spicetify-marketplace/zip/160209c0527c8785784f67199fbe5b91732d1436": f"{spice_config}\\CustomApps\\marketplace.zip",
 }
 
 CUSTOM_THEMES = {
-    "https://codeload.github.com/Comfy-Themes/Spicetify/zip/0d5bc648da0bc3e746dab47a4762039eda72d1fc": f"{spice_config}\\Themes\\Comfy-Collection.zip",
+    "https://codeload.github.com/Comfy-Themes/Spicetify/zip/b80a46f012d2e3b9f49b42d76d3f4df634f367c1": f"{spice_config}\\Themes\\Comfy-Collection.zip",
 }
 
 # Text Pages For GUI

modules/gui.py

@@ -34,7 +34,7 @@
 TEXT_COLOR = "#EDEDED"
 DISABLED_TEXT_COLOR = "#222222"
 
-ANIM_TYPE = QtCore.QEasingCurve.InBack
+ANIM_TYPE = QtCore.QEasingCurve.InOutQuart
 ANIM_DURATION = 300
 
 QSS = f"""
@@ -281,6 +281,8 @@ def __init__(self):
             spacing=0,
         )
 
+        self.exit_request = asyncio.Event()
+        
         self.setWindowTitle("Spicetify EasyInstall")
         self.setWindowIcon(QtGui.QIcon("resources/icons/icon.png"))
 
@@ -296,6 +298,9 @@ def __init__(self):
 
         self.bottom_bar = BottomBar(parent=self)
         self.layout().addWidget(self.bottom_bar)
+    
+    def closeEvent(self, *args):
+        self.exit_request.set()    
 
 
 class SlidingFrame(QuickWidget):

resources/notes/to_do.txt

@@ -11,6 +11,6 @@ Optional:
     -Better image scanning for backgrounds to make text pop
     -Future dropdown for patchnotes.
     -Custom Titlebar
-    -Benign Socket Errors
     -Crossplatform?
+    -Smoother screen slide