lushapp 2.0.2 → 2.0.4

package/README.md

@@ -44,6 +44,18 @@ lush
 lushapp
 ```
 
+### Update to Latest Version
+```bash
+lush update
+# or
+lushapp update
+
+# Manual package updates:
+npm install -g lushapp@latest
+# or
+pip install --upgrade lushapp
+```
+
 ### Clone & Run from Source
 ```bash
 git clone https://github.com/pseudoshell/lush.git

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lushapp",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "A hyper-aesthetic terminal radio player with 560+ live stations, real-time CAVA DSP audio visualizers, ambient soundscapes, and artist discographies.",
   "main": "bin/lush.js",
   "bin": {

package/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "lushapp"
-version = "2.0.2"
+version = "2.0.4"
 description = "A hyper-aesthetic terminal radio player with 560+ live stations, real-time CAVA DSP visualizers, and artist discographies."
 readme = "README.md"
 authors = [{ name = "pseudoshell" }]

package/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="lushapp",
-    version="2.0.2",
+    version="2.0.4",
     package_dir={"": "src"},
     packages=find_packages(where="src"),
     include_package_data=True,

package/src/lush/__init__.py

@@ -2,7 +2,7 @@ import os
 import sys
 os.environ["ESCDELAY"] = "25"
 
-__version__ = "2.0.2"
+__version__ = "2.0.4"
 
 def run_app():
     try:

package/src/lush/__main__.py

@@ -3,7 +3,66 @@ import sys
 import argparse
 from . import __version__, run_app
 
+def update_lush():
+    """Detects installation method and automatically updates the lushapp package."""
+    import shutil
+    import subprocess
+    from . import __version__
+
+    print("\033[1;95m┌────────────────────────────────────────────────────────────────────────┐\033[0m")
+    print(f"\033[1;95m│\033[0m  \033[1;96mLUSH (Audiophile Edition)\033[0m — Automated Package Updater                 \033[1;95m│\033[0m")
+    print(f"\033[1;95m│\033[0m  Current Version: \033[1;92mv{__version__:<10}\033[0m  Package Name: \033[1;93mlushapp\033[0m                    \033[1;95m│\033[0m")
+    print("\033[1;95m└────────────────────────────────────────────────────────────────────────┘\033[0m\n")
+
+    # 1. Check if installed via npm
+    if shutil.which("npm"):
+        try:
+            check_npm = subprocess.run(["npm", "ls", "-g", "lushapp", "--depth=0"], capture_output=True, text=True)
+            if "lushapp@" in check_npm.stdout or "lushapp" in check_npm.stdout:
+                print("\033[1;96m> Detected global npm installation. Updating lushapp...\033[0m")
+                print("Running: \033[1;92mnpm install -g lushapp@latest\033[0m\n")
+                res = subprocess.run(["npm", "install", "-g", "lushapp@latest"])
+                if res.returncode == 0:
+                    print("\n\033[1;92m✓ Successfully updated lushapp to the latest version via npm!\033[0m")
+                    print("Run \033[1;96mlush\033[0m or \033[1;96mlushapp\033[0m to launch.\n")
+                    sys.exit(0)
+        except Exception:
+            pass
+
+    # 2. Check if installed via pipx
+    if shutil.which("pipx"):
+        try:
+            check_pipx = subprocess.run(["pipx", "list"], capture_output=True, text=True)
+            if "lushapp" in check_pipx.stdout:
+                print("\033[1;96m> Detected pipx installation. Updating lushapp...\033[0m")
+                print("Running: \033[1;92mpipx upgrade lushapp\033[0m\n")
+                res = subprocess.run(["pipx", "upgrade", "lushapp"])
+                if res.returncode == 0:
+                    print("\n\033[1;92m✓ Successfully updated lushapp via pipx!\033[0m\n")
+                    sys.exit(0)
+        except Exception:
+            pass
+
+    # 3. Check if installed via pip / Python
+    pip_cmd = [sys.executable, "-m", "pip", "install", "--upgrade", "lushapp"]
+    print("\033[1;96m> Updating lushapp via pip...\033[0m")
+    print(f"Running: \033[1;92m{' '.join(pip_cmd)}\033[0m\n")
+    res = subprocess.run(pip_cmd)
+    if res.returncode == 0:
+        print("\n\033[1;92m✓ Successfully updated lushapp to the latest version!\033[0m")
+        print("Run \033[1;96mlush\033[0m or \033[1;96mlushapp\033[0m to launch.\n")
+        sys.exit(0)
+
+    # 4. Fallback info
+    print("\n\033[1;93m[NOTICE]\033[0m To manually update LUSH, run:")
+    print("  • npm:  \033[1;96mnpm install -g lushapp@latest\033[0m")
+    print("  • pip:  \033[1;96mpip install --upgrade lushapp\033[0m\n")
+    sys.exit(0)
+
 def main():
+    if any(arg in sys.argv[1:] for arg in ("update", "upgrade", "--update", "-U")):
+        update_lush()
+
     parser = argparse.ArgumentParser(
         prog="lush",
         description="LUSH - A hyper-aesthetic terminal radio player with 560+ live stations and real-time CAVA DSP visualizers.",
@@ -11,10 +70,15 @@ def main():
     )
     parser.add_argument("-v", "--version", action="version", version=f"LUSH v{__version__} (Audiophile Edition)")
     parser.add_argument("--test", action="store_true", help="Run internal self-test diagnostics")
+    parser.add_argument("--update", action="store_true", help="Update lushapp package to the latest release")
+    parser.add_argument("command", nargs="?", help="Optional subcommand (e.g. 'update', 'test')")
 
     args, unknown = parser.parse_known_args()
 
-    if args.test:
+    if args.command in ("update", "upgrade") or args.update:
+        update_lush()
+
+    if args.test or args.command == "test":
         from pathlib import Path
         test_cands = [
             Path(__file__).resolve().parent.parent.parent / "tests" / "run_tests.py",

package/src/lush/audio.py

@@ -12,40 +12,147 @@ except Exception:
     HAS_MPV_LIB = False
 
 
+import threading
+import requests
+
 class CLIPlayer:
     """Universal subprocess-based audio player fallback (supports mpv, ffplay, vlc)."""
     def __init__(self, volume: int = 100, user_agent: str = "LUSH/2.0 (Terminal Audio Player)"):
-        self.volume = volume
+        self._volume = volume
         self.user_agent = user_agent
         self.proc = None
-        self.pause = False
+        self._pause = False
         self.current_url = None
+        self.metadata = {}
+        self._meta_thread = None
+        self._stop_meta = False
+
+    @property
+    def pause(self) -> bool:
+        return self._pause
+
+    @pause.setter
+    def pause(self, val: bool):
+        self._pause = val
+        if val:
+            # Pause playback
+            if self.proc and self.proc.poll() is None:
+                if shutil.which("mpv") and self.proc.stdin:
+                    try:
+                        self.proc.stdin.write(b"set pause yes\n")
+                        self.proc.stdin.flush()
+                        return
+                    except Exception:
+                        pass
+                self.stop()
+        else:
+            # Resume playback
+            if self.proc and self.proc.poll() is None:
+                if shutil.which("mpv") and self.proc.stdin:
+                    try:
+                        self.proc.stdin.write(b"set pause no\n")
+                        self.proc.stdin.flush()
+                        return
+                    except Exception:
+                        pass
+            if self.current_url:
+                self.play(self.current_url)
+
+    @property
+    def volume(self) -> int:
+        return self._volume
+
+    @volume.setter
+    def volume(self, val: int):
+        self._volume = max(0, min(100, int(val)))
+        if self.proc and self.proc.poll() is None and self.proc.stdin and shutil.which("mpv"):
+            try:
+                self.proc.stdin.write(f"set volume {self._volume}\n".encode())
+                self.proc.stdin.flush()
+            except Exception:
+                pass
+
+    def _meta_worker(self, url: str):
+        try:
+            r = requests.get(
+                url,
+                headers={"Icy-MetaData": "1", "User-Agent": self.user_agent},
+                stream=True,
+                timeout=5
+            )
+            icy_br = r.headers.get("icy-br") or r.headers.get("ice-bitrate")
+            if icy_br:
+                self.metadata["icy-br"] = str(icy_br)
+
+            metaint = int(r.headers.get("icy-metaint", 0))
+            if metaint > 0:
+                while self.current_url == url and not self._stop_meta:
+                    data = r.raw.read(metaint)
+                    if not data:
+                        break
+                    len_byte = r.raw.read(1)
+                    if not len_byte:
+                        break
+                    meta_len = len_byte[0] * 16
+                    if meta_len > 0:
+                        meta_bytes = r.raw.read(meta_len)
+                        try:
+                            meta_str = meta_bytes.decode("utf-8", errors="ignore")
+                        except Exception:
+                            meta_str = meta_bytes.decode("latin-1", errors="ignore")
+                        m = re.search(r"StreamTitle='(.*?)';", meta_str)
+                        if m:
+                            stream_title = m.group(1).strip()
+                            if stream_title:
+                                self.metadata["icy-title"] = stream_title
+                                self.metadata["title"] = stream_title
+            r.close()
+        except Exception:
+            pass
 
     def play(self, url: str):
         self.stop()
         self.current_url = url
-        self.pause = False
+        self._pause = False
+        self.metadata = {}
+        self._stop_meta = False
 
         if shutil.which("mpv"):
-            cmd = ["mpv", "--no-video", "--no-terminal", f"--volume={self.volume}", f"--user-agent={self.user_agent}", url]
+            cmd = [
+                "mpv",
+                "--no-video",
+                "--no-terminal",
+                "--input-terminal=no",
+                f"--volume={self._volume}",
+                f"--user-agent={self.user_agent}",
+                url
+            ]
+            stdin_mode = subprocess.PIPE
         elif shutil.which("ffplay"):
-            cmd = ["ffplay", "-nodisp", "-autoexit", "-loglevel", "quiet", "-volume", str(int(self.volume)), url]
+            cmd = ["ffplay", "-nodisp", "-autoexit", "-loglevel", "quiet", "-volume", str(int(self._volume)), url]
+            stdin_mode = subprocess.DEVNULL
         elif shutil.which("cvlc"):
-            cmd = ["cvlc", "--no-video", "--gain", str(self.volume / 100.0), url]
+            cmd = ["cvlc", "--no-video", "--gain", str(self._volume / 100.0), url]
+            stdin_mode = subprocess.DEVNULL
         else:
             return
 
         try:
             self.proc = subprocess.Popen(
                 cmd,
-                stdin=subprocess.DEVNULL,
+                stdin=stdin_mode,
                 stdout=subprocess.DEVNULL,
                 stderr=subprocess.DEVNULL
             )
         except Exception:
             self.proc = None
 
+        if url.startswith("http://") or url.startswith("https://"):
+            self._meta_thread = threading.Thread(target=self._meta_worker, args=(url,), daemon=True)
+            self._meta_thread.start()
+
     def stop(self):
+        self._stop_meta = True
         if self.proc:
             try:
                 self.proc.terminate()

package/src/lush/constants.py

@@ -2,8 +2,8 @@ import re
 # LUSH - Constants and Presets
 
 LOGO_LINES = [
-    " █   █ █ █▀▀ █ █   █▀▀█",
-    " █▄▄ █▄█ ▄██ █▀█  ██ ██"
+    " █   █ █ █▀▀ █ █   █▀▀▀█",
+    " █▄▄ █▄█ ▄██ █▀█  ██  ██"
 ]
 
 COMPACT_LOGO = "LUSH ♫"

package/src/lush/notify.py

@@ -139,16 +139,30 @@ class NotificationManager:
 
     @staticmethod
     def _dispatch_windows(title: str, body: str):
-        safe_title = title.replace('"', '`"')
-        safe_body = body.replace('"', '`"')
-        ps_script = f'''
-        [Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime] > $null
-        $template = [Windows.UI.Notifications.ToastNotificationManager]::GetTemplateContent([Windows.UI.Notifications.ToastTemplateType]::ToastText02)
-        $textNodes = $template.GetElementsByTagName("text")
-        $textNodes.Item(0).AppendChild($template.CreateTextNode("{safe_title} - Now Playing")) > $null
-        $textNodes.Item(1).AppendChild($template.CreateTextNode("{safe_body}")) > $null
-        $notifier = [Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier("LUSH")
-        $notification = [Windows.UI.Notifications.ToastNotification]::new($template)
-        $notifier.Show($notification)
-        '''
-        subprocess.run(["powershell", "-NoProfile", "-Command", ps_script], capture_output=True, timeout=3.0)
+        import base64
+        import html
+        safe_title = html.escape(f"{title} - Now Playing")
+        safe_body = html.escape(body)
+        ps_script = f"""[Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime] | Out-Null
+[Windows.Data.Xml.Dom.XmlDocument, Windows.Data.Xml.Dom.XmlDocument, ContentType = WindowsRuntime] | Out-Null
+$template = @"
+<toast>
+  <visual>
+    <binding template="ToastGeneric">
+      <text>{safe_title}</text>
+      <text>{safe_body}</text>
+    </binding>
+  </visual>
+</toast>
+"@
+$xml = New-Object Windows.Data.Xml.Dom.XmlDocument
+$xml.LoadXml($template)
+$toast = [Windows.UI.Notifications.ToastNotification]::new($xml)
+$appId = '{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}}\\WindowsPowerShell\\v1.0\\powershell.exe'
+[Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier($appId).Show($toast)
+"""
+        try:
+            enc = base64.b64encode(ps_script.encode("utf-16le")).decode("ascii")
+            subprocess.run(["powershell", "-NoProfile", "-NonInteractive", "-EncodedCommand", enc], capture_output=True, timeout=3.0)
+        except Exception:
+            pass

package/src/lush/ui.py

@@ -179,7 +179,10 @@ def curses_main(stdscr, state: PlayerState):
                     cava_bars = list(state.cava.bars) if (hasattr(state, "cava") and state.cava) else None
                     p_id = get_shimmer_color_pair(shimmer_eff, x_norm, c_idx, row_i, t_now, cava_bars=cava_bars, is_playing=state.playing)
                     attr = curses.color_pair(p_id) | curses.A_BOLD
-                    stdscr.addstr(1 + row_i, 2 + c_idx, ch, attr)
+                    try:
+                        stdscr.addstr(1 + row_i, 2 + c_idx, ch, attr)
+                    except Exception:
+                        pass
             main_start_y = 4
         else:
             for c_idx, ch in enumerate(COMPACT_LOGO):
@@ -187,7 +190,10 @@ def curses_main(stdscr, state: PlayerState):
                 cava_bars = list(state.cava.bars) if (hasattr(state, "cava") and state.cava) else None
                 p_id = get_shimmer_color_pair(shimmer_eff, x_norm, c_idx, 0, t_now, cava_bars=cava_bars, is_playing=state.playing)
                 attr = curses.color_pair(p_id) | curses.A_BOLD
-                stdscr.addstr(0, 2 + c_idx, ch, attr)
+                try:
+                    stdscr.addstr(0, 2 + c_idx, ch, attr)
+                except Exception:
+                    pass
             main_start_y = 2
 
         # Right side stats: Real Live Network Speeds (↓ Down / ↑ Up) + Bitrate + Rec

package/src/lush/ui_helpers.py

@@ -23,9 +23,21 @@ def trim(text: str, width: int) -> str:
     if width <= 3: return text[:width]
     return text[:width-3] + "..."
 
-def apply_theme(theme_name: str, themes: dict):
+_CURRENT_THEME = None
+
+def apply_theme(theme_name: str, themes: dict, force: bool = False):
+    global _CURRENT_THEME
     if not curses.has_colors():
         return
+    if not force and _CURRENT_THEME == theme_name:
+        return
+    _CURRENT_THEME = theme_name
+
+    try:
+        curses.use_default_colors()
+    except Exception:
+        pass
+
     t = themes.get(theme_name, themes.get("Plur1bus", list(themes.values())[0]))
     is_256 = curses.COLORS >= 256