flow-twinx 0.2.0__tar.gz → 0.3.0__tar.gz

{flow_twinx-0.2.0 → flow_twinx-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flow-twinx
-Version: 0.2.0
+Version: 0.3.0
 Summary: A terminal music player with online and offline modes
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown

{flow_twinx-0.2.0 → flow_twinx-0.3.0}/flow_twinx/Offline/commands.py

@@ -1,10 +1,22 @@
 import random
-from ..imports import config, merge_flags, tprint, is_connected
+from ..imports import config, merge_flags, is_connected
 from .. import shortcuts
 from .. import help_detail
 from . import file as lib
 from . import player
 
+P = config.Primary
+S = config.Secondary
+T = config.Tertiary
+M = config.Muted
+E = config.Red
+G = config.Grey
+R = config.Reset
+
+m = lambda t: print(f"{M}{t}{R}")
+e = lambda t: print(f"{E}{t}{R}")
+i = lambda t: print(f"{P if config.Mode == 'Online' else S}{t}{R}")
+
 try:
     import readline
     _HAS_READLINE = True
@@ -22,13 +34,10 @@ COMMANDS = {
     "switch":  "Switch to Online mode (checks connection)",
     "help":    "Show this help message",
     "short":   "Show/update command shortcuts",
+    "config":  "Change primary/secondary/tertiary colors",
     "exit":    "Exit Flow",
 }
 
-m = tprint(color="grey", border="none")
-e = tprint(color="red", border="none")
-i = tprint(color="theme", border="none")
-
 
 class _Completer:
     def __init__(self):
@@ -84,6 +93,8 @@ def run(cmd: str, extra: list[str], args):
         show_help(inf)
     elif cmd == "short":
         shortcuts.cmd_short(extra, m)
+    elif cmd == "config":
+        config.cmd_config(extra, args)
     else:
         e(f"Unknown command: {cmd}")
 
@@ -212,23 +223,20 @@ def list_library():
 
 def switch_mode():
     if is_connected():
-        i("Switched to Online mode")
+        pass
     else:
         e("No internet connection")
 
 
 def show_help(inf=False):
-    _t = config.THEMES[config.THEME]["theme"]
-    _g = "\033[90m"
-    _r = "\033[0m"
     if inf:
-        print(f"{_t}Offline Commands (detailed):{_r}")
+        print(f"{T}Offline Commands (detailed):{R}")
         for cmd, lines in help_detail.OFFLINE_HELP.items():
             for line in lines:
-                print(f"  {line.replace('{theme}', _t)}")
+                print(f"  {line}")
             print()
     else:
-        print(f"{_t}Offline Commands:{_r}")
+        print(f"{T}Offline Commands:{R}")
         for cmd, desc in COMMANDS.items():
-            print(f"  {_t}{cmd:12s}{_r} {_g}{desc}{_r}")
-        print(f"{_g}  Use 'help -i' for detailed usage{_r}")
+            print(f"  {T}{cmd:12s}{R} {G}{desc}{R}")
+        print(f"{G}  Use 'help -i' for detailed usage{R}")

{flow_twinx-0.2.0 → flow_twinx-0.3.0}/flow_twinx/Offline/player.py

@@ -1,11 +1,19 @@
 import sys
 import time
 import vlc
-from ..imports import tprint
+from ..imports import config
 
-m = tprint(color="grey", border="none")
-e = tprint(color="red", border="none")
-i = tprint(color="theme", border="none")
+P = config.Primary
+S = config.Secondary
+T = config.Tertiary
+M = config.Muted
+E = config.Red
+R = config.Reset
+
+m = lambda t: print(f"{M}{t}{R}")
+e = lambda t: print(f"{E}{t}{R}")
+i = lambda t: print(f"{P if config.Mode == 'Online' else S}{t}{R}")
+t = lambda t: print(f"{T}{t}{R}")
 
 BAR_WIDTH = 40
 
@@ -48,7 +56,7 @@ def play_file(filepath, title, args=None):
             while player.get_state() not in (vlc.State.Ended, vlc.State.Error):
                 elapsed = time.time() - start
                 bar = _progress_bar(elapsed, duration)
-                sys.stdout.write(f"\r\x1b[35m{bar}\x1b[0m")
+                sys.stdout.write(f"\r{S}{bar}{R}")
                 sys.stdout.flush()
                 time.sleep(0.5)
         except KeyboardInterrupt:

{flow_twinx-0.2.0 → flow_twinx-0.3.0}/flow_twinx/Online/commands.py

@@ -1,17 +1,44 @@
 import pathlib
 import random
+import signal
 import sys
+import termios
 import threading
 import time
-from ..imports import config, merge_flags, tprint
+from ..imports import config, merge_flags
 from .. import shortcuts
 from .. import help_detail
 from . import youtube
 from . import player
 
+P = config.Primary
+S = config.Secondary
+T = config.Tertiary
+M = config.Muted
+E = config.Red
+G = config.Grey
+R = config.Reset
+
+m = lambda t: print(f"{M}{t}{R}")
+e = lambda t: print(f"{E}{t}{R}")
+i = lambda t: print(f"{P if config.Mode == 'Online' else S}{t}{R}")
+
 _last_results = []
 _last_played = None
 
+_radio_quit = False
+_radio_skip = False
+
+
+def _radio_sigint(sig, frame):
+    global _radio_skip
+    _radio_skip = True
+
+
+def _radio_sigquit(sig, frame):
+    global _radio_quit
+    _radio_quit = True
+
 COMMANDS = {
     "play":     "Play a song from YouTube",
     "search":   "Search YouTube for tracks",
@@ -21,13 +48,10 @@ COMMANDS = {
     "switch":   "Switch to Offline mode",
     "help":     "Show this help message",
     "short":    "Show/update command shortcuts",
+    "config":   "Change primary/secondary/tertiary colors",
     "exit":     "Exit Flow",
 }
 
-m = tprint(color="grey", border="none")
-e = tprint(color="red", border="none")
-i = tprint(color="theme", border="none")
-
 def run(cmd: str, extra: list[str], args):
     cmd = shortcuts.resolve(cmd)
     inf = "-i" in extra
@@ -48,6 +72,8 @@ def run(cmd: str, extra: list[str], args):
         radio(extra, args)
     elif cmd == "short":
         shortcuts.cmd_short(extra, m)
+    elif cmd == "config":
+        config.cmd_config(extra, args)
     else:
         print(f"Unknown command: {cmd}")
 
@@ -56,7 +82,7 @@ def _spinner(stop):
     chars = "|/-\\"
     i = 0
     while not stop():
-        sys.stdout.write(f"\r\x1b[36mSearching... {chars[i]}\x1b[0m")
+        sys.stdout.write(f"\r{P}Searching... {chars[i]}{R}")
         sys.stdout.flush()
         time.sleep(0.1)
         i = (i + 1) % len(chars)
@@ -196,30 +222,55 @@ def radio(extra, args):
         playlist_dir.mkdir(parents=True, exist_ok=True)
         m(f"\tDownloading to {playlist_dir}")
 
-    GREEN = "\033[32m"
-    RESET = "\033[0m"
-    for idx, (title, vid, dur) in enumerate(tracks):
-        url = f"https://www.youtube.com/watch?v={vid}"
-        entry = youtube.get_entry(url)
-        short = _truncate_title(title)
-        mins, secs = divmod(int(dur), 60)
-
-        if idx + 1 < len(tracks):
-            n_title, n_vid, n_dur = tracks[idx + 1]
-            n_short = _truncate_title(n_title)
-            n_mins, n_secs = divmod(int(n_dur), 60)
-            print(f"{GREEN}\t→ Next: {n_short:30s} {n_mins}:{n_secs:02d}{RESET}")
-
-        filepath = None
-        if playlist_dir:
-            m(f"\tDownloading {short}...")
-            filepath = youtube.download_url(url, str(playlist_dir))
-            m(f"\tDownloaded to {filepath}")
-
-        try:
-            player.play_entry(entry, title, args, filepath, stop_on_interrupt=True)
-        except KeyboardInterrupt:
-            break
+    global _radio_quit, _radio_skip
+    _radio_quit = False
+    _radio_skip = False
+
+    old_sigint = signal.signal(signal.SIGINT, _radio_sigint)
+    old_sigquit = signal.signal(signal.SIGQUIT, _radio_sigquit)
+
+    fd = sys.stdin.fileno()
+    old_term = None
+    try:
+        old_term = termios.tcgetattr(fd)
+        new = termios.tcgetattr(fd)
+        new[0] &= ~termios.IXON
+        new[6][termios.VQUIT] = 0x11  # Ctrl+Q -> SIGQUIT
+        termios.tcsetattr(fd, termios.TCSADRAIN, new)
+    except (termios.error, OSError):
+        pass
+
+    flags = {"quit": lambda: _radio_quit, "skip": lambda: _radio_skip}
+
+    idx = 0
+    try:
+        while idx < len(tracks) and not _radio_quit:
+            title, vid, dur = tracks[idx]
+            url = f"https://www.youtube.com/watch?v={vid}"
+            entry = youtube.get_entry(url)
+            short = _truncate_title(title)
+            mins, secs = divmod(int(dur), 60)
+
+            if idx + 1 < len(tracks):
+                n_title, n_vid, n_dur = tracks[idx + 1]
+                n_short = _truncate_title(n_title)
+                n_mins, n_secs = divmod(int(n_dur), 60)
+                print(f"{T}\n\t⥤ Next: {n_short:30s} {n_mins}:{n_secs:02d}{R}")
+
+            filepath = None
+            if playlist_dir:
+                m(f"\tDownloading {short}...")
+                filepath = youtube.download_url(url, str(playlist_dir))
+                m(f"\tDownloaded to {filepath}")
+
+            _radio_skip = False
+            player.play_entry(entry, title, args, filepath, flags=flags)
+            idx += 1
+    finally:
+        if old_term:
+            termios.tcsetattr(fd, termios.TCSADRAIN, old_term)
+        signal.signal(signal.SIGINT, old_sigint)
+        signal.signal(signal.SIGQUIT, old_sigquit)
 
 
 def download(extra: list[str]):
@@ -259,22 +310,17 @@ def download(extra: list[str]):
 
 def switch_mode():
     config.Mode = "Offline"
-    config.THEME = config.OFFLINE_THEME
-    m("Switched to Offline mode")
 
 
 def show_help(inf=False):
-    _t = config.THEMES[config.THEME]["theme"]
-    _g = "\033[90m"
-    _r = "\033[0m"
     if inf:
-        print(f"{_t}Online Commands (detailed):{_r}")
+        print(f"{T}Online Commands (detailed):{R}")
         for cmd, lines in help_detail.ONLINE_HELP.items():
             for line in lines:
-                print(f"  {line.replace('{theme}', _t)}")
+                print(f"  {line}")
             print()
     else:
-        print(f"{_t}Online Commands:{_r}")
+        print(f"{T}Online Commands:{R}")
         for cmd, desc in COMMANDS.items():
-            print(f"  {_t}{cmd:12s}{_r} {_g}{desc}{_r}")
-        print(f"{_g}  Use 'help -i' for detailed usage{_r}")
+            print(f"  {T}{cmd:12s}{R} {G}{desc}{R}")
+        print(f"{G}  Use 'help -i' for detailed usage{R}")

{flow_twinx-0.2.0 → flow_twinx-0.3.0}/flow_twinx/Online/player.py

@@ -1,11 +1,19 @@
 import sys
 import time
 import vlc
-from ..imports import tprint
+from ..imports import config
 
-m = tprint(color="grey", border="none")
-e = tprint(color="red", border="none")
-i = tprint(color="theme", border="none")
+P = config.Primary
+S = config.Secondary
+T = config.Tertiary
+M = config.Muted
+E = config.Red
+R = config.Reset
+
+m = lambda t: print(f"{M}{t}{R}")
+e = lambda t: print(f"{E}{t}{R}")
+i = lambda t: print(f"{P if config.Mode == 'Online' else S}{t}{R}")
+t = lambda t: print(f"{T}{t}{R}")
 
 BAR_WIDTH = 40
 
@@ -20,7 +28,8 @@ def _progress_bar(elapsed, total):
     return f"  [{bar}] {pct}%"
 
 
-def play_entry(entry, title, args=None, filepath=None, stop_on_interrupt=False):
+def play_entry(entry, title, args=None, filepath=None, flags=None):
+    title = title.split("|")[0]
     repeat = args and getattr(args, "r", False)
 
     while True:
@@ -45,27 +54,34 @@ def play_entry(entry, title, args=None, filepath=None, stop_on_interrupt=False):
 
         duration = entry.get("duration", 0)
         dur_min, dur_sec = divmod(int(duration), 60)
-        i(f"\nPlaying : {title}")
+        i(f"\n⤘ Now : {title}")
         m(f"    {dur_min}:{dur_sec:02d} | repeat:{args.r} | shuffle:{args.s}")
 
         start = time.time()
+        skipped = False
         try:
             while player.get_state() not in (vlc.State.Ended, vlc.State.Error):
+                if flags:
+                    if flags.get("quit", lambda: False)():
+                        player.stop()
+                        return
+                    if flags.get("skip", lambda: False)():
+                        skipped = True
+                        player.stop()
+                        break
                 elapsed = time.time() - start
                 bar = _progress_bar(elapsed, duration)
-                sys.stdout.write(f"\r\x1b[36m{bar}\x1b[0m")
+                sys.stdout.write(f"\r{P}{bar}{R}")
                 sys.stdout.flush()
                 time.sleep(0.5)
         except KeyboardInterrupt:
             player.stop()
             sys.stdout.write("\n")
             sys.stdout.flush()
-            if stop_on_interrupt:
-                raise
             break
 
         sys.stdout.write("\n")
         sys.stdout.flush()
 
-        if not repeat:
+        if skipped or not repeat:
             break

{flow_twinx-0.2.0 → flow_twinx-0.3.0}/flow_twinx/Online/youtube.py

@@ -28,7 +28,7 @@ ydl_opts_play = {
     "noplaylist": True, "format": "bestaudio/best", "skip_download": True,
 }
 
-def search(query, limit=5):
+def search(query, limit=3):
     with yt_dlp.YoutubeDL(ydl_opts) as ydl:
         info = ydl.extract_info(f"ytsearch{limit}:{query}", download=False)
         if not info.get("entries"):

flow_twinx-0.3.0/flow_twinx/config.py

@@ -0,0 +1,138 @@
+import json
+import pathlib
+
+CONFIG_FILE = pathlib.Path.home() / ".flow/config.json"
+
+def merge_flags(extra: list[str], args) -> tuple[list[str], object]:
+    mapping = {"-r": "r", "-s": "s", "-d": "d" , "-i":"i" , "-h":"h"}
+    rest = []
+    for item in extra:
+        if item in mapping:
+            setattr(args, mapping[item], True)
+        elif item.startswith("-"):
+            print(f"Unknown flag: {item}")
+        else:
+            rest.append(item)
+    return rest, args
+
+Red = "\033[0;31m"
+Green = "\033[0;32m"
+Brown = "\033[0;33m"
+Blue = "\033[0;34m"
+Purple = "\033[0;35m"
+Cyan = "\033[0;36m"
+Grey = "\033[90m"
+YELLOW = "\033[1;33m"
+White = "\033[1;37m"
+MAROON   = "\033[38;5;124m"
+OLIVE    = "\033[38;5;100m"
+DARK_KHAKI = "\033[38;5;136m"
+GOLD     = "\033[38;5;220m"
+TAN      = "\033[38;5;215m"
+SALMON   = "\033[38;5;209m"
+CORAL     = "\033[38;5;203m"
+HOT_PINK  = "\033[38;5;205m"
+VIOLET    = "\033[38;5;141m"
+DEEP_PURPLE = "\033[38;5;129m"
+TEAL      = "\033[38;5;30m"
+SKY_BLUE  = "\033[38;5;117m"
+STEEL_BLUE = "\033[38;5;67m"
+NAVY      = "\033[38;5;18m"
+INDIGO    = "\033[38;5;54m"
+ORANGE   = "\033[38;5;202m"  
+PINK      = "\033[38;5;205m" 
+LIME      = "\033[38;5;154m"
+Reset = "\033[0m"
+
+_COLORS = {k.lower().replace("_", ""): v for k, v in vars().items()
+           if isinstance(v, str) and v.startswith("\033") and k != "Reset"}
+
+_COLOR_NAMES = {v: k for k, v in _COLORS.items()}
+
+_TARGET_ALIASES = {"pri": "primary", "sec": "secondary", "ter": "tertiary"}
+_TARGETS = {"primary", "secondary", "tertiary"}
+
+Primary = Cyan
+Secondary = Purple
+Tertiary = Blue
+Muted = Grey
+
+
+def _load_config():
+    global Primary, Secondary, Tertiary
+    if not CONFIG_FILE.exists():
+        return
+    try:
+        data = json.loads(CONFIG_FILE.read_text())
+        if "primary" in data and data["primary"] in _COLORS:
+            Primary = _COLORS[data["primary"]]
+        if "secondary" in data and data["secondary"] in _COLORS:
+            Secondary = _COLORS[data["secondary"]]
+        if "tertiary" in data and data["tertiary"] in _COLORS:
+            Tertiary = _COLORS[data["tertiary"]]
+    except (json.JSONDecodeError, OSError):
+        pass
+
+
+def _save_config():
+    CONFIG_FILE.parent.mkdir(parents=True, exist_ok=True)
+    data = {
+        "primary": _COLOR_NAMES.get(Primary, "cyan"),
+        "secondary": _COLOR_NAMES.get(Secondary, "purple"),
+        "tertiary": _COLOR_NAMES.get(Tertiary, "blue"),
+    }
+    CONFIG_FILE.write_text(json.dumps(data, indent=2))
+
+DOWNLOAD_DIR = pathlib.Path.home() / ".flow/downloads"
+
+VERSION = 0.3
+
+Mode = "Online"
+
+liked_music = pathlib.Path.home() / ".flow/liked.txt"
+
+MAX_RESULTS_RADIO = 35
+
+
+def cmd_config(extra: list[str], args=None):
+    global Primary, Secondary, Tertiary
+    if (args and getattr(args, "h", False)) or (extra and extra[0] == "-h"):
+        print(f"{Tertiary}Available targets:{Reset}")
+        print(f"  {Primary}primary{Reset}   (aliases: pri)")
+        print(f"  {Secondary}secondary{Reset} (aliases: sec)")
+        print(f"  {Tertiary}tertiary{Reset}  (aliases: ter)")
+        print(f"\n{Tertiary}Available colors:{Reset}")
+        for name, code in _COLORS.items():
+            print(f"  {code}{name}{Reset}")
+        print(f"\n{Grey}Config file: {CONFIG_FILE}{Reset}")
+        return
+    if not extra:
+        print(f"{Primary}Usage: config <primary|secondary|tertiary> <color>{Reset}")
+        print(f"       config -h{Reset}")
+        return
+    if len(extra) < 2:
+        print(f"Usage: config <primary|secondary|tertiary> <color>{Reset}")
+        return
+    target = _TARGET_ALIASES.get(extra[0].lower(), extra[0].lower())
+    color_name = extra[1].lower()
+    if color_name not in _COLORS:
+        print(f"Unknown color '{color_name}'. Use 'config -h' to see available colors.{Reset}")
+        return
+    if target == "primary":
+        Primary = _COLORS[color_name]
+        _save_config()
+        print(f"{Primary}Primary color changed to {color_name}{Reset}")
+    elif target == "secondary":
+        Secondary = _COLORS[color_name]
+        _save_config()
+        print(f"{Secondary}Secondary color changed to {color_name}{Reset}")
+    elif target == "tertiary":
+        Tertiary = _COLORS[color_name]
+        _save_config()
+        print(f"{Tertiary}Tertiary color changed to {color_name}{Reset}")
+    else:
+        aliases = ", ".join(f"{k}->{v}" for k, v in _TARGET_ALIASES.items())
+        print(f"Unknown target '{target}'. Use: primary, sec, ter ({aliases}){Reset}")
+
+
+_load_config()

{flow_twinx-0.2.0 → flow_twinx-0.3.0}/flow_twinx/help_detail.py

@@ -1,8 +1,10 @@
-_G = "\033[90m"
-_B = "\033[34m"
-_M = "\033[35m"
-_R = "\033[0m"
-_T = "{theme}"
+from . import config
+
+_T = config.Primary
+_M = config.Tertiary
+_B = config.Secondary
+_G = config.Muted
+_R = config.Reset
 
 ONLINE_HELP = {
     "play": [
@@ -44,7 +46,7 @@ ONLINE_HELP = {
         f"{_T}> radio{_R} {_M}<song_name>{_R}",
         f"{_G}  Generate a radio mix based on a reference song.{_R}",
         f"{_G}  Plays related songs sequentially from YouTube Music.{_R}",
-        f"{_G}  Press Ctrl+C to stop. Alias:{_R} {_M}rd{_R}",
+        f"{_G}  Press Ctrl+C for next track, Ctrl+Q to quit. Alias:{_R} {_M}rd{_R}",
     ],
     "switch": [
         f"{_T}> switch{_R}",

{flow_twinx-0.2.0 → flow_twinx-0.3.0}/flow_twinx/imports.py

@@ -1,4 +1,4 @@
 from . import config
-from .tui import print as tprint, show_banner, input as tui_input
+from .tui import show_banner, input as tui_input
 from .ping import is_connected
 from .config import merge_flags

{flow_twinx-0.2.0 → flow_twinx-0.3.0}/flow_twinx/main.py

@@ -10,15 +10,19 @@ if __name__ == "__main__" and __package__ is None:
     sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
 
 from .imports import config, show_banner, tui_input, is_connected
-from .imports import tprint as tui_print
 from . import shortcuts
 
+P = config.Primary
+S = config.Secondary
+M = config.Muted
+R = config.Reset
+
 
 def _spinner(stop):
     chars = "|/-\\"
     i = 0
     while not stop():
-        sys.stdout.write(f"\r\x1b[36mChecking connection... {chars[i]}\x1b[0m")
+        sys.stdout.write(f"\r{P}Checking connection... {chars[i]}{R}")
         sys.stdout.flush()
         time.sleep(0.1)
         i = (i + 1) % len(chars)
@@ -56,7 +60,7 @@ def main():
     if args.command:
         commands.run(args.command, unknown, args)
     elif unknown:
-        tui_print(color="white", border="double")(f"Unknown argument: {' '.join(unknown)}")
+        print(f"Unknown argument: {' '.join(unknown)}")
     else:
         while True:
             try:
@@ -67,7 +71,7 @@ def main():
                 extra = parts[1:]
                 cmd = shortcuts.resolve(cmd)
                 if cmd in ("exit", "quit", "q"):
-                    tui_print(color="grey", border="none")("Goodbye!")
+                    print(f"{M}Goodbye!{R}")
                     break
                 cmd_args = argparse.Namespace(**vars(args))
                 for flag in ("r", "s", "d"):
@@ -77,9 +81,8 @@ def main():
                     mode = config.Mode
                     commands = _load_commands()
                     show_banner()
-                    tui_print(color="grey", border="none")(f"Mode changed to {mode}")
             except (EOFError, KeyboardInterrupt):
-                tui_print(color="grey", border="none")("\nGoodbye!")
+                print(f"{M}\nGoodbye!{R}")
                 break
 
 

{flow_twinx-0.2.0 → flow_twinx-0.3.0}/flow_twinx/ping.py

@@ -14,7 +14,6 @@ def is_connected(timeout: int = 2, hosts: list[str] | None = None) -> bool:
             with urllib.request.urlopen(f"https://{host}", timeout=timeout):
                 pass
             config.Mode = "Online"
-            config.THEME = config.ONLINE_THEME
             return True
         except Exception:
             pass
@@ -22,11 +21,9 @@ def is_connected(timeout: int = 2, hosts: list[str] | None = None) -> bool:
         try:
             socket.create_connection((host, 80), timeout=timeout).close()
             config.Mode = "Online"
-            config.THEME = config.ONLINE_THEME
             return True
         except Exception:
             continue
 
     config.Mode = "Offline"
-    config.THEME = config.OFFLINE_THEME
     return False

{flow_twinx-0.2.0 → flow_twinx-0.3.0}/flow_twinx/shortcuts.py

@@ -12,6 +12,7 @@ DEFAULT_SHORTCUTS = {
     "rd": "radio",
     "sw": "switch",
     "hl": "help",
+    "cf": "config",
     "ex": "exit",
 }
 

flow_twinx-0.3.0/flow_twinx/tui.py

@@ -0,0 +1,27 @@
+import builtins
+from . import config
+
+
+BANNER = r"""
+███████╗██╗      ██████╗ ██╗    ██╗
+██╔════╝██║     ██╔═══██╗██║    ██║
+█████╗  ██║     ██║   ██║██║ █╗ ██║
+██╔══╝  ██║     ██║   ██║██║███╗██║
+██║     ███████╗╚██████╔╝╚███╔███╔╝
+╚═╝     ╚══════╝ ╚═════╝  ╚══╝╚══╝
+"""
+
+
+def show_banner():
+    c = config.Primary if config.Mode == "Online" else config.Secondary
+    builtins.print(f"{c}{BANNER}{config.Reset}")
+    builtins.print(f"{config.Muted}         Flow Music Player v{config.VERSION}{config.Reset}")
+    builtins.print(f"{c}         Mode : {config.Mode}{config.Reset}")
+    builtins.print()
+
+
+def input(prompt: str = "") -> str:
+    if config.Mode == "Online":
+        return builtins.input(f"{config.Primary}{prompt}$ {config.Reset}")
+    elif config.Mode == "Offline":
+        return builtins.input(f"{config.Secondary}{prompt}$ {config.Reset}")

{flow_twinx-0.2.0 → flow_twinx-0.3.0}/flow_twinx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flow-twinx
-Version: 0.2.0
+Version: 0.3.0
 Summary: A terminal music player with online and offline modes
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown

{flow_twinx-0.2.0 → flow_twinx-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flow-twinx"
-version = "0.2.0"
+version = "0.3.0"
 description = "A terminal music player with online and offline modes"
 readme = "README.md"
 requires-python = ">=3.9"

flow_twinx-0.2.0/flow_twinx/config.py

@@ -1,38 +0,0 @@
-import pathlib
-
-def merge_flags(extra: list[str], args) -> tuple[list[str], object]:
-    mapping = {"-r": "r", "-s": "s", "-d": "d"}
-    rest = []
-    for item in extra:
-        if item in mapping:
-            setattr(args, mapping[item], True)
-        elif item.startswith("-"):
-            print(f"Unknown flag: {item}")
-        else:
-            rest.append(item)
-    return rest, args
-
-
-ONLINE_THEME = "cyan"
-OFFLINE_THEME = "magenta"
-
-THEMES = {
-    "blue":     {"white": "\033[37m", "grey": "\033[90m", "theme": "\033[34m"},
-    "green":    {"white": "\033[37m", "grey": "\033[90m", "theme": "\033[32m"},
-    "red":      {"white": "\033[37m", "grey": "\033[90m", "theme": "\033[31m"},
-    "yellow":   {"white": "\033[37m", "grey": "\033[90m", "theme": "\033[33m"},
-    "magenta":  {"white": "\033[37m", "grey": "\033[90m", "theme": "\033[35m"},
-    "cyan":     {"white": "\033[37m", "grey": "\033[90m", "theme": "\033[36m"},
-}
-
-DOWNLOAD_DIR = pathlib.Path.home() / ".flow/downloads"
-
-VERSION = 0.1
-
-Mode = "Online"
-
-THEME = ONLINE_THEME
-
-liked_music = pathlib.Path.home() / ".flow/liked.txt"
-
-MAX_RESULTS_RADIO = 35

flow_twinx-0.2.0/flow_twinx/tui.py

@@ -1,69 +0,0 @@
-import builtins
-from . import config
-
-RESET = "\033[0m"
-
-BORDER_CHARS = {
-    "none":   None,
-    "single": ("-", "|", "+"),
-    "double": ("=", "|", "+"),
-    "dashed": ("- ", "!", "+"),
-}
-
-
-def _color_map():
-    colors = config.THEMES.get(config.THEME, config.THEMES["cyan"])
-    return {
-        "white": colors["white"],
-        "grey": colors["grey"],
-        "theme": colors["theme"],
-    }
-
-
-def print(color: str = "white", border: str = "none"):
-    def styled_print(text: str):
-        cm = _color_map()
-        color_code = cm.get(color.lower(), cm["white"])
-        border_style = BORDER_CHARS.get(border.lower())
-
-        if border_style is None:
-            print_line = f"{color_code}{text}{RESET}"
-            builtins.print(print_line)
-        else:
-            h_char, v_char, corner_char = border_style
-            lines = text.split("\n")
-            max_w = max(len(l) for l in lines)
-            width = max_w + 2
-            top_bottom = corner_char + h_char * width + corner_char
-            builtins.print(f"{color_code}{top_bottom}{RESET}")
-            for line in lines:
-                padded = line.ljust(max_w)
-                builtins.print(f"{color_code}{v_char} {padded} {v_char}{RESET}")
-            builtins.print(f"{color_code}{top_bottom}{RESET}")
-
-    return styled_print
-
-
-BANNER = r"""
-███████╗██╗      ██████╗ ██╗    ██╗
-██╔════╝██║     ██╔═══██╗██║    ██║
-█████╗  ██║     ██║   ██║██║ █╗ ██║
-██╔══╝  ██║     ██║   ██║██║███╗██║
-██║     ███████╗╚██████╔╝╚███╔███╔╝
-╚═╝     ╚══════╝ ╚═════╝  ╚══╝╚══╝
-"""
-
-
-def show_banner():
-    p = print(color="theme", border="none")
-    p(BANNER)
-    p = print(color="grey", border="none")
-    p(f"         Flow Music Player v{config.VERSION}")
-    p = print(color="theme", border="none")
-    p(f"         Mode : {config.Mode}")
-    builtins.print()
-
-
-def input(prompt: str = "") -> str:
-    cm = _color_map()
-    return builtins.input(f"{cm['theme']}{prompt}$ {RESET}")