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

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

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: flow-twinx
-Version: 0.2.0
+Version: 0.4.0
 Summary: A terminal music player with online and offline modes
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: python-vlc
 Requires-Dist: yt_dlp
@@ -13,7 +13,7 @@ A terminal-based music player with online streaming and offline library modes.
 
 ## Features
 
-- **Dual-mode operation** — Automatically detects internet and switches between online streaming and offline playback
+- **Dual-mode operation** — It will automatically detect internet and switch between online streaming and offline playback.
 - **Online mode** — Search and stream audio from YouTube via `yt-dlp` and `python-vlc`
 - **Offline mode** — Play local audio files with album support, search, and a liked-songs collection
 - **Download** — Save tracks from YouTube to your local library with the `-d` flag
@@ -30,10 +30,9 @@ A terminal-based music player with online streaming and offline library modes.
 ## Installation
 
 ```bash
-git clone https://github.com/yourusername/flow.git
+git clone https://github.com/Philast-015/Flow.git
 cd flow
-python -m venv .venv
-.venv\Scripts\pip install -r requirements.txt
+uv run flow_twinx/main.py
 ```
 
 Or through pip:
@@ -42,19 +41,17 @@ Or through pip:
 pip install flow-twinx
 ```
 
-### Note: Make sure you have python installed
+### Note: Make sure you vlc installed or it will not play music.
 
 ## Usage
 
 ```bash
 cd flow_twinx
-python main.py [-r] [-s] [-d]
+uv run main.py
 ```
-
 Or direct if you have used pypi
-
 ```bash
-flow <command> <flag>
+flow
 ```
 
 | Flag | Description                                    |
@@ -62,6 +59,7 @@ flow <command> <flag>
 | `-r` | Repeat mode (loop current track)               |
 | `-s` | Shuffle mode (random order)                    |
 | `-d` | Download mode (save streamed audio to library) |
+| `-i` | Use it in help command to show detailed help   |
 
 ### Commands
 
@@ -74,6 +72,7 @@ flow <command> <flag>
 | `download <name or #>` | Save a streamed song to the local library    |
 | `switch`               | Toggle between online and offline mode       |
 | `help`                 | Show available commands                      |
+| `help -i`                 | Show available commands with detailed explanation                      |
 
 ## Configuration
 
@@ -85,29 +84,28 @@ flow <command> <flag>
 
 ```
 flow/
-├── flow_twinx/                 # Main application package
+├── flow_twinx/
 │   ├── __init__.py
-│   ├── config.py               # Configuration, themes, paths
-│   ├── imports.py              # Central import hub
-│   ├── main.py                 # Entry point / CLI
-│   ├── ping.py                 # Connection checker
-│   ├── tui.py                  # Terminal UI helpers (colors, banner, input)
-│   ├── Online/                 # Online streaming mode
+│   ├── config.py               
+│   ├── imports.py              
+│   ├── main.py                 
+│   ├── ping.py                 
+│   ├── tui.py                  
+│   ├── Online/
 │   │   ├── __init__.py
-│   │   ├── commands.py         # Online command handlers
-│   │   ├── player.py           # VLC-based stream player
-│   │   └── youtube.py          # YouTube search & download via yt-dlp
-│   └── Offline/                # Offline local library mode
+│   │   ├── commands.py         
+│   │   ├── player.py           
+│   │   └── youtube.py
+│   └── Offline/                
 │       ├── __init__.py
-│       ├── commands.py         # Offline command handlers
-│       ├── file.py             # Local file & library management
-│       ├── player.py           # VLC-based local file player
-│       └── youtube.py          # Placeholder
-├── pyproject.toml              # Package metadata & build config
-├── requirements.txt            # Dependencies (python-vlc, yt_dlp)
+│       ├── commands.py         
+│       ├── file.py             
+│       ├── player.py           
+│       └── youtube.py         
+├── pyproject.toml
 └── README.md
 ```
 
 ## License
 
-MIT
+Use however you want just mention me for inspiration.

{flow_twinx-0.2.0 → flow_twinx-0.4.0}/README.md

@@ -4,7 +4,7 @@ A terminal-based music player with online streaming and offline library modes.
 
 ## Features
 
-- **Dual-mode operation** — Automatically detects internet and switches between online streaming and offline playback
+- **Dual-mode operation** — It will automatically detect internet and switch between online streaming and offline playback.
 - **Online mode** — Search and stream audio from YouTube via `yt-dlp` and `python-vlc`
 - **Offline mode** — Play local audio files with album support, search, and a liked-songs collection
 - **Download** — Save tracks from YouTube to your local library with the `-d` flag
@@ -21,10 +21,9 @@ A terminal-based music player with online streaming and offline library modes.
 ## Installation
 
 ```bash
-git clone https://github.com/yourusername/flow.git
+git clone https://github.com/Philast-015/Flow.git
 cd flow
-python -m venv .venv
-.venv\Scripts\pip install -r requirements.txt
+uv run flow_twinx/main.py
 ```
 
 Or through pip:
@@ -33,19 +32,17 @@ Or through pip:
 pip install flow-twinx
 ```
 
-### Note: Make sure you have python installed
+### Note: Make sure you vlc installed or it will not play music.
 
 ## Usage
 
 ```bash
 cd flow_twinx
-python main.py [-r] [-s] [-d]
+uv run main.py
 ```
-
 Or direct if you have used pypi
-
 ```bash
-flow <command> <flag>
+flow
 ```
 
 | Flag | Description                                    |
@@ -53,6 +50,7 @@ flow <command> <flag>
 | `-r` | Repeat mode (loop current track)               |
 | `-s` | Shuffle mode (random order)                    |
 | `-d` | Download mode (save streamed audio to library) |
+| `-i` | Use it in help command to show detailed help   |
 
 ### Commands
 
@@ -65,6 +63,7 @@ flow <command> <flag>
 | `download <name or #>` | Save a streamed song to the local library    |
 | `switch`               | Toggle between online and offline mode       |
 | `help`                 | Show available commands                      |
+| `help -i`                 | Show available commands with detailed explanation                      |
 
 ## Configuration
 
@@ -76,29 +75,28 @@ flow <command> <flag>
 
 ```
 flow/
-├── flow_twinx/                 # Main application package
+├── flow_twinx/
 │   ├── __init__.py
-│   ├── config.py               # Configuration, themes, paths
-│   ├── imports.py              # Central import hub
-│   ├── main.py                 # Entry point / CLI
-│   ├── ping.py                 # Connection checker
-│   ├── tui.py                  # Terminal UI helpers (colors, banner, input)
-│   ├── Online/                 # Online streaming mode
+│   ├── config.py               
+│   ├── imports.py              
+│   ├── main.py                 
+│   ├── ping.py                 
+│   ├── tui.py                  
+│   ├── Online/
 │   │   ├── __init__.py
-│   │   ├── commands.py         # Online command handlers
-│   │   ├── player.py           # VLC-based stream player
-│   │   └── youtube.py          # YouTube search & download via yt-dlp
-│   └── Offline/                # Offline local library mode
+│   │   ├── commands.py         
+│   │   ├── player.py           
+│   │   └── youtube.py
+│   └── Offline/                
 │       ├── __init__.py
-│       ├── commands.py         # Offline command handlers
-│       ├── file.py             # Local file & library management
-│       ├── player.py           # VLC-based local file player
-│       └── youtube.py          # Placeholder
-├── pyproject.toml              # Package metadata & build config
-├── requirements.txt            # Dependencies (python-vlc, yt_dlp)
+│       ├── commands.py         
+│       ├── file.py             
+│       ├── player.py           
+│       └── youtube.py         
+├── pyproject.toml
 └── README.md
 ```
 
 ## License
 
-MIT
+Use however you want just mention me for inspiration.

{flow_twinx-0.2.0 → flow_twinx-0.4.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.4.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.4.0}/flow_twinx/Online/commands.py

@@ -1,33 +1,60 @@
 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
+from . import savan
+
+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",
+    "savan":    "Play a song from JioSaavn (alias: svn)",
+    "savan-s":  "Search JioSaavn for tracks (alias: svn-s)",
     "radio":    "Generate a radio mix from a reference song",
     "like":     "Like a song",
     "download": "Download audio from YouTube",
     "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
@@ -36,6 +63,10 @@ def run(cmd: str, extra: list[str], args):
         play(extra, args)
     elif cmd == "search":
         search(" ".join(extra) if extra else "")
+    elif cmd in ("savan", "svn"):
+        savan_cmd(extra, args)
+    elif cmd in ("savan-s", "svn-s"):
+        savan_search(" ".join(extra) if extra else "")
     elif cmd == "like":
         like_track()
     elif cmd == "download":
@@ -48,6 +79,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 +89,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)
@@ -134,6 +167,75 @@ def _play_liked(args):
         _last_played = (entry, title)
         player.play_entry(entry, title, args)
 
+_savan_results = []
+
+
+def savan_cmd(extra, args):
+    global _savan_results, _last_played
+    arg = " ".join(extra) if extra else None
+    if not arg:
+        e("No song specified")
+        return
+
+    if arg.isdigit():
+        idx = int(arg) - 1
+        if idx < 0 or idx >= len(_savan_results):
+            e("Index out of range")
+            return
+        entry, title, dur = _savan_results[idx]
+    else:
+        stop = False
+        t = threading.Thread(target=_spinner, args=(lambda: stop,), daemon=True)
+        t.start()
+        _savan_results = savan.search(arg)
+        stop = True
+        t.join()
+        if not _savan_results:
+            e("No results found")
+            return
+        entry, title, dur = _savan_results[0]
+
+    url = savan.best_url(entry)
+    if not url:
+        e("No playable URL found")
+        return
+
+    if getattr(args, "d", False):
+        safe = "".join(c if c.isalnum() or c in " -_" else "" for c in title).strip()
+        dest = config.DOWNLOAD_DIR / f"{safe}.mp4"
+        config.DOWNLOAD_DIR.mkdir(parents=True, exist_ok=True)
+        m(f"\n   Downloading {title}...")
+        try:
+            savan.download(url, str(dest))
+        except Exception as ex:
+            e(f"Download failed: {ex}")
+            return
+        i(f"   Downloaded: {title} -> {dest}")
+        return
+
+    _last_played = (entry, title)
+    player.play_url(url, title, args, dur)
+
+
+def savan_search(query):
+    global _savan_results
+    if not query:
+        e("Search query required")
+        return
+    stop = False
+    t = threading.Thread(target=_spinner, args=(lambda: stop,), daemon=True)
+    t.start()
+    _savan_results = savan.search(query)
+    stop = True
+    t.join()
+    if not _savan_results:
+        e("No results found")
+        return
+    for i, (_, title, dur) in enumerate(_savan_results, 1):
+        mins, secs = divmod(int(dur), 60)
+        m(f"  {i}. {title}  ({mins}:{secs:02d})")
+
+
 def like_track():
     global _last_played
     if not _last_played:
@@ -196,30 +298,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 +386,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}")