spolyrics 1.2.2__tar.gz → 1.2.4__tar.gz

{spolyrics-1.2.2/spolyrics.egg-info → spolyrics-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spolyrics
-Version: 1.2.2
+Version: 1.2.4
 Summary: A minimalist, borderless, zero-delay synced lyrics miniplayer for Spotify on Windows.
 Author: SpoLyrics Team
 Requires-Python: >=3.8

{spolyrics-1.2.2 → spolyrics-1.2.4}/main.py

@@ -15,7 +15,7 @@ from assets import ICON_B64
 from tkinter import messagebox
 from winsdk.windows.media.control import GlobalSystemMediaTransportControlsSessionManager as MediaManager
 
-CURRENT_VERSION = "1.2.2"
+CURRENT_VERSION = "1.2.4"
 CONFIG_PATH = os.path.join(os.environ.get("APPDATA", ""), "SpoLyrics", "config.json")
 APP_DIR = os.path.join(os.environ.get("APPDATA", ""), "SpoLyrics")
 os.makedirs(APP_DIR, exist_ok=True)
@@ -94,6 +94,10 @@ def get_exe_path():
     script_exe = os.path.join(sys.prefix, 'Scripts', 'spolyrics.exe')
     if os.path.exists(script_exe):
         return script_exe
+    
+    pythonw = os.path.join(sys.prefix, 'pythonw.exe')
+    if os.path.exists(pythonw):
+        return (pythonw, os.path.abspath(__file__))
     return sys.executable
 
 def set_auto_start(enable, force_update=False):
@@ -104,7 +108,11 @@ def set_auto_start(enable, force_update=False):
             exe_path = get_exe_path()
             if exe_path and os.path.exists(icon_path):
                 if force_update or not os.path.exists(STARTUP_SHORTCUT):
-                    ps_script = f"$s=(New-Object -COM WScript.Shell).CreateShortcut('{STARTUP_SHORTCUT}');$s.TargetPath='{exe_path}';$s.IconLocation='{icon_path}';$s.Save()"
+                    if isinstance(exe_path, tuple):
+                        target, args = exe_path
+                        ps_script = f"$s=(New-Object -COM WScript.Shell).CreateShortcut('{STARTUP_SHORTCUT}');$s.TargetPath='{target}';$s.Arguments='\"{args}\"';$s.IconLocation='{icon_path}';$s.Save()"
+                    else:
+                        ps_script = f"$s=(New-Object -COM WScript.Shell).CreateShortcut('{STARTUP_SHORTCUT}');$s.TargetPath='{exe_path}';$s.IconLocation='{icon_path}';$s.Save()"
                     subprocess.run(["powershell", "-Command", ps_script], creationflags=0x08000000)
         else:
             if os.path.exists(STARTUP_SHORTCUT):
@@ -186,6 +194,20 @@ class MiniLyrics:
         self.render_lyrics()
         threading.Thread(target=self.poll_song, daemon=True).start()
 
+    def get_tray_menu(self):
+        import pystray
+        items = [
+            pystray.MenuItem("Shortcuts & Info", self.tray_callbacks['on_info']),
+            pystray.MenuItem("Settings", self.tray_callbacks['on_settings']),
+            pystray.MenuItem("Toggle Visibility", self.tray_callbacks['on_toggle_lyrics']),
+            pystray.MenuItem("Quit", self.tray_callbacks['on_quit']),
+            pystray.MenuItem(f"v{CURRENT_VERSION}", lambda: None, enabled=False)
+        ]
+        if getattr(self, 'update_available', False):
+            items.insert(0, pystray.MenuItem("🔥 Update Available!", lambda: self.root.after(0, self.prompt_update)))
+        return pystray.Menu(*items)
+
+
     def render_lyrics(self):
         if self.synced_lyrics:
             pos = self.base_pos
@@ -769,21 +791,31 @@ class MiniLyrics:
     def show_update_prompt(self, latest):
         self.update_available = latest
         if getattr(self, 'tray_icon', None):
-            self.tray_icon.update_menu()
+            self.tray_icon.menu = self.get_tray_menu()
             
         res = messagebox.askyesno("Update Available", f"A new version of SpoLyrics (v{latest}) is available!\n\nYou are currently on v{CURRENT_VERSION}.\nWould you like to update now?")
         if res:
             import tempfile
             bat_path = os.path.join(tempfile.gettempdir(), "update_spolyrics.bat")
             exe_path = get_exe_path()
+            
+            # Extract arguments if get_exe_path returns pythonw.exe + main.py
+            exe_cmd = f'"{exe_path}"'
+            if isinstance(exe_path, tuple):
+                exe_cmd = f'"{exe_path[0]}" "{exe_path[1]}"'
+                
             with open(bat_path, 'w') as f:
                 f.write('@echo off\n')
                 f.write('echo Updating SpoLyrics...\n')
                 f.write('ping 127.0.0.1 -n 3 > nul\n')
-                f.write('python -m pip install --upgrade spolyrics\n')
-                f.write(f'start "" "{exe_path}"\n')
+                import sys
+                f.write(f'"{sys.executable}" -m pip install --upgrade --no-cache-dir spolyrics\n')
+                f.write(f'start "" {exe_cmd}\n')
                 f.write('del "%~f0"\n')
-            subprocess.Popen(['cmd.exe', '/c', bat_path], creationflags=16)
+            
+            # Run bat silently without creating a window
+            import subprocess
+            subprocess.Popen(['cmd.exe', '/c', bat_path], creationflags=0x08000000)
             if getattr(self, 'tray_icon', None):
                 self.tray_icon.stop()
             self.root.quit()
@@ -815,15 +847,19 @@ def create_shortcut():
             with open(path_file, 'r') as f:
                 saved_path = f.read().strip()
                 
-        if saved_path != exe_path:
+        if saved_path != str(exe_path):
             needs_update = True
             path_changed = True
             with open(path_file, 'w') as f:
-                f.write(exe_path)
+                f.write(str(exe_path))
             
         if needs_update:
             if exe_path:
-                ps_script = f"$s=(New-Object -COM WScript.Shell).CreateShortcut('{shortcut_path}');$s.TargetPath='{exe_path}';$s.IconLocation='{icon_path}';$s.Save()"
+                if isinstance(exe_path, tuple):
+                    target, args = exe_path
+                    ps_script = f"$s=(New-Object -COM WScript.Shell).CreateShortcut('{shortcut_path}');$s.TargetPath='{target}';$s.Arguments='\"{args}\"';$s.IconLocation='{icon_path}';$s.Save()"
+                else:
+                    ps_script = f"$s=(New-Object -COM WScript.Shell).CreateShortcut('{shortcut_path}');$s.TargetPath='{exe_path}';$s.IconLocation='{icon_path}';$s.Save()"
                 subprocess.run(["powershell", "-Command", ps_script], creationflags=0x08000000)
     except Exception as e:
         logging.error("Failed to create shortcut", exc_info=e)
@@ -835,8 +871,7 @@ def setup_tray(app):
         from PIL import Image
         
         def on_quit(icon, item):
-            icon.stop()
-            app.root.quit()
+            app.root.after(0, app.root.quit)
             
         def on_settings(icon, item):
             app.root.after(0, app.open_settings)
@@ -856,19 +891,23 @@ def setup_tray(app):
             logging.error("Failed to open tray icon image, using fallback", exc_info=e)
             image = Image.new('RGB', (64, 64), color = (29, 185, 84))
             
-        def get_menu():
-            items = [
-                pystray.MenuItem("Shortcuts & Info", on_info),
-                pystray.MenuItem("Settings", on_settings),
-                pystray.MenuItem("Toggle Visibility", on_toggle_lyrics),
-                pystray.MenuItem("Quit", on_quit),
-                pystray.MenuItem(f"v{CURRENT_VERSION}", lambda: None, enabled=False)
-            ]
-            if getattr(app, 'update_available', False):
-                items.insert(0, pystray.MenuItem("🔥 Update Available!", lambda: app.root.after(0, app.prompt_update)))
-            return pystray.Menu(*items)
-            
-        icon = pystray.Icon("SpoLyrics", image, "SpoLyrics", menu=get_menu)
+        app.tray_callbacks = {
+            'on_quit': on_quit,
+            'on_settings': on_settings,
+            'on_toggle_lyrics': on_toggle_lyrics,
+            'on_info': on_info
+        }
+        
+        app_dir = os.path.join(os.environ.get("APPDATA", ""), "SpoLyrics")
+        icon_path = os.path.join(app_dir, 'icon.ico')
+        
+        try:
+            image = Image.open(icon_path)
+        except Exception as e:
+            logging.error("Failed to open tray icon image, using fallback", exc_info=e)
+            image = Image.new('RGB', (64, 64), color = (29, 185, 84))
+            
+        icon = pystray.Icon("SpoLyrics", image, "SpoLyrics", menu=app.get_tray_menu())
         app.tray_icon = icon
         threading.Thread(target=icon.run, daemon=True).start()
     except Exception as e:

{spolyrics-1.2.2 → spolyrics-1.2.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='spolyrics',
-    version='1.2.2',
+    version='1.2.4',
     description='A minimalist, borderless, zero-delay synced lyrics miniplayer for Spotify on Windows.',
     long_description=open('README.md', 'r', encoding='utf-8').read(),
     long_description_content_type='text/markdown',

{spolyrics-1.2.2 → spolyrics-1.2.4/spolyrics.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spolyrics
-Version: 1.2.2
+Version: 1.2.4
 Summary: A minimalist, borderless, zero-delay synced lyrics miniplayer for Spotify on Windows.
 Author: SpoLyrics Team
 Requires-Python: >=3.8