freeflix-cli 2.2.2__tar.gz → 2.3.1__tar.gz

{freeflix_cli-2.2.2 → freeflix_cli-2.3.1}/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## 2.3.1
+
+- **Qualités Match prêtes pour le futur** : 4K/2160p (≥ 15,0 Mbps,
+  ~6,75 Go/h) et 1440p (≥ 8,0 Mbps, ~3,60 Go/h) ; une qualité inconnue
+  garde une estimation prudente au lieu de casser l'affichage.
+- Tests supplémentaires avec des équipes/compétitions arbitraires
+  (Al Ahly / Zamalek) et des chaînes hors beIN : la traduction et
+  l'affichage restent dynamiques.
+- 607 tests au vert, ruff OK.
+
+## 2.3.0
+
+- **Match** : la chaîne est affichée entre parenthèses **devant** le match,
+  avec un badge court (`beIN SPORTS 1..4` → `B1..B4`), ex.
+  `(B4) ● LIVE 20:45 · Toulouse VS Strasbourg`.
+- **Qualités Match** : chaque ligne affiche désormais la résolution, le débit
+  minimum estimé et la consommation horaire estimée, ex.
+  `HD (1080p) · ≥ 5.0 Mbps · ~2.25 Go/h`, `SD (720p) · ≥ 2.5 Mbps · ~1.13 Go/h`,
+  `Low (480p) · ≥ 1.0 Mbps · ~0.45 Go/h` ; `Auto` reste en bas.
+- 604 tests au vert, ruff OK.
+
 ## 2.2.2
 
 - Menus **qualité** et **choix du lecteur** en plein écran : souris alignée

{freeflix_cli-2.2.2 → freeflix_cli-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: freeflix-cli
-Version: 2.2.2
+Version: 2.3.1
 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
@@ -121,7 +121,7 @@ Description-Content-Type: text/markdown
 | 🆕 | **Nouveautés** : new episodes of the shows you follow, cleared once watched |
 | 🖱 | **Full mouse control** : hover, click, wheel, right-click back, clickable pagination |
 | 🎨 | **Cinema Noir** (2.0) design system, 12 themes, reduced-motion support |
-| ⚽ | **Match** : live football from YacineTV, Cameroon time, HD/SD/Low + Auto, mpv/VLC |
+| ⚽ | **Match** : live football from YacineTV, Cameroon time, B1–B4 channel badges, HD/SD/Low/4K + Auto, minimum bitrate + GB/h estimate, mpv/VLC |
 | 🎬 | **Browse Films, Séries & Anime** : the provider list, grouped as before |
 | 🎮 | **4 player backends** : mpv, VLC, browser, download-only |
 | 🇫🇷 | **French UI** : the whole CLI is in French when language is set to FR |
@@ -247,7 +247,9 @@ That's it. The menu walks you through everything.
 
 - **Films, Séries & Anime** opens the provider list (unchanged grouping).
 - **Match** shows live/upcoming football with kick-off in Cameroon time
-  (UTC+1); pick a match, then HD/SD/Low or **Auto**, then mpv or VLC.
+  (UTC+1), the channel badge (B1–B4), and quality rows with resolution,
+  minimum bitrate and estimated GB/hour; pick **Auto** or a quality, then
+  mpv or VLC.
 - Player settings are isolated: FreeFlix never edits your global mpv/VLC
   configuration.
 

{freeflix_cli-2.2.2 → freeflix_cli-2.3.1}/README.md

@@ -89,7 +89,7 @@
 | 🆕 | **Nouveautés** : new episodes of the shows you follow, cleared once watched |
 | 🖱 | **Full mouse control** : hover, click, wheel, right-click back, clickable pagination |
 | 🎨 | **Cinema Noir** (2.0) design system, 12 themes, reduced-motion support |
-| ⚽ | **Match** : live football from YacineTV, Cameroon time, HD/SD/Low + Auto, mpv/VLC |
+| ⚽ | **Match** : live football from YacineTV, Cameroon time, B1–B4 channel badges, HD/SD/Low/4K + Auto, minimum bitrate + GB/h estimate, mpv/VLC |
 | 🎬 | **Browse Films, Séries & Anime** : the provider list, grouped as before |
 | 🎮 | **4 player backends** : mpv, VLC, browser, download-only |
 | 🇫🇷 | **French UI** : the whole CLI is in French when language is set to FR |
@@ -215,7 +215,9 @@ That's it. The menu walks you through everything.
 
 - **Films, Séries & Anime** opens the provider list (unchanged grouping).
 - **Match** shows live/upcoming football with kick-off in Cameroon time
-  (UTC+1); pick a match, then HD/SD/Low or **Auto**, then mpv or VLC.
+  (UTC+1), the channel badge (B1–B4), and quality rows with resolution,
+  minimum bitrate and estimated GB/hour; pick **Auto** or a quality, then
+  mpv or VLC.
 - Player settings are isolated: FreeFlix never edits your global mpv/VLC
   configuration.
 

{freeflix_cli-2.2.2 → freeflix_cli-2.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "freeflix-cli"
-version = "2.2.2"
+version = "2.3.1"
 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.2.2 → freeflix_cli-2.3.1}/src/freeflix_cli/handlers/match.py

@@ -6,6 +6,8 @@ falls back to the last snapshot only when the API is unreachable.
 
 from __future__ import annotations
 
+import re
+
 from datetime import datetime, timedelta, timezone
 
 from ..cli_utils import (
@@ -33,6 +35,12 @@ def _when_label(ev: ym.MatchEvent, now: datetime) -> str:
     return f"{dt:%d/%m %H:%M}"
 
 
+def _channel_label(channel: str) -> str:
+    """Short live-TV badge: beIN SPORTS 1..4 → B1..B4."""
+    m = re.search(r"be\s*in\s*sports?\s*([1-4])", channel or "", re.I)
+    return f"B{m.group(1)}" if m else (channel or "")
+
+
 def _match_label(ev: ym.MatchEvent, now_ts: int, now: datetime) -> str:
     state = ev.status(now_ts)
     when = _when_label(ev, now)
@@ -43,7 +51,8 @@ def _match_label(ev: ym.MatchEvent, now_ts: int, now: datetime) -> str:
     else:
         badge = f"○ {t('Upcoming')}"
     league = f"  ·  {ev.championship}" if ev.championship else ""
-    return f"{badge}  {when}  ·  {ev.home}  VS  {ev.away}{league}"
+    channel = f"({_channel_label(ev.channel)})  " if ev.channel else ""
+    return f"{channel}{badge}  {when}  ·  {ev.home}  VS  {ev.away}{league}"
 
 
 def _sort_events(events: list[ym.MatchEvent], now_ts: int) -> list[ym.MatchEvent]:
@@ -51,9 +60,40 @@ def _sort_events(events: list[ym.MatchEvent], now_ts: int) -> list[ym.MatchEvent
     return sorted(events, key=lambda e: (order.get(e.status(now_ts), 3), e.start))
 
 
+# Conservative live HLS minimums (Mbps) used for the GB/hour estimate.
+_MIN_MBPS = {2160: 15.0, 1440: 8.0, 1080: 5.0, 720: 2.5,
+             480: 1.0, 360: 0.7}
+
+
+def _quality_metrics(stream: dict) -> tuple[int | None, float, float]:
+    """(height, minimum Mbps, estimated GB/hour) for a stream label."""
+    name = str(stream.get("name") or "?")
+    low = name.lower()
+    m = re.search(r"(\d{3,4})p", low)
+    if m:
+        height = int(m.group(1))
+    elif any(k in low for k in ("4k", "uhd", "2160")):
+        height = 2160
+    elif any(k in low for k in ("1440", "2k")):
+        height = 1440
+    elif "hd" in low or "fhd" in low:
+        height = 1080
+    elif "sd" in low:
+        height = 720
+    elif "low" in low:
+        height = 480
+    else:
+        height = None
+    mbps = _MIN_MBPS.get(height, 2.0)
+    return height, mbps, mbps * 3600 / 8 / 1000
+
+
 def _quality_label(stream: dict) -> str:
     name = str(stream.get("name") or "?")
-    return f"{icon('play')} {name}"
+    height, mbps, gb = _quality_metrics(stream)
+    res = f" ({height}p)" if height else ""
+    return (f"{icon('play')} {name}{res}  ·  ≥ {mbps:.1f} Mbps  ·  "
+            f"~{gb:.2f} {t('GB/h')}")
 
 
 def _play(event: ym.MatchEvent, stream: dict, player_name: str = "") -> None:
@@ -95,7 +135,7 @@ def _choose_player(current: str, allow_cancel: bool = False):
         print_warning(t("No video player found (mpv or VLC)."))
         return None
     labels = ["mpv" if n == "mpv" else "VLC" for n in avail]
-    options = [f"{icon('play')} {label}" for label in labels]
+    options = list(labels)
     if allow_cancel:
         options.append(t("← Back"))
     default = labels.index(current) if current in labels else 0
@@ -165,7 +205,10 @@ def handle_match() -> None:
         choice = select_from_list(
             options,
             f"{t('Choose the quality')}  ·  {event.home}  VS  {event.away}",
-            header=f"{icon('football')} {event.championship or t('Football')}",
+            header=(f"{icon('football')} "
+                    f"{event.championship or t('Football')}"
+                    + (f"  ·  {_channel_label(event.channel)}"
+                       if event.channel else "")),
         )
         if choice < 0 or choice >= auto_idx:
             if choice == auto_idx:
@@ -173,7 +216,10 @@ def handle_match() -> None:
                 if not stream:
                     print_warning(t("No stream available for this match."))
                     continue
-                print_info(f"{t('Auto quality:')} {stream.get('name', '?')}")
+                _h, _mbps, _gb = _quality_metrics(stream)
+                print_info(f"{t('Auto quality:')} {stream.get('name', '?')}  ·  "
+                           f"≥ {_mbps:.1f} {t('Mbps')}  ·  ~{_gb:.2f} "
+                           f"{t('GB/h')}")
                 chosen = _choose_player(player_name, allow_cancel=True)
                 if chosen:
                     _play(event, stream, chosen)

{freeflix_cli-2.2.2 → freeflix_cli-2.3.1}/src/freeflix_cli/i18n.py

@@ -1023,6 +1023,8 @@ _FR = {
     'Playing in VLC…': 'Lecture dans VLC…',
     'VLC stopped early. Log:': 'VLC s’est arrêté trop tôt. Journal :',
     'Movies, Series & Anime': 'Films, Séries & Anime',
+    'Mbps': 'Mbps',
+    'GB/h': 'Go/h',
     'Match player:': 'Lecteur des matchs :',
     'Match player set to:': 'Lecteur des matchs :',
     'Choose a player': 'Choisis un lecteur',

{freeflix_cli-2.2.2 → freeflix_cli-2.3.1}/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.2.2"
+CODE_VERSION = "2.3.1"
 
 
 def metadata_version() -> str | None:

{freeflix_cli-2.2.2 → freeflix_cli-2.3.1}/src/freeflix_cli/scraping/yacine_match.py

@@ -220,6 +220,10 @@ def fetch_events(timeout: int = 10) -> tuple[list[MatchEvent], bool]:
 
 def _quality_rank(name: str) -> int:
     n = (name or "").lower()
+    if any(k in n for k in ("4k", "2160", "uhd")):
+        return 4
+    if any(k in n for k in ("1440", "2k")):
+        return 3
     if any(k in n for k in ("hd", "fhd", "1080", "full")):
         return 3
     if any(k in n for k in ("sd", "720", "medium")):

{freeflix_cli-2.2.2 → freeflix_cli-2.3.1}/tests/test_yacine_match.py

@@ -279,3 +279,45 @@ def test_play_direct_stream_respects_explicit_vlc(monkeypatch):
         assert pm._VLC_KEEPALIVE
     finally:
         pm._stop_vlc_keepalive()
+
+
+def test_match_channel_and_quality_estimates():
+    from datetime import datetime, timedelta, timezone
+    from freeflix_cli.handlers import match as mh
+
+    now = datetime.now(tz=timezone(timedelta(hours=1)))
+    ev = ym.MatchEvent("1", "Ligue 1", "beIN SPORTS 4",
+                       int(now.timestamp()) - 60, int(now.timestamp()) + 3600,
+                       "Toulouse", "Strasbourg")
+    label = mh._match_label(ev, int(now.timestamp()), now)
+    assert label.startswith("(B4)")
+    hd = mh._quality_label({"name": "HD"})
+    assert "5.0" in hd and "2.25" in hd
+    low = mh._quality_label({"name": "Low"})
+    assert "1.0" in low and "0.45" in low
+
+
+def test_channel_aliases_and_other_channels():
+    from freeflix_cli.handlers import match as mh
+    assert mh._channel_label("beIN SPORTS 1") == "B1"
+    assert mh._channel_label("beIN SPORTS 4") == "B4"
+    assert mh._channel_label("beIN SPORTS 5") == "beIN SPORTS 5"
+    assert mh._channel_label("Canal+ Sport") == "Canal+ Sport"
+
+
+def test_future_4k_quality_estimate():
+    from freeflix_cli.handlers import match as mh
+    label = mh._quality_label({"name": "4K"})
+    assert "2160p" in label and "15.0" in label and "6.75" in label
+
+
+def test_other_teams_are_dynamic(monkeypatch, tmp_path):
+    monkeypatch.setattr(ym, "_cache_dir", lambda: tmp_path)
+    monkeypatch.setattr(ym, "_translate_one",
+                        lambda text, lang, timeout=5:
+                        {"الأهلي": "Al Ahly", "الزمالك": "Zamalek"}.get(text, text))
+    ev = ym.MatchEvent("x", "الدوري المصري", "Canal+ Sport", 1, 2,
+                       "الأهلي", "الزمالك")
+    out = ym.localize_events([ev], "fr")[0]
+    assert out.home == "Al Ahly" and out.away == "Zamalek"
+    assert out.championship == "الدوري المصري"

{freeflix_cli-2.2.2 → freeflix_cli-2.3.1}/uv.lock

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