freeflix-cli 2.1.0__tar.gz → 2.1.2__tar.gz

{freeflix_cli-2.1.0 → freeflix_cli-2.1.2}/.github/workflows/ci.yml

@@ -1,7 +1,9 @@
 name: CI
 
-# Lint + tests on every push and PR, on Linux, Windows AND macOS, so
-# regressions (e.g. the Windows arrow-key breakage) are caught before release.
+# Lint + tests on every push and PR, on Linux and Windows. macOS lives in
+# macos.yml: GitHub's macOS runners are frequently unavailable, and having
+# them in this required matrix turned green code into red runs. macOS is still
+# tested on demand / weekly.
 on:
   push:
     branches: [main]
@@ -26,8 +28,6 @@ jobs:
         os: [ubuntu-22.04, windows-latest]
         python-version: ['3.9', '3.12']
         include:
-          - os: macos-latest
-            python-version: '3.12'
           - os: ubuntu-22.04
             python-version: '3.11'
           - os: ubuntu-22.04

freeflix_cli-2.1.2/.github/workflows/macos.yml

@@ -0,0 +1,36 @@
+name: macOS
+
+# macOS is tested separately: the hosted macos-latest runners are often
+# unavailable (job never acquired), which must not turn every push red.
+# Run it manually before a release, or let the weekly schedule catch drift.
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 4 * * 1'   # Monday 04:00 UTC
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: Lint + tests (macos-latest, py3.12)
+    runs-on: macos-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v3
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+      - name: Ruff
+        run: uvx ruff==0.17.3 check --select E,W,F,B --ignore E501,E402 src/freeflix_cli/
+      - name: Import every module
+        run: >
+          uv run --with . python -c "import pkgutil,importlib,freeflix_cli;
+          [importlib.import_module(m.name) for m in
+          pkgutil.walk_packages(freeflix_cli.__path__,'freeflix_cli.')];
+          print('all modules import OK')"
+      - name: Pytest
+        run: >
+          uv run --with . --with pytest --with pytest-cov --with pytest-timeout
+          -m pytest -q --timeout=120

{freeflix_cli-2.1.0 → freeflix_cli-2.1.2}/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 2.1.2
+
+- **Téléchargements Vidzy / fsvid / uqload réparés** : l'URL passée à yt-dlp
+  traverse toujours le proxy local curl_cffi (fingerprint navigateur), mais
+  elle porte maintenant le **jeton de capacité `?k=`** et le **jeton
+  d'en-têtes `?h=`** ajoutés en 2.1. Sans eux, le proxy répondait 403 : le
+  streaming fonctionnait, le téléchargement échouait.
+- Vérifié en réel sur FROM S1E1 : fsvid et vidzy résolus, yt-dlp natif a
+  téléchargé 34/316 fragments via le proxy sans erreur.
+- Test du flux « Nouveautés » isolé des séries réellement suivies (plus de
+  dépendance à l'état local de la machine).
+- **CI macOS séparée** : les runners macOS GitHub sont souvent indisponibles
+  (« job was not acquired »), ce qui rendait la CI rouge sans bug de code.
+  macOS passe dans `macos.yml` (manuel + hebdomadaire) ; la CI de push reste
+  Linux + Windows.
+- 588 tests au vert, ruff OK. Aucun changement d'interface : le code écran
+  reste celui de la 2.1.1.
+
+## 2.1.1
+
+- **Binaire Windows réparé** : `--doctor` (et le reste de l'interface) force
+  UTF-8 sur stdout/stderr quand la console est en cp1252 ; le smoke test du
+  binaire autonome passe à nouveau.
+- 586 tests au vert, ruff OK.
+
 ## 2.1.0 — Fiabilité, sécurité et cohérence
 
 Version de consolidation : l'audit complet de la 2.0.0 a été appliqué de bout
@@ -124,7 +149,7 @@ en bout, sans changement de fonctionnalité visible.
 - Tests dédiés `cli.py`, `doctor.py`, `providers_registry`, `config_loader`,
   `install_health`, thèmes/UI, métadonnées de reprise, noms Windows, garde-fous
   de release et IPC Windows.
-- 585 tests au vert, ruff OK.
+- 586 tests au vert, ruff OK.
 
 ## 2.0.0 — Cinéma Noir
 

{freeflix_cli-2.1.0 → freeflix_cli-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: freeflix-cli
-Version: 2.1.0
+Version: 2.1.2
 Summary: Watch movies, series, and anime from your terminal — multi-language, multi-source, no browser required. A maintained fork of autoflix-cli.
 Project-URL: Homepage, https://github.com/freedy237/freeflix-cli
 Project-URL: Repository, https://github.com/freedy237/freeflix-cli.git

{freeflix_cli-2.1.0 → freeflix_cli-2.1.2}/docs/SCORECARD-2.1.0.md

@@ -12,7 +12,7 @@ ouvert ; il ne s'agit pas d'une note « commerciale ».
 | **Robustesse réseau** | 7,5 | **8,5** | placeholder <90 s y compris MP4 direct, plafond 5 min sans octet, budget analyse 55/60 s, cache qualité 5 min, TLS DoH vérifié, SSRF + jeton proxy, reprise Range | pas de budget adaptatif par type de lecteur |
 | **Téléchargements** | 6,5 | **9** | reprise séquentielle réparée, staging + vérification + `os.replace`, `.part` atomique, annulation propagée + kill après 5 s, métadonnées sans cookies en 0600, noms Windows réservés, balayage des sous-titres temp | vérification taille seule si ffprobe absent |
 | **Multi-OS** | 5,5 | **8,5** | CI Linux/Windows/macOS × 3.9→3.13, build wheel + smoke install, syntaxe PowerShell vérifiée, mpv arm64 macOS/Windows, IPC Windows non bloquant, installateurs tolérants, chemins mpv alignés | pas de validation physique Windows/macOS dans cette session |
-| **Tests / CI** | 6 | **9** | **585 tests** verts, couverture **~45 %** (plancher 40), `pytest-timeout=120`, ruff épinglé, suite offline, 47 tests de non-régression/unitaires ajoutés, matrice 5 environnements | quelques assertions historiques faibles, pas de tests de rendu visuel |
+| **Tests / CI** | 6 | **9** | **586 tests** verts, couverture **~45 %** (plancher 40), `pytest-timeout=120`, ruff épinglé, suite offline, 47 tests de non-régression/unitaires ajoutés, matrice 5 environnements | quelques assertions historiques faibles, pas de tests de rendu visuel |
 | **Release / packaging** | 5 | **8,5** | release gardée par tests + version==tag + `twine check`, `SHA256SUMS`, binaires déclenchés explicitement (`workflow_dispatch`), `--add-data`, smoke `--doctor`, tests de config de release | chaîne binaires à exécuter au prochain tag réel |
 | **Documentation** | 4 | **9** | README 2.1 (10 sources, planning, souris, dev), index `docs/`, USAGE, ARCHITECTURE, TROUBLESHOOTING, RELEASE, SECURITY, CONTRIBUTING, CHANGELOG détaillé | pas de captures d'écran/GIF |
 | **Sécurité** | 7 | **9** | jeton de capacité proxy (SSRF local), SSRF DNS/IP, TLS DoH, cookies retirés des métadonnées, URLs signées masquées, toasts PowerShell sans interpolation, PATH registre, checksums d'artefacts | `enc-dec.app` tiers pour GoldenMS, `curl \| sh` de `uv` dans un installeur |

{freeflix_cli-2.1.0 → freeflix_cli-2.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "freeflix-cli"
-version = "2.1.0"
+version = "2.1.2"
 description = "Watch movies, series, and anime from your terminal — multi-language, multi-source, no browser required. A maintained fork of autoflix-cli."
 readme = "README.md"
 requires-python = ">=3.9.2"

{freeflix_cli-2.1.0 → freeflix_cli-2.1.2}/src/freeflix_cli/cli.py

@@ -9,6 +9,22 @@ a few tens of milliseconds instead of paying the whole import tax.
 import sys
 
 
+def _utf8_console() -> None:
+    """Force UTF-8 on stdout/stderr when the console defaults to cp1252.
+
+    The Windows standalone binary inherits a cp1252 console; --doctor (box
+    drawing, arrows) then crashed with UnicodeEncodeError before printing
+    anything. TUI output uses the same code path.
+    """
+    for stream in (sys.stdout, sys.stderr):
+        try:
+            enc = (getattr(stream, "encoding", "") or "").lower().replace("-", "")
+            if enc not in ("utf8", "utf8mb4"):
+                stream.reconfigure(encoding="utf-8", errors="replace")
+        except Exception:
+            pass
+
+
 def _version() -> str:
     try:
         import importlib.metadata as _im
@@ -37,6 +53,7 @@ def print_help():
 
 def main():
     """Entry point: fast flags first, then the real application."""
+    _utf8_console()
     args = set(sys.argv[1:])
     if args & {"--version", "-V"}:
         print(_version())

{freeflix_cli-2.1.0 → freeflix_cli-2.1.2}/src/freeflix_cli/install_health.py

@@ -13,7 +13,7 @@ import os
 import sys
 
 # Version BAKED INTO THE CODE — bump together with pyproject.toml.
-CODE_VERSION = "2.1.0"
+CODE_VERSION = "2.1.2"
 
 
 def metadata_version() -> str | None:

{freeflix_cli-2.1.0 → freeflix_cli-2.1.2}/src/freeflix_cli/player_manager.py

@@ -1898,6 +1898,38 @@ def _purge_download_temp(temp_dir: str, keep_incomplete: bool = True) -> None:
             pass
 
 
+def _proxy_download_url(stream_url: str, headers: dict, player_config: dict,
+                        is_mp4: bool) -> str:
+    """Route a fingerprint-gated HLS download through the local proxy.
+
+    Vidzy/fsvid/uqload reject yt-dlp's TLS fingerprint (or serve it a 30 s ad)
+    even though the same URL streams fine through curl_cffi. The proxy URL must
+    carry the per-process capability token AND the opaque header handle: a bare
+    ``?url=`` is rejected with 403 since 2.1.
+    """
+    try:
+        from urllib.parse import quote, urlparse
+        from . import proxy
+
+        host = (urlparse(stream_url).hostname or "").lower()
+        needs_proxy = (
+            (player_config or {}).get("type") in ("fsvid", "uqload")
+            or any(h in host for h in ("vidzy", "fsvid", "uqload"))
+        )
+        if not (".m3u8" in stream_url.lower() and needs_proxy):
+            return stream_url
+        proxy.ensure_started()
+        if not proxy.PROXY_URL:
+            return stream_url
+        endpoint = _proxy_endpoint(stream_url, player_config or {}, bool(is_mp4))
+        token = proxy._headers_token(headers or {})
+        handle = f"&h={token}" if token else ""
+        return (f"{proxy.PROXY_URL}/{endpoint}?url={quote(stream_url)}"
+                f"{handle}&k={proxy.PROXY_TOKEN}")
+    except Exception:
+        return stream_url
+
+
 def _download_headers(headers: dict, referer: str = "",
                       user_agent: str = "") -> dict:
     """Sanitised headers for yt-dlp/aria2c (cookies, signed-CDN tokens…)."""
@@ -2920,26 +2952,8 @@ def play_video(
             # our curl_cffi proxy. Route the download through the SAME local
             # proxy endpoint, so yt-dlp talks to localhost while the proxy
             # fetches with the browser fingerprint and real headers/cookies.
-            dl_url = stream_url
-            try:
-                from urllib.parse import urlparse, quote
-                dl_host = (urlparse(stream_url).hostname or "").lower()
-                if ".m3u8" in stream_url.lower() and (
-                    player_config.get("type") in ("fsvid", "uqload")
-                    or any(h in dl_host for h in ("vidzy", "fsvid", "uqload"))
-                ):
-                    proxy.ensure_started()
-                    if proxy.PROXY_URL:
-                        endpoint = _proxy_endpoint(
-                            stream_url, player_config, bool(is_mp4)
-                        )
-                        dl_url = (
-                            f"{proxy.PROXY_URL}/{endpoint}"
-                            f"?url={quote(stream_url)}"
-                            f"&headers={quote(json.dumps(headers))}"
-                        )
-            except Exception:
-                dl_url = stream_url
+            dl_url = _proxy_download_url(
+                stream_url, headers, player_config, bool(is_mp4))
             success = _download_stream(
                 stream_url=dl_url,
                 referer=referer,

{freeflix_cli-2.1.0 → freeflix_cli-2.1.2}/tests/test_audit_fixes.py

@@ -221,3 +221,34 @@ def test_ffprobe_quality_flags_short_direct_mp4(monkeypatch):
     q = pm._ffprobe_quality("https://cdn/ad.mp4", {})
     assert q["height"] == 720 and q["duration"] == 30.0
     assert pm.is_likely_ad_placeholder(q) is True
+
+
+def test_proxy_download_url_carries_token_and_hides_cookies(monkeypatch):
+    """Vidzy/fsvid downloads must use the local proxy WITH ?k= and ?h=.
+
+    Regression found after 2.1: the download URL was built without the
+    capability token, so the proxy answered 403 while streaming worked.
+    """
+    from urllib.parse import parse_qs, urlparse
+
+    from freeflix_cli import player_manager as pm
+    from freeflix_cli import proxy
+
+    monkeypatch.setattr(proxy, "PROXY_URL", "http://127.0.0.1:9999")
+    monkeypatch.setattr(proxy, "PROXY_TOKEN", "tok-123")
+    monkeypatch.setattr(proxy, "ensure_started", lambda: None)
+    headers = {"Referer": "https://vidzy.cc/", "Cookie": "vz_ok=secret"}
+    url = pm._proxy_download_url(
+        "https://cdn.vidzy.cc/master.m3u8?t=1", headers, {"type": "fsvid"}, False)
+    q = parse_qs(urlparse(url).query)
+    assert q["k"] == ["tok-123"]
+    assert "h" in q and "headers" not in q
+    assert "vz_ok" not in url and "secret" not in url
+    assert url.startswith("http://127.0.0.1:9999/")
+
+
+def test_proxy_download_url_leaves_plain_hosts_alone():
+    from freeflix_cli import player_manager as pm
+
+    plain = "https://cdn.example/master.m3u8"
+    assert pm._proxy_download_url(plain, {}, {}, False) == plain

{freeflix_cli-2.1.0 → freeflix_cli-2.1.2}/tests/test_core_units.py

@@ -28,6 +28,24 @@ def test_cli_version_prints_a_version(monkeypatch, capsys):
     assert out and out[0].isdigit()
 
 
+def test_utf8_console_reconfigures_cp1252(monkeypatch):
+    class _Fake:
+        encoding = "cp1252"
+
+        def __init__(self):
+            self.kw = None
+
+        def reconfigure(self, **kw):
+            self.kw = kw
+
+    out, err = _Fake(), _Fake()
+    monkeypatch.setattr(cli.sys, "stdout", out)
+    monkeypatch.setattr(cli.sys, "stderr", err)
+    cli._utf8_console()
+    assert out.kw == {"encoding": "utf-8", "errors": "replace"}
+    assert err.kw == {"encoding": "utf-8", "errors": "replace"}
+
+
 def test_cli_help_mentions_doctor(monkeypatch, capsys):
     monkeypatch.setattr("sys.argv", ["freeflix", "--help"])
     assert cli.main() == 0

{freeflix_cli-2.1.0 → freeflix_cli-2.1.2}/tests/test_recent_new_episodes.py

@@ -77,6 +77,7 @@ def test_other_providers_are_ignored(monkeypatch):
              "season_title": "S1", "episode_title": "E1",
              "series_url": "https://x", "season_url": "https://x"}]
     monkeypatch.setattr(tracker, "get_history", lambda: hist)
+    monkeypatch.setattr(tracker, "get_followed_series", lambda: [])
     monkeypatch.setattr(tracker, "get_seen_releases", lambda: set())
     recent._state["items"] = []
     recent._state["ready"] = False

{freeflix_cli-2.1.0 → freeflix_cli-2.1.2}/tests/test_release_config.py

@@ -47,8 +47,10 @@ def test_ci_has_timeout_coverage_and_installer_checks():
     assert "--timeout=120" in yml
     assert "--cov-fail-under=40" in yml
     assert "PowerShell syntax" in yml
-    assert "macos-latest" in yml
     assert "ruff==0.17.3" in yml
+    # macOS is a separate, non-blocking workflow (runners are often unavailable).
+    macos = _read(".github/workflows/macos.yml")
+    assert "macos-latest" in macos and "workflow_dispatch:" in macos
 
 
 def test_installer_scripts_are_tolerant_and_verified():

{freeflix_cli-2.1.0 → freeflix_cli-2.1.2}/uv.lock

@@ -238,7 +238,7 @@ wheels = [
 
 [[package]]
 name = "freeflix-cli"
-version = "2.1.0"
+version = "2.1.2"
 source = { editable = "." }
 dependencies = [
     { name = "beautifulsoup4" },