ttyplayer 0.6.0__tar.gz → 0.7.0__tar.gz

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ttyplayer
-Version: 0.6.0
+Version: 0.7.0
 Summary: ttyplayer: a modern YouTube player for the terminal — search, queue, and play audio or video via mpv
 Keywords: youtube,music,player,mpv,cli,terminal,tui,yt-dlp
 License-Expression: MIT
@@ -35,8 +35,10 @@ ttyplayer play <playlist url>        queue every entry of a playlist
 ttyplayer play <words...>            search, pick one or more results, play them in order
 ttyplayer play ... --video           open a video window as well
 ttyplayer play ... --limit 10        show more search results
+ttyplayer play ... --source soundcloud   search SoundCloud instead of YouTube
 
 ttyplayer search <words...>          list results with durations
+ttyplayer search --source soundcloud <words...>   the same, on SoundCloud
 ttyplayer history                    recently played, newest first
 ttyplayer history --play             pick from history and play again
 ttyplayer history --clear            forget the history
@@ -57,6 +59,8 @@ ttyplayer version
 
 Channels and playlists in search results are skipped; a track that cannot be played is reported and skipped.
 
+Search looks on YouTube or SoundCloud. `--source soundcloud` (on `play`, `search` and `playlist add`) picks SoundCloud for one search; `ttyplayer config set search_source soundcloud` makes it the default everywhere. SoundCloud rows carry an `SC` tag in every list, and history, favorites and playlists keep their SoundCloud link. Links from any site yt-dlp knows play as they are.
+
 While ttyplayer plays in one terminal, any other terminal can drive it:
 
 ```
@@ -64,9 +68,14 @@ ttyplayer pause                      pause / resume
 ttyplayer next                       next in the queue
 ttyplayer prev                       previous in the queue
 ttyplayer stop                       quit the player
+ttyplayer sleep 30m                  Sleeping in 30:00 (also 1h, 1h30m, 90 seconds)
+ttyplayer sleep end                  stop when the current track ends
+ttyplayer sleep off                  cancel it (no argument: show it)
 ttyplayer status                     1:23 / 4:56  Playing  <title>
 ```
 
+When the sleep timer runs out, the volume fades to nothing over 5 seconds and the player stops as if `q` was pressed; the volume is put back first, so the next play starts at the old level. Paused or idle, it stops at once. `ttyplayer status`, the TUI and the web remote show `zz 27:13` (or `zz end`) while a timer is armed.
+
 ## Playlists
 
 Playlists are named lists you keep, in the order you choose, separate from history and favorites. A name is 1 to 40 letters, digits, spaces, `_` or `-`.
@@ -127,7 +136,7 @@ ttyplayer asks only for read access to your playlists (`playlist-read-private pl
 
 ## TUI
 
-`ttyplayer tui` opens a full-screen player: a search box, Search / Queue / History / Favorites / Playlists tabs, and a now-playing panel. Type a search or paste a link and press Enter. Ctrl-P opens the command palette (search, playlists, save queue as playlist, next theme, settings, help, quit, pause, next, previous, mute, and Textual's own theme picker); `?` lists every key and command.
+`ttyplayer tui` opens a full-screen player: a search box, Search / Queue / History / Favorites / Playlists tabs, and a now-playing panel. Type a search or paste a link and press Enter; start the search with `sc:` (`sc: boards of canada`) to search SoundCloud, or `yt:` for YouTube, whatever `search_source` says. The Search tab's heading then reads `SoundCloud results` or `YouTube results`. Ctrl-P opens the command palette (search, playlists, save queue as playlist, next theme, settings, help, quit, pause, next, previous, mute, sleep, and Textual's own theme picker); **Sleep…** asks for a sleep timer (`30m` filled in; `end`, `off`, `1h30m`, … work as on the command line; Esc leaves the timer alone); `?` lists every key and command.
 
 Under the volume, the panel's level meter shows two bars, `L` and `R`, that follow the sound's peaks about ten times a second (empty at −60 dBFS and below, full at 0 dBFS; empty while paused). `ttyplayer config set show_levels false`, or Enter on `show_levels` in the Settings screen, hides them and takes mpv's measuring filter out.
 
@@ -185,6 +194,7 @@ ttyplayer keeps its preferences in `~/.config/ttyplayer/settings.toml` (`$XDG_CO
 | `stream_enabled` | `false` | `ttyplayer serve` streams the sound to the web remote instead of playing it, as `--stream` does |
 | `spotify_client_id` | *none* | the Client ID of your own Spotify app, which `ttyplayer spotify login` needs (see Spotify above) |
 | `show_levels` | `true` | the TUI's level meter: mpv measures the sound's peaks and the now-playing panel shows them |
+| `search_source` | `youtube` | where a search looks: `youtube` or `soundcloud`; `--source` and the TUI's `sc:` / `yt:` prefix override it once |
 
 ```
 ttyplayer config                     every setting, (default) when unchanged
@@ -227,7 +237,7 @@ curl -H "Authorization: Bearer $TOKEN" -d '{"name": "volume", "value": -5}' http
 | GET | `/api/status` | the player's status, plus `queue` (the videos) and `index` (1-based) |
 | POST | `/api/play` | `{"url": "…"}` or `{"query": "…"}`: the link's videos, or the first search result, replace the queue and play |
 | POST | `/api/queue` | `{"url": "…"}` or `{"query": "…"}`: appended to the queue (played at once when nothing plays) |
-| POST | `/api/command` | `{"name": "pause"\|"next"\|"prev"\|"stop"\|"mute"\|"seek"\|"volume"\|"jump"\|"remove"\|"move"\|"clear_others", "value"?}`; `seek` and `volume` take a number of seconds / steps, `jump` and `remove` a 0-based queue row, `move` two (`[from, to]`; the current track stays current); `clear_others` keeps only the current track → the new status |
+| POST | `/api/command` | `{"name": "pause"\|"next"\|"prev"\|"stop"\|"mute"\|"sleep"\|"seek"\|"volume"\|"jump"\|"remove"\|"move"\|"clear_others", "value"?}`; `sleep` takes the text `ttyplayer sleep` does (`"30m"`, `"end"`, `"off"`), `seek` and `volume` a number of seconds / steps, `jump` and `remove` a 0-based queue row, `move` two (`[from, to]`; the current track stays current); `clear_others` keeps only the current track → the new status |
 | GET | `/api/commands` | the command names `/api/command` takes |
 | GET | `/api/search?q=…` | the search results (`search_limit` of them) |
 | GET | `/api/favorites` | the favorites, newest first |

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/README.md

@@ -10,8 +10,10 @@ ttyplayer play <playlist url>        queue every entry of a playlist
 ttyplayer play <words...>            search, pick one or more results, play them in order
 ttyplayer play ... --video           open a video window as well
 ttyplayer play ... --limit 10        show more search results
+ttyplayer play ... --source soundcloud   search SoundCloud instead of YouTube
 
 ttyplayer search <words...>          list results with durations
+ttyplayer search --source soundcloud <words...>   the same, on SoundCloud
 ttyplayer history                    recently played, newest first
 ttyplayer history --play             pick from history and play again
 ttyplayer history --clear            forget the history
@@ -32,6 +34,8 @@ ttyplayer version
 
 Channels and playlists in search results are skipped; a track that cannot be played is reported and skipped.
 
+Search looks on YouTube or SoundCloud. `--source soundcloud` (on `play`, `search` and `playlist add`) picks SoundCloud for one search; `ttyplayer config set search_source soundcloud` makes it the default everywhere. SoundCloud rows carry an `SC` tag in every list, and history, favorites and playlists keep their SoundCloud link. Links from any site yt-dlp knows play as they are.
+
 While ttyplayer plays in one terminal, any other terminal can drive it:
 
 ```
@@ -39,9 +43,14 @@ ttyplayer pause                      pause / resume
 ttyplayer next                       next in the queue
 ttyplayer prev                       previous in the queue
 ttyplayer stop                       quit the player
+ttyplayer sleep 30m                  Sleeping in 30:00 (also 1h, 1h30m, 90 seconds)
+ttyplayer sleep end                  stop when the current track ends
+ttyplayer sleep off                  cancel it (no argument: show it)
 ttyplayer status                     1:23 / 4:56  Playing  <title>
 ```
 
+When the sleep timer runs out, the volume fades to nothing over 5 seconds and the player stops as if `q` was pressed; the volume is put back first, so the next play starts at the old level. Paused or idle, it stops at once. `ttyplayer status`, the TUI and the web remote show `zz 27:13` (or `zz end`) while a timer is armed.
+
 ## Playlists
 
 Playlists are named lists you keep, in the order you choose, separate from history and favorites. A name is 1 to 40 letters, digits, spaces, `_` or `-`.
@@ -102,7 +111,7 @@ ttyplayer asks only for read access to your playlists (`playlist-read-private pl
 
 ## TUI
 
-`ttyplayer tui` opens a full-screen player: a search box, Search / Queue / History / Favorites / Playlists tabs, and a now-playing panel. Type a search or paste a link and press Enter. Ctrl-P opens the command palette (search, playlists, save queue as playlist, next theme, settings, help, quit, pause, next, previous, mute, and Textual's own theme picker); `?` lists every key and command.
+`ttyplayer tui` opens a full-screen player: a search box, Search / Queue / History / Favorites / Playlists tabs, and a now-playing panel. Type a search or paste a link and press Enter; start the search with `sc:` (`sc: boards of canada`) to search SoundCloud, or `yt:` for YouTube, whatever `search_source` says. The Search tab's heading then reads `SoundCloud results` or `YouTube results`. Ctrl-P opens the command palette (search, playlists, save queue as playlist, next theme, settings, help, quit, pause, next, previous, mute, sleep, and Textual's own theme picker); **Sleep…** asks for a sleep timer (`30m` filled in; `end`, `off`, `1h30m`, … work as on the command line; Esc leaves the timer alone); `?` lists every key and command.
 
 Under the volume, the panel's level meter shows two bars, `L` and `R`, that follow the sound's peaks about ten times a second (empty at −60 dBFS and below, full at 0 dBFS; empty while paused). `ttyplayer config set show_levels false`, or Enter on `show_levels` in the Settings screen, hides them and takes mpv's measuring filter out.
 
@@ -160,6 +169,7 @@ ttyplayer keeps its preferences in `~/.config/ttyplayer/settings.toml` (`$XDG_CO
 | `stream_enabled` | `false` | `ttyplayer serve` streams the sound to the web remote instead of playing it, as `--stream` does |
 | `spotify_client_id` | *none* | the Client ID of your own Spotify app, which `ttyplayer spotify login` needs (see Spotify above) |
 | `show_levels` | `true` | the TUI's level meter: mpv measures the sound's peaks and the now-playing panel shows them |
+| `search_source` | `youtube` | where a search looks: `youtube` or `soundcloud`; `--source` and the TUI's `sc:` / `yt:` prefix override it once |
 
 ```
 ttyplayer config                     every setting, (default) when unchanged
@@ -202,7 +212,7 @@ curl -H "Authorization: Bearer $TOKEN" -d '{"name": "volume", "value": -5}' http
 | GET | `/api/status` | the player's status, plus `queue` (the videos) and `index` (1-based) |
 | POST | `/api/play` | `{"url": "…"}` or `{"query": "…"}`: the link's videos, or the first search result, replace the queue and play |
 | POST | `/api/queue` | `{"url": "…"}` or `{"query": "…"}`: appended to the queue (played at once when nothing plays) |
-| POST | `/api/command` | `{"name": "pause"\|"next"\|"prev"\|"stop"\|"mute"\|"seek"\|"volume"\|"jump"\|"remove"\|"move"\|"clear_others", "value"?}`; `seek` and `volume` take a number of seconds / steps, `jump` and `remove` a 0-based queue row, `move` two (`[from, to]`; the current track stays current); `clear_others` keeps only the current track → the new status |
+| POST | `/api/command` | `{"name": "pause"\|"next"\|"prev"\|"stop"\|"mute"\|"sleep"\|"seek"\|"volume"\|"jump"\|"remove"\|"move"\|"clear_others", "value"?}`; `sleep` takes the text `ttyplayer sleep` does (`"30m"`, `"end"`, `"off"`), `seek` and `volume` a number of seconds / steps, `jump` and `remove` a 0-based queue row, `move` two (`[from, to]`; the current track stays current); `clear_others` keeps only the current track → the new status |
 | GET | `/api/commands` | the command names `/api/command` takes |
 | GET | `/api/search?q=…` | the search results (`search_limit` of them) |
 | GET | `/api/favorites` | the favorites, newest first |

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ttyplayer"
-version = "0.6.0"
+version = "0.7.0"
 description = "ttyplayer: a modern YouTube player for the terminal — search, queue, and play audio or video via mpv"
 readme = "README.md"
 requires-python = ">=3.13"

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "ttyplayer"
-version = "0.6.0"
+version = "0.7.0"
 description = "ttyplayer: a modern YouTube player for the terminal — search, queue, and play audio or video via mpv"
 readme = "README.md"
 requires-python = ">=3.13"

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/src/ttyplayer/cli.py

@@ -21,6 +21,8 @@ app.add_typer(playlist_app, name="playlist")
 spotify_app = typer.Typer()
 app.add_typer(spotify_app, name="spotify")
 
+# play, search and playlist add: where a search looks; empty means the search_source setting.
+SOURCE_OPTION = typer.Option("", "--source", help="Search youtube or soundcloud (default: search_source)")
 shuffler = random.Random()  # playlist play --shuffle; tests swap in a seeded one
 
 # How to install mpv, per sys.platform prefix; the README's Install section and the
@@ -160,21 +162,21 @@ def check_control_dir():
 
 
 @app.command()
-def play(target: list[str], video: bool = False, limit: int = 5):
+def play(target: list[str], video: bool = False, limit: int = 5, source: str = SOURCE_OPTION):
     """Play a YouTube link or playlist, or search and pick what to play.
 
     Keys while playing: space pause, left/right or , . seek, up/down or - + volume,
     n next, p previous, q quit.
     """
-    start_playback(resolve(target, limit), video)
+    start_playback(resolve(target, limit, source), video)
 
 
 @app.command()
-def search(query: list[str], limit: int = 5):
-    """Search YouTube and list the results"""
+def search(query: list[str], limit: int = 5, source: str = SOURCE_OPTION):
+    """Search YouTube or SoundCloud and list the results"""
     from ttyplayer import youtube  # yt-dlp loads on use, so doctor runs without it
 
-    videos = lookup(youtube.search, " ".join(query), limit)
+    videos = lookup(youtube.search, " ".join(query), limit, search_source(source))
     exit_if_empty(videos)
     print_videos(videos)
 
@@ -424,10 +426,10 @@ def playlist_create(name: str):
 
 
 @playlist_app.command(name="add")
-def playlist_add(name: str, target: list[str], limit: int = 5):
+def playlist_add(name: str, target: list[str], limit: int = 5, source: str = SOURCE_OPTION):
     """Add a YouTube link or playlist, or search picks, to the end of a playlist"""
     on_playlist(playlists.require, name)
-    count = on_playlist(playlists.add, name, resolve(target, limit))
+    count = on_playlist(playlists.add, name, resolve(target, limit, source))
     typer.echo(f"Added {count} videos to {name}")
 
 
@@ -585,6 +587,12 @@ def stop():
     remote("stop")
 
 
+@app.command(name="sleep")
+def sleep_command(spec: str = typer.Argument("", help=f"{player.SLEEP_FORMS}; none shows the timer")):
+    """Stop the playing ttyplayer after a while, or when its track ends"""
+    typer.echo(remote(f"sleep {spec}".strip())["message"])
+
+
 @app.command()
 def status():
     """Show what the playing ttyplayer is playing"""
@@ -602,18 +610,31 @@ def remote(name):
     return reply
 
 
-def resolve(target, limit):
-    """Turn a link into its videos, or search words into the videos the user picks."""
+def resolve(target, limit, source=""):
+    """Turn a link into its videos, or search words (on source, by default the setting's) into the videos the user picks."""
     from ttyplayer import youtube
 
     target_text = " ".join(target)
     if youtube.is_url(target_text):
         return lookup(youtube.fetch, target_text)
+    source = search_source(source)
 
     def more(shown):
-        return unseen(lookup(youtube.search, target_text, len(shown) + limit), shown)
+        return unseen(lookup(youtube.search, target_text, len(shown) + limit, source), shown)
+
+    return pick_from(lookup(youtube.search, target_text, limit, source), more)
+
 
-    return pick_from(lookup(youtube.search, target_text, limit), more)
+def search_source(source):
+    """source, or the search_source setting when it is empty; a one-line message and exit 1 when it is unknown."""
+    from ttyplayer import youtube
+
+    source = source or load_settings().search_source
+    try:
+        youtube.search_key(source)
+    except ValueError as error:
+        fail(str(error))
+    return source
 
 
 def pick_from(videos, more=None):
@@ -679,7 +700,7 @@ def start_mpv(with_video, on_state=None, headless_pcm=False):
 
 def print_videos(videos, start=1):
     for number, video in enumerate(videos, start=start):
-        typer.echo(f"{number:>2}. {video.title}  ({format_time(video.duration)})  {video.uploader}")
+        typer.echo(f"{number:>2}. {video.tagged_title}  ({format_time(video.duration)})  {video.uploader}")
 
 
 def lookup(func, *args):

ttyplayer-0.7.0/src/ttyplayer/models.py

@@ -0,0 +1,25 @@
+from dataclasses import dataclass
+
+TAGS = {"soundcloud": "SC"}  # the two-char mark in front of a non-YouTube row; YouTube rows have none
+
+
+@dataclass
+class Video:
+    id: str
+    title: str
+    uploader: str
+    duration: int | None  # seconds; None for live streams or when yt-dlp does not know
+    source: str = "youtube"  # one of youtube.SOURCES for a search result; the site's name for a link
+    link: str | None = None  # the page URL yt-dlp reported, for every source but youtube
+
+    @property
+    def url(self):
+        if self.source == "youtube":
+            return f"https://www.youtube.com/watch?v={self.id}"
+        return self.link
+
+    @property
+    def tagged_title(self):
+        """The title after its source's tag, "SC Song", so mixed lists read; a YouTube title as it is."""
+        tag = TAGS.get(self.source)
+        return f"{tag} {self.title}" if tag else self.title

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/src/ttyplayer/player.py

@@ -3,6 +3,7 @@ import json
 import math
 import os
 import queue
+import re
 import secrets
 import shutil
 import signal
@@ -40,6 +41,10 @@ LEVEL_KEY = "lavfi.astats.{}.Peak_level"  # {} is the channel, from 1
 LEVELS_INTERVAL = 0.1  # seconds between level reads while a track plays
 LEVEL_SILENCE = -90.0  # dBFS stored for astats' -inf
 LEVEL_FLOOR = -60.0  # dBFS at which a level bar is empty; 0 dBFS fills it
+SLEEP_FADE_SECONDS = 5  # how long the sleep timer takes to fade the volume out
+SLEEP_FADE_STEPS = 10  # volume steps in that fade
+SLEEP_FORMS = "30m, 1h, 1h30m, 90 (seconds), end or off"
+SLEEP_PATTERN = re.compile(r"(\d+)|(?:(\d+)h)?(?:(\d+)m)?", re.ASCII)  # seconds, or hours and/or minutes
 
 # What each key does, by the key's name: the character typed, or the arrow's direction.
 KEYS = {
@@ -123,6 +128,42 @@ def parse_level(text):
     return max(level, LEVEL_SILENCE)
 
 
+def parse_sleep(text):
+    """A sleep timer from `ttyplayer sleep`'s text: seconds (an int), "end" of the track, or None for off."""
+    text = text.strip().lower()
+    if text in ("end", "off"):
+        return "end" if text == "end" else None
+    match = SLEEP_PATTERN.fullmatch(text)
+    seconds, hours, minutes = (int(group or 0) for group in match.groups()) if match else (0, 0, 0)
+    seconds += hours * 3600 + minutes * 60
+    if seconds <= 0:
+        raise ValueError(f"Sleep takes {SLEEP_FORMS}, not {text!r}")
+    return seconds
+
+
+def format_sleep(sleep):
+    """status()["sleep"] as the bars show it: the time left (m:ss) or "end"; None while no timer is armed."""
+    if sleep is None:
+        return None
+    if "after" in sleep:
+        return "end"
+    return format_time(math.ceil(max(0, sleep["ends_at"] - time.time())))
+
+
+def sleep_text(sleep):
+    """zz and the time left (or end) for a status line; "" while no timer is armed."""
+    left = format_sleep(sleep)
+    return f"zz {left}" if left else ""
+
+
+def sleep_message(sleep):
+    """The `ttyplayer sleep` reply for status()["sleep"]."""
+    left = format_sleep(sleep)
+    if left is None:
+        return "Sleep timer off"
+    return "Sleeping after this track" if left == "end" else f"Sleeping in {left}"
+
+
 def macos():
     return sys.platform == "darwin"
 
@@ -157,6 +198,8 @@ def status_line(status):
     position = format_time(status["position"])
     duration = format_time(status["duration"])
     state = "Paused" if status["paused"] else "Playing"
+    if sleep := sleep_text(status.get("sleep")):
+        state += f"  {sleep}"
     volume = volume_meter(status["volume"], status["muted"])
     # The meter goes before the title, so a narrow terminal cuts the title, not the meter.
     line = f"{position} / {duration}  {state}  {volume}  {status['title']}"
@@ -287,6 +330,12 @@ class MpvClient:
     headless_pcm = False  # no local sound: process.stdout carries it as PCM for serve --stream (see stream.py)
     show_levels = False  # whether mpv runs the level filter (never under headless_pcm)
     levels = None  # [left, right] peak dBFS while a track plays with show_levels, else None
+    sleep_timer = None  # the threading.Timer of `sleep <duration>`; it also runs the fade, under fade_lock
+    sleep_ends_at = None  # epoch time that timer fires at
+    sleep_after_track = False  # `sleep end`: stop when the current track ends
+    sleep_cancelled = None  # that timer's Event, set by the next sleep() or quit(): its fade stops and restores the volume
+    timer = threading.Timer  # tests swap in fakes for both
+    fade_wait = staticmethod(threading.Event.wait)  # (cancelled, seconds): a step's pause, cut short by a cancel
 
     def __init__(self, video=False, on_play=None, on_state=None, headless_pcm=False, levels=True):
         # on_play(video) is called whenever a queued video starts; the CLI uses
@@ -313,6 +362,7 @@ class MpvClient:
             raise RuntimeError("mpv did not start")
         # Keys, listener, control socket and TUI all move through the queue.
         self.queue_lock = threading.RLock()
+        self.fade_lock = threading.RLock()  # held by a sleep timer while it fades; quit() waits on it
         self.send_lock = threading.Lock()
         self.reply_lock = threading.Lock()
         self.replies = {}  # request_id -> callback(data), until the reply arrives
@@ -375,7 +425,7 @@ class MpvClient:
                 self.notify()
         elif message.get("event") == "end-file" and message.get("reason") == "eof":
             # At the end of the queue this still notifies, to tell a UI it went idle.
-            self._edit(self._next_or_idle)
+            self._edit(self._end_of_track)
         elif message.get("event") == "end-file" and message.get("reason") == "error":
             self._edit(self._skip_failed, message.get("file_error") or "unavailable")
 
@@ -501,6 +551,9 @@ class MpvClient:
     # --- lifecycle ------------------------------------------------------
 
     def quit(self):
+        self._disarm_sleep()
+        with self.fade_lock:  # a fade, even of a cancelled timer, restores the volume before mpv goes
+            pass
         if self.poller:
             self.stop_polling.set()  # before the socket closes under it
             self.poller.join(timeout=1)
@@ -576,6 +629,8 @@ class MpvClient:
             self.toggle_mute()
         elif name == "stop":
             interrupt_main()  # run()'s Ctrl-C path quits and restores the terminal
+        elif name.partition(" ")[0] == "sleep":
+            return self.sleep_control(name.removeprefix("sleep").strip())
         elif name == "status":
             return control.ok(**self.status())
         elif name == "queue":
@@ -584,6 +639,81 @@ class MpvClient:
             return control.failure(f"unknown command {name}")
         return control.ok()
 
+    def sleep_control(self, text):
+        """`sleep <text>`: arm or cancel the timer, or with no text leave it; the reply's message says how it stands."""
+        if text:
+            try:
+                self.sleep(parse_sleep(text))
+            except ValueError as error:
+                return control.failure(str(error))
+        return control.ok(message=sleep_message(self.sleep_status()))
+
+    # --- sleep timer ------------------------------------------------------
+
+    def sleep(self, spec):
+        """Stop spec seconds from now, at the "end" of the current track, or (None) never; replaces any earlier timer."""
+        with self.queue_lock:
+            self._disarm_sleep()
+            self.sleep_after_track = spec == "end"
+            if isinstance(spec, int):
+                self.sleep_ends_at = time.time() + spec
+                self.sleep_cancelled = threading.Event()
+                self.sleep_timer = self.timer(spec, self.fall_asleep, args=(self.sleep_cancelled,))
+                self.sleep_timer.daemon = True
+                self.sleep_timer.start()
+        self.notify()
+
+    def _disarm_sleep(self):
+        """Cancel the timer and the end-of-track stop, and stop a fade (it restores the volume on its own thread)."""
+        with self.queue_lock:
+            if self.sleep_timer:
+                self.sleep_timer.cancel()
+                self.sleep_cancelled.set()
+            self.sleep_timer = self.sleep_cancelled = self.sleep_ends_at = None
+            self.sleep_after_track = False
+
+    def sleep_status(self):
+        if self.sleep_after_track:
+            return {"after": "track"}
+        if self.sleep_ends_at is not None:
+            return {"ends_at": self.sleep_ends_at}
+        return None
+
+    def fall_asleep(self, cancelled):
+        """The timer's callback, on its own thread: fade out while a track plays, then stop as `ttyplayer stop` does.
+
+        It only sends to mpv and interrupts the main thread, as the keys and the control socket do.
+        """
+        with self.fade_lock:
+            if cancelled.is_set():
+                return  # cancelled as it fired
+            volume = self.state.get(self.volume_backend())
+            if self.playing() and isinstance(volume, (int, float)) and volume > 0 and not self.fade_out(volume, cancelled):
+                return  # a newer sleep() or quit() took over
+            if not cancelled.is_set():
+                interrupt_main()
+
+    def fade_out(self, volume, cancelled):
+        """Step the volume down to 0 over SLEEP_FADE_SECONDS, pause, then put the volume back; False if cancelled first.
+
+        A cancel ends the step's wait, so the volume comes back at once, in one step.
+        """
+        step = volume / SLEEP_FADE_STEPS
+        faded = 0
+        for _ in range(SLEEP_FADE_STEPS):
+            if cancelled.is_set():
+                break
+            self.change_volume(-step)
+            faded += step
+            self.fade_wait(cancelled, SLEEP_FADE_SECONDS / SLEEP_FADE_STEPS)
+        finished = not cancelled.is_set()
+        if finished and self.playing():
+            self.toggle_pause()  # silent before the volume comes back
+        self.change_volume(faded)
+        if self.volume_writer:
+            self.volume_steps.join()  # macOS: written before quit() drops the steps left
+        return finished
+
     # --- queue ----------------------------------------------------------
 
     def add(self, video: Video):
@@ -649,6 +779,14 @@ class MpvClient:
             self.on_play(video)
         return True
 
+    def _end_of_track(self):
+        """Play the next track, or after `sleep end` stop as `ttyplayer stop` does."""
+        if self.sleep_after_track:
+            self.sleep_after_track = False
+            interrupt_main()
+            return True
+        return self._next_or_idle()
+
     def _next_or_idle(self):
         if not self._play_index(self.index + 1):
             self.idle = True
@@ -749,6 +887,7 @@ class MpvClient:
             "error": self.error,
             "stream": self.headless_pcm,
             "levels": self.levels,
+            "sleep": self.sleep_status(),
         }
 
     def notify(self):

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/src/ttyplayer/remote.py

@@ -18,7 +18,7 @@ from urllib.parse import urlsplit
 import aiohttp
 from aiohttp import WSMsgType
 
-from ttyplayer import control, server, tui
+from ttyplayer import control, player, server, tui
 from ttyplayer.models import Video
 
 REQUEST_TIMEOUT = 2  # seconds a command may hold the TUI's thread
@@ -151,7 +151,12 @@ class RemoteClient:
         return self.command("move", [source, target])
 
     def handle_control(self, name):
-        """The control socket's player commands, done on the server."""
+        """The control socket's player commands, done on the server; sleep's reply says how the timer stands."""
+        command, _, text = name.partition(" ")
+        if command == server.SLEEP_COMMAND:
+            if not self.command(command, text.strip()):
+                return control.failure(f"{command} failed on the server")
+            return control.ok(message=player.sleep_message((self.last_status or {}).get("sleep")))
         if name not in server.CONTROL_COMMANDS:
             return control.failure(f"unknown command {name}")
         return control.ok() if self.command(name) else control.failure(f"{name} failed on the server")

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/src/ttyplayer/server.py

@@ -24,15 +24,16 @@ SECRET_KEY = "server_token"  # the one setting the API never shows nor changes
 SHUTDOWN_TIMEOUT = 1  # seconds aiohttp waits for open requests when the server stops
 TOKEN_BYTES = 24
 
-# The /api/command and /ws command names: handle_control's own, then MpvClient methods
+# The /api/command and /ws command names: handle_control's own (sleep with its text, "30m"), then MpvClient methods
 # taking a number, a 0-based queue row, two rows, or nothing. COMMANDS is all of them, as /api/commands lists them.
 CONTROL_COMMANDS = {"pause", "next", "prev", "stop", "mute"}
+SLEEP_COMMAND = "sleep"
 VALUE_COMMANDS = {"seek": "seek", "volume": "change_volume"}  # name -> MpvClient method
 ROW_COMMANDS = {"jump": "jump", "remove": "remove"}
 PAIR_COMMANDS = {"move": "move"}  # [source, target]
 PLAIN_COMMANDS = {"clear_others": "clear_others"}
 COMMANDS = sorted(
-    CONTROL_COMMANDS | VALUE_COMMANDS.keys() | ROW_COMMANDS.keys() | PAIR_COMMANDS.keys() | PLAIN_COMMANDS.keys()
+    CONTROL_COMMANDS | {SLEEP_COMMAND} | VALUE_COMMANDS.keys() | ROW_COMMANDS.keys() | PAIR_COMMANDS.keys() | PLAIN_COMMANDS.keys()
 )
 
 
@@ -183,6 +184,12 @@ def run_command(client, body):
     value = body.get("value")
     if name in CONTROL_COMMANDS:
         client.handle_control(name)
+    elif name == SLEEP_COMMAND:
+        if not isinstance(value, str):
+            raise ApiError(400, f'{name} needs a text value, like "30m", "end" or "off"')
+        reply = client.handle_control(f"{name} {value}")
+        if not reply["ok"]:
+            raise ApiError(400, reply["error"])
     elif name in VALUE_COMMANDS:
         if isinstance(value, bool) or not isinstance(value, (int, float)):
             raise ApiError(400, f"{name} needs a numeric value")
@@ -216,13 +223,19 @@ async def resolve(request, first=False):
     if isinstance(body.get("url"), str):
         videos = await lookup(youtube.fetch, body["url"])
     elif isinstance(body.get("query"), str):
-        videos = await lookup(youtube.search, body["query"], live_settings(request).search_limit)
+        videos = await lookup(youtube.search, body["query"], *search_args(request))
         videos = videos[:1] if first else videos
     else:
         raise ApiError(400, 'the body needs a "url" or a "query"')
     return require_videos(videos)
 
 
+def search_args(request):
+    """youtube.search's limit and source, from the live settings."""
+    current = live_settings(request)
+    return current.search_limit, current.search_source
+
+
 def require_videos(videos):
     if not videos:
         raise ApiError(404, "No videos found")
@@ -303,8 +316,8 @@ async def get_search(request):
     query = request.query.get("q", "").strip()
     if not query:
         raise ApiError(400, "search needs ?q=")
-    videos = await lookup(youtube.search, query, live_settings(request).search_limit)
-    return web.json_response([asdict(video) for video in videos])
+    videos = await lookup(youtube.search, query, *search_args(request))
+    return web.json_response([video_json(video) for video in videos])
 
 
 @routes.get("/api/playlists")
@@ -345,7 +358,12 @@ async def post_favorite(request):
 
 
 def favorite_listing():
-    return [asdict(video) for video in favorites.load()]
+    return [video_json(video) for video in favorites.load()]
+
+
+def video_json(video):
+    """A video as the page gets it: its fields and the URL that plays it, so Play/Queue need not know its site."""
+    return {**asdict(video), "url": video.url}
 
 
 @routes.get("/api/settings")

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/src/ttyplayer/settings.py

@@ -28,6 +28,7 @@ class Settings:
     stream_enabled: bool = False  # serve streams the sound to the web remote instead of playing it
     spotify_client_id: str = ""  # the user's own Spotify app, for spotify login (public by design: PKCE)
     show_levels: bool = True  # the level meter: mpv's level filter and the TUI's two bars
+    search_source: str = "youtube"  # where a search looks: one of youtube.SOURCES
 
 
 DEFAULTS = Settings()
@@ -124,6 +125,11 @@ def check(key, value):
         raise SettingsError(
             f"server_port must be between {SERVER_PORT_RANGE.start} and {SERVER_PORT_RANGE.stop - 1}, not {value}"
         )
+    if key == "search_source":
+        from ttyplayer.youtube import SOURCES  # yt-dlp loads on use, so doctor runs without it
+
+        if value not in SOURCES:
+            raise SettingsError(f"search_source must be one of {', '.join(SOURCES)}, not {value!r}")
 
 
 def toml_value(value):

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/src/ttyplayer/spotify.py

@@ -326,7 +326,8 @@ def import_tracks(tracks, name, echo) -> int:
     try:
         for number, track in enumerate(tracks, start=1):
             prefix = f"[{number}/{len(tracks)}]"
-            found = youtube.search(track.query.strip(), 1)
+            # Always YouTube, whatever search_source says: it has far more of a Spotify catalogue than SoundCloud.
+            found = youtube.search(track.query.strip(), 1, source="youtube")
             if found:
                 saved += playlists.add(name, found[:1])
                 echo(f"{prefix} ✓ {track.label} → {found[0].title}")

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/src/ttyplayer/static/index.html

@@ -28,6 +28,7 @@
   <section id="now-playing" class="now-playing" aria-label="Now playing">
     <div class="np-head">
       <span id="np-state" class="np-state" aria-label="Stopped">■</span>
+      <span id="np-sleep" class="np-sleep"></span>
       <div class="np-text">
         <div id="np-title" class="np-title">Nothing playing</div>
         <div id="np-uploader" class="np-uploader"></div>
@@ -46,6 +47,9 @@
       <button id="play-pause" type="button" class="primary" aria-label="Play or pause">▶</button>
       <button id="next" type="button" aria-label="Next">⏭</button>
     </div>
+    <div class="sleep-row">
+      <button id="sleep" type="button" class="small">Sleep 30m</button>
+    </div>
     <div id="listen-row" class="listen-row" hidden>
       <button id="listen" type="button" aria-pressed="false">Listen here</button>
       <audio id="listen-audio" preload="none"></audio>

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/src/ttyplayer/static/remote.css

@@ -87,7 +87,7 @@ button.primary, button[type="submit"] {
 .np-state { font-size: 1.5rem; width: 1.5rem; text-align: center; }
 .np-text { flex: 1; min-width: 0; }
 .np-title { font-weight: 600; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-.np-uploader, .np-position, .times, .meta, .connection, .volume-value { color: var(--muted); font-size: 0.875rem; }
+.np-uploader, .np-position, .np-sleep, .times, .meta, .connection, .volume-value { color: var(--muted); font-size: 0.875rem; }
 
 .progress {
   height: 0.375rem;
@@ -121,7 +121,7 @@ button.icon { border: none; background: none; font-size: 1.25rem; }
 }
 .transport .primary { width: calc(var(--transport) * 1.25); height: calc(var(--transport) * 1.25); font-size: 2rem; }
 
-.listen-row { display: flex; justify-content: center; margin-top: 0.75rem; }
+.listen-row, .sleep-row { display: flex; justify-content: center; margin-top: 0.75rem; }
 .connection { text-align: center; min-height: 1.25rem; margin-top: 0.25rem; }
 
 /* --- search and the lists --- */

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/src/ttyplayer/static/remote.js

@@ -5,6 +5,7 @@
 const TOKEN_KEY = "ttyplayer-token";
 const RECONNECT_FIRST = 1000; // ms; doubles after each failed attempt
 const RECONNECT_MAX = 10000;
+const SLEEP_FOR = "30m"; // what the Sleep button arms
 
 const $ = (id) => document.getElementById(id);
 
@@ -85,10 +86,6 @@ function command(name, value) {
   return act(async () => setState(await api("POST", "/api/command", body)));
 }
 
-function videoUrl(video) {
-  return `https://www.youtube.com/watch?v=${encodeURIComponent(video.id)}`;
-}
-
 function play(body) {
   return act(async () => setState(await api("POST", "/api/play", body)));
 }
@@ -198,7 +195,16 @@ function renderNowPlaying() {
   $("mute").textContent = state.muted ? "🔇" : "🔊";
   $("mute").setAttribute("aria-pressed", String(Boolean(state.muted)));
   $("listen-row").hidden = !state.stream;
+  $("sleep").textContent = state.sleep ? "Sleep off" : `Sleep ${SLEEP_FOR}`;
   renderProgress();
+  renderSleep();
+}
+
+// zz and the time left on the player's sleep timer (zz end: when the track ends), as the TUI shows it.
+function renderSleep() {
+  const sleep = state.sleep;
+  const left = sleep && (sleep.after ? "end" : formatTime(Math.ceil(sleep.ends_at - Date.now() / 1000)));
+  $("np-sleep").textContent = left ? `zz ${left}` : "";
 }
 
 function button(label, onClick, className = "small", ariaLabel = label) {
@@ -253,7 +259,7 @@ function videoRow(video, buttons, onTap) {
 }
 
 function playOrQueueButtons(video) {
-  return [button("Play", () => play({ url: videoUrl(video) })), button("Queue", () => enqueue({ url: videoUrl(video) }))];
+  return [button("Play", () => play({ url: video.url })), button("Queue", () => enqueue({ url: video.url }))];
 }
 
 function emptyRow(text) {
@@ -416,6 +422,7 @@ function wire() {
   $("play-pause").addEventListener("click", () => command("pause"));
   $("next").addEventListener("click", () => command("next"));
   $("mute").addEventListener("click", () => command("mute"));
+  $("sleep").addEventListener("click", () => command("sleep", state.sleep ? "off" : SLEEP_FOR));
   $("volume").addEventListener("input", () => {
     volumeHeld = true;
     $("volume-value").textContent = $("volume").value;
@@ -433,7 +440,10 @@ function wire() {
   });
   $("favorites").addEventListener("toggle", () => $("favorites").open && loadFavorites());
   $("playlists").addEventListener("toggle", () => $("playlists").open && loadPlaylists());
-  setInterval(() => playing() && renderProgress(), 1000);
+  setInterval(() => {
+    if (playing()) renderProgress();
+    renderSleep();
+  }, 1000);
 }
 
 wire();

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/src/ttyplayer/tui.py

@@ -56,14 +56,16 @@ COMMANDS = [
     ("Next", "next", "Play the next track in the queue"),
     ("Previous", "prev", "Play the previous track in the queue"),
     ("Mute", "toggle_mute", "Mute or unmute"),
+    ("Sleep…", "sleep", f"Stop after a while or at the track's end: {player.SLEEP_FORMS}"),
 ]
+SLEEP_PREFILL = "30m"
 
 
-def resolve(text, limit):
-    """A link's videos, or the first `limit` search results for words."""
+def resolve(text, limit, source):
+    """A link's videos, or the first `limit` search results for words on source."""
     if youtube.is_url(text):
         return youtube.fetch(text)
-    return youtube.search(text, limit)
+    return youtube.search(text, limit, source)
 
 
 def number_cell(number, playing):
@@ -72,7 +74,7 @@ def number_cell(number, playing):
 
 def video_cells(video, number, playing=False, favorite=False):
     """One table row in column order: #, Title (♥ when a favorite), Uploader, Length."""
-    title = video.title + FAVORITE_MARK if favorite else video.title
+    title = video.tagged_title + FAVORITE_MARK if favorite else video.tagged_title
     return number_cell(number, playing), Text(title), Text(video.uploader), format_time(video.duration)
 
 
@@ -138,6 +140,7 @@ class NowPlaying(Vertical):
             yield Static(id="np-time")
         with Horizontal(classes="np-line"):
             yield Static(id="np-volume")
+            yield Static(id="np-sleep")
             yield Static(id="np-next", markup=False)
             yield Static(id="np-timing")
         yield LevelMeter("L", id="np-level-left", classes="np-level")
@@ -164,6 +167,7 @@ class NowPlaying(Vertical):
             f"{format_time(status['position'])} / {format_time(status['duration'])}"
         )
         self.query_one("#np-volume", Static).update(player.volume_meter(status["volume"], status["muted"]))
+        self.query_one("#np-sleep", Static).update(player.sleep_text(status.get("sleep")))
         self.query_one("#np-next", Static).update(queue_text(status))
         self.query_one("#np-timing", Static).update(timing_text(status))
 
@@ -345,20 +349,24 @@ class HelpScreen(ModalScreen):
 
 
 class NameScreen(ModalScreen):
-    """Asks for a playlist name: Enter runs save(name), whose PlaylistError stays on screen until a name works."""
+    """Asks for a playlist name, or another line: Enter runs save(name), whose error stays on screen until a name works.
+
+    The error is a PlaylistError, or a ValueError (a sleep timer's text).
+    """
 
     BINDINGS = [Binding("escape", "dismiss", "Cancel", show=False)]
 
-    def __init__(self, title, name, save):
+    def __init__(self, title, name, save, placeholder=playlists.NAME_RULE):
         super().__init__()
         self.title_text = title
         self.prefill = name
         self.save = save
+        self.placeholder = placeholder
 
     def compose(self) -> ComposeResult:
         with Vertical(classes="dialog") as box:
             box.border_title = self.title_text
-            yield Input(value=self.prefill, placeholder=playlists.NAME_RULE)
+            yield Input(value=self.prefill, placeholder=self.placeholder)
             yield Static(id="name-error", markup=False)
 
     @on(Input.Submitted)
@@ -367,7 +375,7 @@ class NameScreen(ModalScreen):
         name = event.value.strip()
         try:
             self.save(name)
-        except playlists.PlaylistError as error:
+        except (playlists.PlaylistError, ValueError) as error:
             self.query_one("#name-error", Static).update(str(error))
             return
         self.dismiss(name)
@@ -475,7 +483,7 @@ class TtyplayerApp(App):
         self.client_factory = client_factory
         self.resolve = resolve
         self.video = video
-        self.searched = None  # the text behind the Search tab's rows, for m
+        self.searched = None  # the text behind the Search tab's rows (its sc: or yt: kept), for m
         self.favorite_ids = set()
         self.history_stale = False
         self.queue_shown = ([], None)
@@ -487,7 +495,7 @@ class TtyplayerApp(App):
     def compose(self) -> ComposeResult:
         yield Header(show_clock=self.settings.show_clock)
         with Horizontal(id="search-row"):
-            yield SearchBox(placeholder="Search YouTube or paste a link…")
+            yield SearchBox(placeholder="Search (sc: SoundCloud, yt: YouTube) or paste a link…")
             yield LoadingIndicator()
         with TabbedContent():
             with TabPane("Search", id="search"):
@@ -540,20 +548,22 @@ class TtyplayerApp(App):
 
     @work(thread=True, exclusive=True)
     def lookup(self, text, shown=None):
-        """Search for text; with shown, for the results after those (as the CLI's m does)."""
+        """Search for text (a leading sc: or yt: picks the source); with shown, for the results after those (as the CLI's m does)."""
         videos, error = None, None
+        source, query = youtube.split_source(text, self.settings.search_source)
         try:
             limit = self.settings.search_limit
             if shown is None:
-                videos = self.resolve(text, limit)
+                videos = self.resolve(query, limit, source)
             else:
-                videos = unseen(self.resolve(text, len(shown) + limit), shown)
+                videos = unseen(self.resolve(query, len(shown) + limit, source), shown)
         except youtube.YouTubeError as caught:
             error = caught
         if not get_current_worker().is_cancelled:  # a newer search replaced this one
-            self.call_from_thread(self.search_done, text, videos, error, shown)
+            heading = "Search" if youtube.is_url(query) else f"{youtube.SOURCE_NAMES[source]} results"
+            self.call_from_thread(self.search_done, text, videos, error, shown, heading)
 
-    def search_done(self, text, videos, error, shown):
+    def search_done(self, text, videos, error, shown, heading):
         self.set_searching(False)
         if error is not None:
             self.toast(f"YouTube lookup failed: {error}", severity="error")
@@ -563,6 +573,7 @@ class TtyplayerApp(App):
             self.query_one(ResultsTable).show(shown + videos, self.playing_video(), self.favorite_ids)
         else:
             self.searched = text
+            self.query_one(TabbedContent).get_tab("search").label = heading
             self.show_results(videos)
 
     def show_results(self, videos):
@@ -931,6 +942,27 @@ class TtyplayerApp(App):
         if self.client:
             self.client.toggle_mute()
 
+    def action_sleep(self):
+        """Sleep…: a sleep timer's text (30m, end, off, …) for the player; Esc leaves the timer as it is."""
+        if self.screen is not self.screen_stack[0]:
+            return
+        replies = []
+
+        def arm(text):
+            player.parse_sleep(text)  # a ValueError stays in the dialog
+            if self.client is None:
+                raise ValueError("Nothing is playing")
+            reply = self.client.handle_control(f"sleep {text}")
+            if not reply["ok"]:
+                raise ValueError(reply["error"])
+            replies.append(reply["message"])
+
+        def armed(text):
+            if text is not None:
+                self.toast(replies[-1], severity="information")
+
+        self.push_screen(NameScreen("Sleep timer", SLEEP_PREFILL, arm, placeholder=player.SLEEP_FORMS), armed)
+
     def action_next_theme(self):
         themes = sorted(self.available_themes)
         self.theme = themes[(themes.index(self.theme) + 1) % len(themes)]

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/src/ttyplayer/tui.tcss

@@ -101,6 +101,11 @@ NowPlaying.-no-levels .np-level {
     width: auto;
 }
 
+#np-sleep {
+    width: auto;
+    padding-left: 2;
+}
+
 #np-next {
     width: 1fr;
     padding-left: 4;

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/src/ttyplayer/utils.py

@@ -11,6 +11,8 @@ APP_NAME = "ttyplayer"  # the product name; every path, prefix and message deriv
 OLD_NAME = "cli" "tube"  # the name before ttyplayer, split so the old-name grep guard stays clean
 WINDOWS = sys.platform == "win32"  # the one platform test; modules import it, tests patch theirs
 VIDEO_ID = re.compile(r"[A-Za-z0-9_-]{11}")  # channel (UC…, 24) and playlist ids are longer
+# yt-dlp's key for a single track of each of youtube.SOURCES; a test keeps the two in step.
+TRACK_EXTRACTORS = ("Youtube", "Soundcloud")
 
 
 def data_path(filename):
@@ -41,13 +43,22 @@ def format_time(seconds):
     return f"{mins}:{secs:02d}"
 
 
+def extractor(entry):
+    """The yt-dlp extractor behind an entry: ie_key in a flat list, extractor_key in a full one."""
+    return entry.get("ie_key") or entry.get("extractor_key")
+
+
 def video_from_info(entry):
-    """Build a Video from one yt-dlp entry. Only id is guaranteed to be present."""
+    """Build a Video from one yt-dlp entry, or a stored one (which names its source). Only id is guaranteed to be present."""
+    source = entry.get("source") or (extractor(entry) or "youtube").lower()
     return Video(
         id=entry["id"],
         title=entry.get("title") or "Untitled",
         uploader=entry.get("uploader") or entry.get("channel") or "Unknown",
         duration=entry.get("duration"),
+        source=source,
+        # a SoundCloud search entry's url is an API one; webpage_url is the page people share
+        link=None if source == "youtube" else entry.get("link") or entry.get("webpage_url") or entry.get("url"),
     )
 
 
@@ -58,6 +69,8 @@ def video_entry(video, stamp):
         "title": video.title,
         "uploader": video.uploader,
         "duration": video.duration,
+        "source": video.source,
+        "link": video.link,
         stamp: datetime.now(timezone.utc).isoformat(timespec="seconds"),
     }
 
@@ -92,8 +105,9 @@ def is_video(entry):
     """Whether a yt-dlp entry is a playable video: a search also returns channels and playlists."""
     if not entry:  # yt-dlp leaves None in place of deleted or private playlist entries
         return False
-    if "ie_key" in entry:
-        return entry["ie_key"] == "Youtube"  # "YoutubeTab" for channels and playlists
+    if extractor(entry):
+        # "YoutubeTab", "SoundcloudSet", "SoundcloudUser"… for channels and playlists
+        return extractor(entry) in TRACK_EXTRACTORS
     return bool(VIDEO_ID.fullmatch(entry.get("id") or ""))
 
 

{ttyplayer-0.6.0 → ttyplayer-0.7.0}/src/ttyplayer/youtube.py

@@ -4,6 +4,12 @@ from yt_dlp.utils import DownloadError
 from ttyplayer.models import Video
 from ttyplayer.utils import handle_many_entries, video_from_info
 
+SOURCES = ("youtube", "soundcloud")  # where search can look; the search_source setting is one of these
+# Each source's two letters: yt-dlp's search key (ytsearch5:, scsearch5:) and the TUI's yt:/sc: prefix.
+PREFIXES = dict(zip(("yt", "sc"), SOURCES))
+SOURCE_NAMES = dict(zip(SOURCES, ("YouTube", "SoundCloud")))
+
+
 class _Silent:
     """yt-dlp prints errors to stderr even when quiet; we report them ourselves."""
 
@@ -40,11 +46,27 @@ def _clean(message):
     return message.removeprefix("ERROR: ").strip()
 
 
-def search(query, limit=5) -> list[Video]:
-    info = _extract(f"ytsearch{limit}:{query}")
+def search(query, limit=5, source="youtube") -> list[Video]:
+    info = _extract(f"{search_key(source)}search{limit}:{query}")
     return handle_many_entries(info.get("entries", []))
 
 
+def search_key(source):
+    """The two letters of a source; ValueError naming the valid ones for anything else."""
+    for prefix, known in PREFIXES.items():
+        if known == source:
+            return prefix
+    raise ValueError(f"Unknown source {source!r}; valid sources: {', '.join(SOURCES)}")
+
+
+def split_source(text, default):
+    """(source, query) for search box text: a leading yt: or sc: picks the source, else default."""
+    prefix, colon, rest = text.partition(":")
+    if colon and prefix.strip().lower() in PREFIXES:
+        return PREFIXES[prefix.strip().lower()], rest.strip()
+    return default, text
+
+
 def fetch(url) -> list[Video]:
     """A single video link gives a one-item list; a playlist link gives every entry."""
     return fetch_playlist(url)[1]

ttyplayer-0.6.0/src/ttyplayer/models.py

@@ -1,13 +0,0 @@
-from dataclasses import dataclass
-
-
-@dataclass
-class Video:
-    id: str
-    title: str
-    uploader: str
-    duration: int | None  # seconds; None for live streams or when yt-dlp does not know
-
-    @property
-    def url(self):
-        return f"https://www.youtube.com/watch?v={self.id}"