lushapp 2.0.3 → 2.0.5

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.3",
+  "version": "2.0.5",
   "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.3"
+version = "2.0.5"
 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.3",
+    version="2.0.5",
     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.3"
+__version__ = "2.0.5"
 
 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,6 +12,9 @@ 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)"):
@@ -20,6 +23,9 @@ class CLIPlayer:
         self.proc = None
         self._pause = False
         self.current_url = None
+        self.metadata = {}
+        self._meta_thread = None
+        self._stop_meta = False
 
     @property
     def pause(self) -> bool:
@@ -66,10 +72,50 @@ class CLIPlayer:
             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.metadata = {}
+        self._stop_meta = False
 
         if shutil.which("mpv"):
             cmd = [
@@ -101,7 +147,12 @@ class CLIPlayer:
         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

@@ -646,41 +646,41 @@ SHIMMER_EFFECT_LABELS = {
 }
 
 SHIMMER_PALETTES = {
-    "Brat Lime": [231, 190, 154, 118, 46],
-    "Toxic Latex": [231, 219, 198, 196, 161],
-    "Blohsh Acid": [231, 155, 118, 46, 28],
-    "Lover Pastel": [231, 225, 218, 189, 117],
+    "Brat Lime": [231, 190, 154, 118, 154],
+    "Toxic Latex": [231, 219, 205, 198, 198],
+    "Blohsh Acid": [231, 155, 118, 82, 46],
+    "Lover Pastel": [231, 225, 218, 189, 218],
     "Guts Sour": [231, 207, 177, 141, 129],
-    "Born to Die": [231, 222, 174, 160, 88],
-    "After Hours": [231, 220, 196, 51, 160],
-    "Random Access": [231, 254, 220, 214, 178],
-    "Short n Sweet": [231, 230, 218, 172, 130],
-    "She Wolf": [231, 221, 214, 208, 166],
-    "Padam Fever": [231, 205, 198, 161, 125],
-    "Spice World": [231, 201, 214, 45, 27],
-    "Barbie Dreamhouse": [231, 225, 213, 200, 163],
-    "Cyber Lotus": [231, 219, 207, 48, 30],
-    "Moonlight": [231, 189, 141, 105, 60],
+    "Born to Die": [231, 222, 174, 160, 160],
+    "After Hours": [231, 220, 203, 196, 196],
+    "Random Access": [231, 254, 220, 214, 220],
+    "Short n Sweet": [231, 230, 225, 218, 218],
+    "She Wolf": [231, 221, 214, 208, 214],
+    "Padam Fever": [231, 205, 198, 161, 161],
+    "Spice World": [231, 117, 75, 39, 27],
+    "Barbie Dreamhouse": [231, 225, 213, 200, 200],
+    "Cyber Lotus": [231, 219, 207, 171, 207],
+    "Moonlight": [231, 189, 147, 105, 105],
     "Hot Pink": [231, 225, 219, 205, 198],
     "Cyber Barbie": [231, 225, 213, 207, 201],
-    "Pink Velvet": [231, 224, 218, 206, 161],
-    "Cotton Candy": [231, 224, 218, 189, 117],
-    "Strawberry Milk": [231, 225, 224, 217, 210],
-    "Sakura Bloom": [231, 225, 218, 211, 175],
-    "Plur1bus": [231, 159, 51, 45, 38],
-    "Synthwave": [231, 225, 205, 198, 162],
-    "Cyberpunk 2077": [231, 226, 220, 214, 198],
+    "Pink Velvet": [231, 224, 218, 206, 198],
+    "Cotton Candy": [231, 224, 218, 189, 218],
+    "Strawberry Milk": [231, 225, 224, 217, 217],
+    "Sakura Bloom": [231, 225, 218, 211, 218],
+    "Plur1bus": [231, 159, 123, 51, 45],
+    "Synthwave": [231, 225, 205, 198, 198],
+    "Cyberpunk 2077": [231, 226, 220, 214, 226],
     "Laser Purple": [231, 219, 198, 141, 129],
-    "Neon Genesis": [231, 226, 208, 129, 46],
-    "Matrix": [231, 157, 120, 46, 28],
-    "OLED Obsidian": [231, 255, 250, 245, 238],
-    "Ghost White": [231, 255, 254, 250, 244],
-    "Blood Moon": [231, 224, 203, 196, 124],
-    "Sunset Horizon": [231, 223, 215, 208, 168],
-    "Vapor Mint": [231, 159, 121, 85, 51],
-    "Peach Blossom": [231, 223, 222, 216, 210],
-    "Oceanic Abyss": [231, 195, 80, 45, 27],
-    "Midnight Lavender": [231, 225, 189, 141, 99],
-    "Emerald Glow": [231, 157, 120, 48, 29],
-    "Amber Terminal": [231, 229, 220, 214, 172]
+    "Neon Genesis": [231, 226, 208, 165, 129],
+    "Matrix": [231, 157, 120, 84, 46],
+    "OLED Obsidian": [231, 255, 254, 252, 252],
+    "Ghost White": [231, 255, 254, 250, 231],
+    "Blood Moon": [231, 224, 203, 196, 196],
+    "Sunset Horizon": [231, 223, 215, 208, 208],
+    "Vapor Mint": [231, 159, 121, 85, 85],
+    "Peach Blossom": [231, 223, 222, 216, 216],
+    "Oceanic Abyss": [231, 195, 123, 51, 45],
+    "Midnight Lavender": [231, 225, 189, 141, 141],
+    "Emerald Glow": [231, 157, 120, 84, 48],
+    "Amber Terminal": [231, 229, 220, 214, 214]
 }

package/src/lush/ui_helpers.py

@@ -82,19 +82,19 @@ def apply_theme(theme_name: str, themes: dict, force: bool = False):
 
     # Shimmer gradient color pairs 10 - 14
     if is_256:
-        shimmer_cols = SHIMMER_PALETTES.get(theme_name, SHIMMER_PALETTES["Plur1bus"])
+        shimmer_cols = SHIMMER_PALETTES.get(theme_name, [231, accent, accent, accent, accent])
         curses.init_pair(10, shimmer_cols[0], -1)  # Peak White Hot Sparkle
         curses.init_pair(11, shimmer_cols[1], -1)  # Sheen Highlight
         curses.init_pair(12, shimmer_cols[2], -1)  # Neon Glow
         curses.init_pair(13, shimmer_cols[3], -1)  # Mid Glow
-        curses.init_pair(14, shimmer_cols[4], -1)  # Base Tone
+        curses.init_pair(14, accent, -1)           # Base Tone: EXACT Theme Primary Accent!
         curses.init_pair(15, 196, -1)              # Glowing Red (REC indicator)
     else:
         curses.init_pair(10, curses.COLOR_WHITE, -1)
         curses.init_pair(11, curses.COLOR_WHITE, -1)
-        curses.init_pair(12, curses.COLOR_CYAN, -1)
-        curses.init_pair(13, curses.COLOR_CYAN, -1)
-        curses.init_pair(14, curses.COLOR_CYAN, -1)
+        curses.init_pair(12, accent, -1)
+        curses.init_pair(13, accent, -1)
+        curses.init_pair(14, accent, -1)
         curses.init_pair(15, curses.COLOR_RED, -1)
 
 import math