ytm-cli 0.7.0__tar.gz → 0.7.1__tar.gz

{ytm_cli-0.7.0 → ytm_cli-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ytm-cli
-Version: 0.7.0
+Version: 0.7.1
 Summary: YouTube Music CLI tool with interactive terminal interface
 Author-email: thieuluan <thieuluan.dark@gmail.com>
 License-Expression: MIT
@@ -61,9 +61,6 @@ Stream music directly from YouTube Music in your terminal with intuitive control
 ```bash
 # Install from PyPI
 uvx ytm-cli "song name"
-
-# Or from source (no clone needed)
-uvx --from git+https://github.com/thieuluan1618/ytm.git ytm-cli "song name"
 ```
 
 <details>

{ytm_cli-0.7.0 → ytm_cli-0.7.1}/README.md

@@ -33,9 +33,6 @@ Stream music directly from YouTube Music in your terminal with intuitive control
 ```bash
 # Install from PyPI
 uvx ytm-cli "song name"
-
-# Or from source (no clone needed)
-uvx --from git+https://github.com/thieuluan1618/ytm.git ytm-cli "song name"
 ```
 
 <details>

{ytm_cli-0.7.0 → ytm_cli-0.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ytm-cli"
-version = "0.7.0"
+version = "0.7.1"
 description = "YouTube Music CLI tool with interactive terminal interface"
 readme = "README.md"
 license = "MIT"

ytm_cli-0.7.1/tests/test_cache.py

@@ -0,0 +1,111 @@
+"""Tests for ytm_cli.cache."""
+
+import json
+import time
+from unittest.mock import patch
+
+import pytest
+
+from ytm_cli import cache as cache_module
+
+
+@pytest.fixture
+def temp_cache_file(tmp_path, monkeypatch):
+    """Redirect CACHE_FILE to an isolated temp path for each test."""
+    path = tmp_path / "ytm_cache.json"
+    monkeypatch.setattr(cache_module, "CACHE_FILE", str(path))
+    return path
+
+
+class TestLoadSaveCache:
+    def test_load_cache_returns_empty_dict_when_missing(self, temp_cache_file):
+        assert cache_module.load_cache() == {}
+
+    def test_load_cache_returns_empty_dict_on_invalid_json(self, temp_cache_file):
+        temp_cache_file.write_text("not json {{{")
+        assert cache_module.load_cache() == {}
+
+    def test_save_cache_then_load_round_trip(self, temp_cache_file):
+        payload = {"k": {"data": "v", "timestamp": 1234.0}}
+        cache_module.save_cache(payload)
+        assert json.loads(temp_cache_file.read_text()) == payload
+        assert cache_module.load_cache() == payload
+
+
+class TestGetSetCached:
+    def test_get_cached_missing_key_returns_none(self, temp_cache_file):
+        assert cache_module.get_cached("nope") is None
+
+    def test_set_then_get_returns_value(self, temp_cache_file):
+        cache_module.set_cached("query1", "result1")
+        assert cache_module.get_cached("query1") == "result1"
+
+    def test_get_cached_expired_entry_removed_and_returns_none(self, temp_cache_file):
+        # Write an entry with timestamp older than the TTL.
+        old_ts = time.time() - cache_module.CACHE_TTL - 100
+        cache_module.save_cache({"old": {"data": "stale", "timestamp": old_ts}})
+
+        assert cache_module.get_cached("old") is None
+        # Expired entry should be evicted from disk on read.
+        assert "old" not in cache_module.load_cache()
+
+    def test_set_cached_overwrites_existing(self, temp_cache_file):
+        cache_module.set_cached("k", "v1")
+        cache_module.set_cached("k", "v2")
+        assert cache_module.get_cached("k") == "v2"
+
+
+class TestClearExpired:
+    def test_clear_expired_removes_only_old_entries(self, temp_cache_file):
+        now = time.time()
+        cache_module.save_cache(
+            {
+                "fresh": {"data": "a", "timestamp": now},
+                "stale": {"data": "b", "timestamp": now - cache_module.CACHE_TTL - 10},
+            }
+        )
+
+        cache_module.clear_expired()
+
+        remaining = cache_module.load_cache()
+        assert "fresh" in remaining
+        assert "stale" not in remaining
+
+    def test_clear_expired_on_empty_cache_is_noop(self, temp_cache_file):
+        cache_module.clear_expired()
+        assert cache_module.load_cache() == {}
+
+
+class TestSearchWithCache:
+    def test_search_with_cache_calls_search_func_on_miss(self, temp_cache_file):
+        search_func = lambda q: [{"title": q}]  # noqa: E731
+
+        result = cache_module.search_with_cache("song", search_func)
+
+        assert result == [{"title": "song"}]
+        # Underlying entry is JSON-serialized.
+        stored = cache_module.get_cached("song")
+        assert json.loads(stored) == [{"title": "song"}]
+
+    def test_search_with_cache_uses_cached_value_on_hit(self, temp_cache_file):
+        calls = {"n": 0}
+
+        def search_func(q):
+            calls["n"] += 1
+            return [{"title": q}]
+
+        cache_module.search_with_cache("song", search_func)
+        cache_module.search_with_cache("song", search_func)
+
+        assert calls["n"] == 1  # second call served from cache
+
+    def test_search_with_cache_handles_non_string_cached_value(self, temp_cache_file):
+        # Pre-populate cache with a non-string (already-deserialized) value.
+        cache_module.set_cached("song", [{"title": "song"}])
+
+        # search_func should NOT be called.
+        with patch.object(cache_module, "save_cache") as mock_save:
+            result = cache_module.search_with_cache("song", lambda q: pytest.fail("must not call"))
+
+        assert result == [{"title": "song"}]
+        mock_save.assert_not_called()

ytm_cli-0.7.1/tests/test_spectrum.py

@@ -0,0 +1,167 @@
+"""Tests for ytm_cli.spectrum.SpectrumAnalyzer.
+
+These cover the parts that don't require an ffmpeg subprocess: band-bin
+construction, availability detection, start/stop guard behaviour, and
+get_bands gating on _has_data.
+"""
+
+from unittest.mock import MagicMock, patch
+
+import numpy as np
+import pytest
+
+from ytm_cli.spectrum import SpectrumAnalyzer
+
+
+class TestInitAndBandBins:
+    def test_default_n_bands(self):
+        sa = SpectrumAnalyzer()
+        assert sa.n_bands == 24
+        assert sa._bands.shape == (24,)
+        assert sa._bands.dtype == np.float32
+        assert np.all(sa._bands == 0.0)
+
+    def test_custom_n_bands(self):
+        sa = SpectrumAnalyzer(n_bands=8)
+        assert sa.n_bands == 8
+        assert sa._bands.shape == (8,)
+        assert len(sa._band_slices) == 8
+
+    def test_band_slices_are_monotonic_and_non_empty(self):
+        sa = SpectrumAnalyzer(n_bands=12)
+        last_hi = -1
+        for lo, hi in sa._band_slices:
+            assert hi > lo, "every band must contain at least one bin"
+            assert lo >= last_hi or lo == 0, "bands should be non-decreasing"
+            last_hi = hi
+
+    def test_window_matches_chunk_size(self):
+        sa = SpectrumAnalyzer()
+        assert sa._window.shape == (SpectrumAnalyzer.CHUNK,)
+        assert sa._window.dtype == np.float32
+        # Hann window peaks near the center.
+        assert sa._window.max() == pytest.approx(1.0, rel=1e-2)
+
+    def test_initial_state_flags(self):
+        sa = SpectrumAnalyzer()
+        assert sa._running is False
+        assert sa._has_data is False
+        assert sa._proc is None
+        assert sa._thread is None
+
+
+class TestAvailable:
+    def test_available_returns_true_when_ffmpeg_in_path(self):
+        with patch("ytm_cli.spectrum.shutil.which", return_value="/usr/bin/ffmpeg"):
+            assert SpectrumAnalyzer.available() is True
+
+    def test_available_returns_false_when_ffmpeg_missing(self):
+        with patch("ytm_cli.spectrum.shutil.which", return_value=None):
+            assert SpectrumAnalyzer.available() is False
+
+
+class TestGetBands:
+    def test_get_bands_returns_none_before_any_data(self):
+        sa = SpectrumAnalyzer()
+        assert sa.get_bands() is None
+
+    def test_get_bands_returns_list_after_data_flag(self):
+        sa = SpectrumAnalyzer(n_bands=4)
+        sa._bands = np.array([0.1, 0.2, 0.3, 0.4], dtype=np.float32)
+        sa._has_data = True
+
+        bands = sa.get_bands()
+        assert isinstance(bands, list)
+        assert len(bands) == 4
+        for got, want in zip(bands, [0.1, 0.2, 0.3, 0.4], strict=True):
+            assert got == pytest.approx(want, rel=1e-5)
+
+
+class TestStart:
+    def test_start_returns_false_when_ffmpeg_unavailable(self):
+        sa = SpectrumAnalyzer()
+        with patch.object(SpectrumAnalyzer, "available", return_value=False):
+            assert sa.start("http://example/audio") is False
+        assert sa._running is False
+
+    def test_start_returns_false_with_empty_url(self):
+        sa = SpectrumAnalyzer()
+        with patch.object(SpectrumAnalyzer, "available", return_value=True):
+            assert sa.start("") is False
+
+    def test_start_returns_false_when_popen_raises_oserror(self):
+        sa = SpectrumAnalyzer()
+        with (
+            patch.object(SpectrumAnalyzer, "available", return_value=True),
+            patch("ytm_cli.spectrum.subprocess.Popen", side_effect=OSError("boom")),
+        ):
+            assert sa.start("http://example/audio") is False
+        assert sa._running is False
+
+    def test_start_spawns_ffmpeg_and_marks_running(self):
+        sa = SpectrumAnalyzer()
+        fake_proc = MagicMock()
+        fake_proc.poll.return_value = None
+        # Reader will hit `len(data) < chunk_bytes` immediately and exit.
+        fake_proc.stdout.read.return_value = b""
+
+        with (
+            patch.object(SpectrumAnalyzer, "available", return_value=True),
+            patch("ytm_cli.spectrum.subprocess.Popen", return_value=fake_proc) as mock_popen,
+        ):
+            ok = sa.start("http://example/audio")
+
+        assert ok is True
+        assert sa._proc is fake_proc
+        assert sa._thread is not None
+        # Ensure we asked ffmpeg for s16le mono at the analyzer's sample rate.
+        cmd = mock_popen.call_args.args[0]
+        assert cmd[0] == "ffmpeg"
+        assert "-f" in cmd and cmd[cmd.index("-f") + 1] == "s16le"
+        assert "-ac" in cmd and cmd[cmd.index("-ac") + 1] == "1"
+        assert "-ar" in cmd and cmd[cmd.index("-ar") + 1] == str(SpectrumAnalyzer.SR)
+
+
+class TestStop:
+    def test_stop_when_never_started_is_safe(self):
+        sa = SpectrumAnalyzer(n_bands=4)
+        sa._bands = np.array([0.5, 0.5, 0.5, 0.5], dtype=np.float32)
+        sa._has_data = True
+
+        sa.stop()
+
+        assert sa._running is False
+        assert sa._proc is None
+        assert sa._thread is None
+        assert sa._has_data is False
+        assert np.all(sa._bands == 0.0)
+
+    def test_stop_terminates_running_process(self):
+        sa = SpectrumAnalyzer()
+        fake_proc = MagicMock()
+        fake_proc.wait.return_value = 0
+        sa._proc = fake_proc
+        sa._running = True
+
+        sa.stop()
+
+        fake_proc.terminate.assert_called_once()
+        fake_proc.wait.assert_called()
+        assert sa._proc is None
+        assert sa._running is False
+
+    def test_stop_kills_process_on_terminate_timeout(self):
+        sa = SpectrumAnalyzer()
+        fake_proc = MagicMock()
+        # First wait raises TimeoutExpired, then kill+wait succeed.
+        from subprocess import TimeoutExpired
+
+        fake_proc.wait.side_effect = [TimeoutExpired(cmd="ffmpeg", timeout=1), 0]
+        sa._proc = fake_proc
+        sa._running = True
+
+        sa.stop()
+
+        fake_proc.terminate.assert_called_once()
+        fake_proc.kill.assert_called_once()
+        assert sa._proc is None

{ytm_cli-0.7.0 → ytm_cli-0.7.1}/ytm_cli/__init__.py

@@ -1,3 +1,3 @@
 """YouTube Music CLI - A terminal interface for YouTube Music"""
 
-__version__ = "0.7.0"
+__version__ = "0.7.1"

{ytm_cli-0.7.0 → ytm_cli-0.7.1}/ytm_cli/main.py

@@ -7,6 +7,7 @@ from curses import wrapper
 
 from rich import print
 
+from . import __version__
 from .config import get_songs_to_display, ytmusic
 from .dislikes import dislike_manager
 from .player import play_music_with_controls
@@ -479,8 +480,13 @@ During music playback:
 
     # Global options (available for all commands)
     parser.add_argument(
-        "--verbose",
+        "--version",
         "-v",
+        action="version",
+        version=f"ytm-cli {__version__}",
+    )
+    parser.add_argument(
+        "--verbose",
         action="store_true",
         help="Enable verbose output with detailed logging",
     )
@@ -510,7 +516,6 @@ During music playback:
     )
     search_parser.add_argument(
         "--verbose",
-        "-v",
         action="store_true",
         help="Enable verbose output with detailed logging",
     )
@@ -543,9 +548,7 @@ During music playback:
     llm_ask_parser.add_argument(
         "prompt", help="Natural language request for music (e.g. 'play upbeat pop songs')"
     )
-    llm_ask_parser.add_argument(
-        "--verbose", "-v", action="store_true", help="Enable verbose output"
-    )
+    llm_ask_parser.add_argument("--verbose", action="store_true", help="Enable verbose output")
 
     # llm playlist - AI-generated playlist
     llm_playlist_parser = llm_subparsers.add_parser(
@@ -560,9 +563,7 @@ During music playback:
     llm_playlist_parser.add_argument(
         "--play", "-p", action="store_true", help="Start playing after creation"
     )
-    llm_playlist_parser.add_argument(
-        "--verbose", "-v", action="store_true", help="Enable verbose output"
-    )
+    llm_playlist_parser.add_argument("--verbose", action="store_true", help="Enable verbose output")
 
     playlist_subparsers.add_parser(
         "list",

{ytm_cli-0.7.0 → ytm_cli-0.7.1}/ytm_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ytm-cli
-Version: 0.7.0
+Version: 0.7.1
 Summary: YouTube Music CLI tool with interactive terminal interface
 Author-email: thieuluan <thieuluan.dark@gmail.com>
 License-Expression: MIT
@@ -61,9 +61,6 @@ Stream music directly from YouTube Music in your terminal with intuitive control
 ```bash
 # Install from PyPI
 uvx ytm-cli "song name"
-
-# Or from source (no clone needed)
-uvx --from git+https://github.com/thieuluan1618/ytm.git ytm-cli "song name"
 ```
 
 <details>

{ytm_cli-0.7.0 → ytm_cli-0.7.1}/ytm_cli.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 README.md
 pyproject.toml
+tests/test_cache.py
 tests/test_config.py
 tests/test_dislikes.py
 tests/test_ffmpeg_player.py
@@ -10,6 +11,7 @@ tests/test_lyrics_service.py
 tests/test_main.py
 tests/test_playlists.py
 tests/test_runner.py
+tests/test_spectrum.py
 tests/test_ui.py
 tests/test_utils.py
 ytm_cli/__init__.py