streamlink 6.7.2__tar.gz → 6.7.3__tar.gz

{streamlink-6.7.2 → streamlink-6.7.3}/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## streamlink 6.7.3 (2024-04-14)
+
+Patch release:
+
+- Fixed: file output paths being able to exceed max file/directory name length ([#5921](https://github.com/streamlink/streamlink/pull/5921), [#5925](https://github.com/streamlink/streamlink/pull/5925))
+- Fixed: propagation of `KeyboardInterrupt`/`SystemExit` in `streamlink.webbrowser` ([#5930](https://github.com/streamlink/streamlink/pull/5930))
+- Fixed: compatibility with `exceptiongroup<=1.1.1` ([#5930](https://github.com/streamlink/streamlink/pull/5930))
+- Fixed: `plugin.api.validate.parse_qsd` input type validation ([#5932](https://github.com/streamlink/streamlink/pull/5932))
+- Updated plugins:
+  - mangomolo: fixed missing referer header and updated URL matcher ([#5923](https://github.com/streamlink/streamlink/pull/5923), [#5926](https://github.com/streamlink/streamlink/pull/5926))
+  - pluto: rewritten plugin ([#5910](https://github.com/streamlink/streamlink/pull/5910))
+  - showroom: fixed geo-block check preventing stream access ([#5911](https://github.com/streamlink/streamlink/pull/5911))
+  - vkplay: updated URL matcher ([#5908](https://github.com/streamlink/streamlink/pull/5908))
+- Tests: fixed test failure when running tests from the `bdist` build directory ([#5933](https://github.com/streamlink/streamlink/pull/5933))
+
+[Full changelog](https://github.com/streamlink/streamlink/compare/6.7.2...6.7.3)
+
+
 ## streamlink 6.7.2 (2024-03-23)
 
 Patch release:

{streamlink-6.7.2 → streamlink-6.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: streamlink
-Version: 6.7.2
+Version: 6.7.3
 Summary: Streamlink is a command-line utility that extracts streams from various services and pipes them into a video player of choice.
 Author: Streamlink
 Author-email: streamlink@protonmail.com

{streamlink-6.7.2 → streamlink-6.7.3}/build_backend/test_onbuild.py

@@ -38,7 +38,13 @@ def build(request: pytest.FixtureRequest, tmp_path: Path, template_fields: dict)
     (pkg_dir / "streamlink").mkdir(parents=True)
     shutil.copy(PROJECT_ROOT / "pyproject.toml", tmp_path / "pyproject.toml")
     shutil.copy(PROJECT_ROOT / "setup.py", tmp_path / "setup.py")
-    shutil.copy(PROJECT_ROOT / "src" / "streamlink" / "_version.py", pkg_dir / "streamlink" / "_version.py")
+
+    # Lookup for the path from the root source directory
+    if Path(PROJECT_ROOT / "src" / "streamlink" / "_version.py").exists():
+        shutil.copy(PROJECT_ROOT / "src" / "streamlink" / "_version.py", pkg_dir / "streamlink" / "_version.py")
+    else:  # pragma: no cover
+        # We didn't find it, use the build location
+        shutil.copy(PROJECT_ROOT / "streamlink" / "_version.py", pkg_dir / "streamlink" / "_version.py")
 
     options = dict(
         is_source=is_source,

{streamlink-6.7.2 → streamlink-6.7.3}/dev-requirements.txt

@@ -15,10 +15,10 @@ pytest-cov
 coverage[toml]
 
 # code-linting
-ruff ==0.3.2
+ruff ==0.3.7
 
 # typing
-mypy ==1.8.0
+mypy ==1.9.0
 lxml-stubs
 trio-typing
 types-freezegun

{streamlink-6.7.2 → streamlink-6.7.3}/docs/_build/man/streamlink.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "STREAMLINK" "1" "Mar 23, 2024" "6.7.2" "Streamlink"
+.TH "STREAMLINK" "1" "Apr 14, 2024" "6.7.3" "Streamlink"
 .SH NAME
 streamlink \- extracts streams from various services and pipes them into a video player of choice
 .SH SYNOPSIS

{streamlink-6.7.2 → streamlink-6.7.3}/docs/changelog.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## streamlink 6.7.3 (2024-04-14)
+
+Patch release:
+
+- Fixed: file output paths being able to exceed max file/directory name length ([#5921](https://github.com/streamlink/streamlink/pull/5921), [#5925](https://github.com/streamlink/streamlink/pull/5925))
+- Fixed: propagation of `KeyboardInterrupt`/`SystemExit` in `streamlink.webbrowser` ([#5930](https://github.com/streamlink/streamlink/pull/5930))
+- Fixed: compatibility with `exceptiongroup<=1.1.1` ([#5930](https://github.com/streamlink/streamlink/pull/5930))
+- Fixed: `plugin.api.validate.parse_qsd` input type validation ([#5932](https://github.com/streamlink/streamlink/pull/5932))
+- Updated plugins:
+  - mangomolo: fixed missing referer header and updated URL matcher ([#5923](https://github.com/streamlink/streamlink/pull/5923), [#5926](https://github.com/streamlink/streamlink/pull/5926))
+  - pluto: rewritten plugin ([#5910](https://github.com/streamlink/streamlink/pull/5910))
+  - showroom: fixed geo-block check preventing stream access ([#5911](https://github.com/streamlink/streamlink/pull/5911))
+  - vkplay: updated URL matcher ([#5908](https://github.com/streamlink/streamlink/pull/5908))
+- Tests: fixed test failure when running tests from the `bdist` build directory ([#5933](https://github.com/streamlink/streamlink/pull/5933))
+
+[Full changelog](https://github.com/streamlink/streamlink/compare/6.7.2...6.7.3)
+
+
 ## streamlink 6.7.2 (2024-03-23)
 
 Patch release:

{streamlink-6.7.2 → streamlink-6.7.3}/docs/install.rst

@@ -262,7 +262,7 @@ Package availability
 --------------------
 
 Packaging is not done by the Streamlink maintainers themselves except for
-the `PyPI package <PyPI package and source code_>`_,
+the `PyPI package <pypi-package-and-source-code_>`_,
 the `Windows installers + portable builds <Windows binaries_>`_,
 and the `Linux AppImages <Linux AppImages_>`_.
 

{streamlink-6.7.2 → streamlink-6.7.3}/setup.py

@@ -90,5 +90,5 @@ if __name__ == "__main__":
         cmdclass=get_cmdclasses(cmdclass),
         entry_points=entry_points,
         data_files=data_files,
-        version="6.7.2",
+        version="6.7.3",
     )

streamlink-6.7.3/src/streamlink/_version.py

@@ -0,0 +1 @@
+__version__ = "6.7.3"

{streamlink-6.7.2 → streamlink-6.7.3}/src/streamlink/plugin/api/useragents.py

@@ -1,11 +1,11 @@
-ANDROID = "Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.90 Mobile Safari/537.36"
-CHROME = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36"
+ANDROID = "Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.6312.80 Mobile Safari/537.36"
+CHROME = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36"
 CHROME_OS = "Mozilla/5.0 (X11; CrOS x86_64 15633.69.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.6045.212 Safari/537.36"
-FIREFOX = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:123.0) Gecko/20100101 Firefox/123.0"
+FIREFOX = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:124.0) Gecko/20100101 Firefox/124.0"
 IE_11 = "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko"
-IPHONE = "Mozilla/5.0 (iPhone; CPU iPhone OS 17_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.3.1 Mobile/15E148 Safari/604.1"
-OPERA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 OPR/108.0.0.0"
-SAFARI = "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_3_1) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.3.1 Safari/605.1.15"
+IPHONE = "Mozilla/5.0 (iPhone; CPU iPhone OS 17_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.3.1 Mobile/15E148 Safari/604.1"
+OPERA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36 OPR/109.0.0.0"
+SAFARI = "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_4_1) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.3.1 Safari/605.1.15"
 
 # Backwards compatibility
 EDGE = CHROME

{streamlink-6.7.2 → streamlink-6.7.3}/src/streamlink/plugin/api/validate/_validators.py

@@ -651,4 +651,8 @@ def validator_parse_qsd(*args, **kwargs) -> TransformSchema:
     :raise ValidationError: On parsing error
     """
 
-    return TransformSchema(_parse_qsd, *args, **kwargs, exception=ValidationError, schema=None)
+    def parser(*_args, **_kwargs):
+        validate(AnySchema(str, bytes), _args[0])
+        return _parse_qsd(*_args, **_kwargs, exception=ValidationError, schema=None)
+
+    return TransformSchema(parser, *args, **kwargs)

{streamlink-6.7.2 → streamlink-6.7.3}/src/streamlink/plugins/mangomolo.py

@@ -1,5 +1,6 @@
 """
 $description OTT video platform owned by Alpha Technology Group
+$url player.mangomolo.com
 $url media.gov.kw
 $type live
 """
@@ -23,7 +24,7 @@ log = logging.getLogger(__name__)
 )
 @pluginmatcher(
     name="mediagovkw",
-    pattern=re.compile(r"https?://media\.gov\.kw/"),
+    pattern=re.compile(r"https?://(www\.)?media\.gov\.kw/"),
 )
 class Mangomolo(Plugin):
     def _get_player_url(self):
@@ -38,10 +39,12 @@ class Mangomolo(Plugin):
         self.url = update_scheme("https://", player_url)
 
     def _get_streams(self):
+        headers = {}
         if not self.matches["mangomoloplayer"]:
+            headers["Referer"] = self.url
             self._get_player_url()
 
-        hls_url = self.session.http.get(self.url, schema=validate.Schema(
+        hls_url = self.session.http.get(self.url, headers=headers, schema=validate.Schema(
             re.compile(r"src\s*:\s*(?P<q>[\"'])(?P<url>https?://\S+?\.m3u8\S*?)(?P=q)"),
             validate.none_or_all(validate.get("url")),
         ))

streamlink-6.7.3/src/streamlink/plugins/pluto.py

@@ -0,0 +1,230 @@
+"""
+$description Live TV and video on-demand service owned by Paramount Streaming.
+$url pluto.tv
+$type live, vod
+$metadata id
+$metadata author
+$metadata category
+$metadata title
+"""
+
+import logging
+import re
+from urllib.parse import parse_qsl, urljoin
+from uuid import uuid4
+
+from streamlink.exceptions import PluginError
+from streamlink.plugin import Plugin, pluginmatcher
+from streamlink.plugin.api import useragents, validate
+from streamlink.stream.hls import HLSStream, HLSStreamReader, HLSStreamWriter
+from streamlink.utils.url import update_qsd
+
+
+log = logging.getLogger(__name__)
+
+
+class PlutoHLSStreamWriter(HLSStreamWriter):
+    ad_re = re.compile(r"_ad/creative/|creative/\d+_ad/|dai\.google\.com|Pluto_TV_OandO/.*(Bumper|plutotv_filler)")
+
+    def should_filter_segment(self, segment):
+        return self.ad_re.search(segment.uri) is not None or super().should_filter_segment(segment)
+
+
+class PlutoHLSStreamReader(HLSStreamReader):
+    __writer__ = PlutoHLSStreamWriter
+
+
+class PlutoHLSStream(HLSStream):
+    __shortname__ = "hls-pluto"
+    __reader__ = PlutoHLSStreamReader
+
+
+@pluginmatcher(
+    name="live",
+    pattern=re.compile(
+        r"https?://(?:www\.)?pluto\.tv/(?:\w{2}/)?live-tv/(?P<id>[^/]+)/?$",
+    ),
+)
+@pluginmatcher(
+    name="series",
+    pattern=re.compile(
+        r"https?://(?:www\.)?pluto\.tv/(?:\w{2}/)?on-demand/series/(?P<id_s>[^/]+)(?:/season/\d+)?/episode/(?P<id_e>[^/]+)/?$",
+    ),
+)
+@pluginmatcher(
+    name="movies",
+    pattern=re.compile(
+        r"https?://(?:www\.)?pluto\.tv/(?:\w{2}/)?on-demand/movies/(?P<id>[^/]+)/?$",
+    ),
+)
+class Pluto(Plugin):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.session.http.headers.update({"User-Agent": useragents.FIREFOX})
+        self._app_version = None
+        self._device_version = re.search(r"Firefox/(\d+(?:\.\d+)*)", useragents.FIREFOX)[1]
+        self._client_id = str(uuid4())
+
+    @property
+    def app_version(self):
+        if self._app_version:
+            return self._app_version
+
+        self._app_version = self.session.http.get(
+            self.url,
+            schema=validate.Schema(
+                validate.parse_html(),
+                validate.xml_xpath_string(".//head/meta[@name='appVersion']/@content"),
+                validate.any(None, str),
+            ),
+        )
+        if not self._app_version:
+            raise PluginError("Could not find pluto app version")
+
+        log.debug(f"{self._app_version=}")
+
+        return self._app_version
+
+    def _get_api_data(self, request):
+        log.debug(f"_get_api_data: {request=}")
+
+        schema_paths = validate.any(
+            validate.all(
+                {
+                    "paths": [
+                        validate.all(
+                            {
+                                "type": str,
+                                "path": str,
+                            },
+                            validate.union_get("type", "path"),
+                        ),
+                    ],
+                },
+                validate.get("paths"),
+            ),
+            validate.all(
+                {
+                    "path": str,
+                },
+                validate.transform(lambda obj: [("hls", obj["path"])]),
+            ),
+        )
+        schema_live = [{
+            "name": str,
+            "id": str,
+            "slug": str,
+            "stitched": schema_paths,
+        }]
+        schema_vod = [{
+            "name": str,
+            "id": str,
+            "slug": str,
+            "genre": str,
+            "stitched": validate.any(schema_paths, {}),
+            validate.optional("seasons"): [{
+                "episodes": [{
+                    "name": str,
+                    "_id": str,
+                    "slug": str,
+                    "stitched": schema_paths,
+                }],
+            }],
+        }]
+
+        return self.session.http.get(
+            "https://boot.pluto.tv/v4/start",
+            params={
+                "appName": "web",
+                "appVersion": self.app_version,
+                "deviceVersion": self._device_version,
+                "deviceModel": "web",
+                "deviceMake": "firefox",
+                "deviceType": "web",
+                "clientID": self._client_id,
+                "clientModelNumber": "1.0.0",
+                **request,
+            },
+            schema=validate.Schema(
+                validate.parse_json(),
+                {
+                    "servers": {
+                        "stitcher": validate.url(),
+                    },
+                    "stitcherParams": str,
+                    "sessionToken": str,
+                    validate.optional("EPG"): schema_live,
+                    validate.optional("VOD"): schema_vod,
+                },
+            ),
+        )
+
+    def _get_streams_live(self):
+        data = self._get_api_data({"channelSlug": self.match["id"]})
+        epg = data.get("EPG", [])
+        media = next((e for e in epg if e["id"] == self.match["id"]), None)
+        if not media:
+            return
+
+        self.id = media["id"]
+        self.title = media["name"]
+
+        return data, media["stitched"]
+
+    def _get_streams_series(self):
+        data = self._get_api_data({"seriesIDs": self.match["id_s"]})
+        vod = data.get("VOD", [])
+        media = next((v for v in vod if v["id"] == self.match["id_s"]), None)
+        if not media:
+            return
+        seasons = media.get("seasons", [])
+        episode = next((e for s in seasons for e in s["episodes"] if e["_id"] == self.match["id_e"]), None)
+        if not episode:
+            return
+
+        self.id = episode["_id"]
+        self.author = media["name"]
+        self.category = media["genre"]
+        self.title = episode["name"]
+
+        return data, episode["stitched"]
+
+    def _get_streams_movies(self):
+        data = self._get_api_data({"seriesIDs": self.match["id"]})
+        vod = data.get("VOD", [])
+        media = next((v for v in vod if v["id"] == self.match["id"]), None)
+        if not media:
+            return
+
+        self.id = media["id"]
+        self.category = media["genre"]
+        self.title = media["name"]
+
+        return data, media["stitched"]
+
+    def _get_streams(self):
+        res = None
+        if self.matches["live"]:
+            res = self._get_streams_live()
+        elif self.matches["series"]:
+            res = self._get_streams_series()
+        elif self.matches["movies"]:
+            res = self._get_streams_movies()
+
+        if not res:
+            return
+
+        data, paths = res
+        for mediatype, path in paths:
+            if mediatype != "hls":
+                continue
+
+            params = dict(parse_qsl(data["stitcherParams"]))
+            params["jwt"] = data["sessionToken"]
+            url = urljoin(data["servers"]["stitcher"], path)
+            url = update_qsd(url, params)
+
+            return PlutoHLSStream.parse_variant_playlist(self.session, url)
+
+
+__plugin__ = Pluto

{streamlink-6.7.2 → streamlink-6.7.3}/src/streamlink/plugins/showroom.py

@@ -84,7 +84,7 @@ class Showroom(Plugin):
         )
 
         res = self.session.http.get(url, acceptable_status=(200, 403, 404))
-        if res.headers["Content-Type"] != "application/x-mpegURL":
+        if res.headers["Content-Type"] not in ("application/x-mpegURL", "application/vnd.apple.mpegurl"):
             log.error("This stream is restricted")
             return
 

{streamlink-6.7.2 → streamlink-6.7.3}/src/streamlink/plugins/twitch.py

@@ -541,7 +541,7 @@ class TwitchClientIntegrity:
         headers: Mapping[str, str],
         device_id: str,
     ) -> Optional[Tuple[str, int]]:
-        from exceptiongroup import BaseExceptionGroup, catch  # noqa: PLC0415, I001
+        from exceptiongroup import BaseExceptionGroup  # noqa: PLC0415, I001
         from streamlink.webbrowser.cdp import CDPClient, CDPClientSession, devtools  # noqa: PLC0415
 
         url = f"https://www.twitch.tv/{channel}"
@@ -565,19 +565,17 @@ class TwitchClientIntegrity:
                     await client_session.loaded(frame_id)
                     return await client_session.evaluate(js_get_integrity_token, timeout=eval_timeout)
 
-        def handle_error(exc_grp: BaseExceptionGroup) -> None:
-            for err in exc_grp.exceptions:
-                log.error(f"{type(err).__name__}: {err}")
-
-        with catch({  # type: ignore[dict-item]  # bug in exceptiongroup==1.2.0
-            Exception: handle_error,  # type: ignore[dict-item]  # bug in exceptiongroup==1.2.0
-        }):
+        try:
             client_integrity = CDPClient.launch(
                 session,
                 acquire_client_integrity_token,
                 # headless mode gets detected by Twitch, so we have to disable it regardless the user config
                 headless=False,
             )
+        except BaseExceptionGroup:
+            log.exception("Failed acquiring client integrity token")
+        except Exception as err:
+            log.error(err)
 
         if not client_integrity:
             return None

{streamlink-6.7.2 → streamlink-6.7.3}/src/streamlink/plugins/vkplay.py

@@ -1,6 +1,6 @@
 """
 $description Russian live-streaming platform for gaming and esports, owned by VKontakte.
-$url vkplay.live
+$url live.vkplay.ru
 $type live
 $metadata id
 $metadata author
@@ -20,13 +20,13 @@ log = logging.getLogger(__name__)
 
 
 @pluginmatcher(re.compile(
-    r"https?://vkplay\.live/(?P<channel_name>\w+)/?$",
+    r"https?://(?:live\.vkplay\.ru|vkplay\.live)/(?P<channel_name>\w+)/?$",
 ))
 class VKplay(Plugin):
-    API_URL = "https://api.vkplay.live/v1"
+    API_URL = "https://api.live.vkplay.ru/v1"
 
     def _get_streams(self):
-        self.author = self.match.group("channel_name")
+        self.author = self.match["channel_name"]
         log.debug(f"Channel name: {self.author}")
 
         data = self.session.http.get(

{streamlink-6.7.2 → streamlink-6.7.3}/src/streamlink/webbrowser/webbrowser.py

@@ -8,7 +8,7 @@ from subprocess import DEVNULL
 from typing import AsyncContextManager, AsyncGenerator, Generator, List, Optional, Union
 
 import trio
-from exceptiongroup import BaseExceptionGroup, catch
+from exceptiongroup import BaseExceptionGroup
 
 from streamlink.utils.path import resolve_executable
 from streamlink.webbrowser.exceptions import WebbrowserError
@@ -80,12 +80,7 @@ class _WebbrowserLauncher:
 
     @asynccontextmanager
     async def launch(self) -> AsyncGenerator[trio.Nursery, None]:
-        def handle_baseexception(exc_grp: BaseExceptionGroup) -> None:
-            raise exc_grp.exceptions[0] from exc_grp.exceptions[0].__context__
-
-        with catch({  # type: ignore[dict-item]  # bug in exceptiongroup==1.2.0
-            (KeyboardInterrupt, SystemExit): handle_baseexception,  # type: ignore[dict-item]  # bug in exceptiongroup==1.2.0
-        }):
+        try:
             async with trio.open_nursery() as nursery:
                 log.info(f"Launching web browser: {self.executable}")
                 # the process is run in a separate task
@@ -113,6 +108,13 @@ class _WebbrowserLauncher:
                         log.debug("Waiting for web browser process to terminate")
                     # once the application logic is done, cancel the entire task group and terminate/kill the process
                     nursery.cancel_scope.cancel()
+        except BaseExceptionGroup as exc_grp:  # TODO: py310 support end: use except*
+            exc: Union[BaseException, BaseExceptionGroup, None] = exc_grp.subgroup((KeyboardInterrupt, SystemExit))
+            if not exc:  # not a KeyboardInterrupt or SystemExit
+                raise
+            while isinstance(exc, BaseExceptionGroup):  # get the first actual exception in the potentially nested groups
+                exc = exc.exceptions[0]
+            raise exc from exc.__context__
 
     async def _task_process_watcher(self, process: trio.Process, nursery: trio.Nursery) -> None:
         """Task for cancelling the launch task group if the user closes the browser or if it exits early on its own"""

{streamlink-6.7.2 → streamlink-6.7.3}/src/streamlink.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: streamlink
-Version: 6.7.2
+Version: 6.7.3
 Summary: Streamlink is a command-line utility that extracts streams from various services and pipes them into a video player of choice.
 Author: Streamlink
 Author-email: streamlink@protonmail.com

{streamlink-6.7.2 → streamlink-6.7.3}/src/streamlink_cli/utils/formatter.py

@@ -2,17 +2,18 @@ from pathlib import Path
 from typing import Optional
 
 from streamlink.utils.formatter import Formatter as _BaseFormatter
-from streamlink_cli.utils.path import replace_chars, replace_path
+from streamlink_cli.utils.path import replace_chars, replace_path, truncate_path
 
 
 class Formatter(_BaseFormatter):
     title = _BaseFormatter.format
 
-    def path(self, pathlike: str, charmap: Optional[str] = None) -> Path:
+    def path(self, pathlike: str, charmap: Optional[str] = None, max_filename_length: int = 255) -> Path:
         def mapper(s):
             return replace_chars(s, charmap)
 
-        def format_part(part):
-            return self._format(part, mapper, {})
+        def format_part(part: str, isfile: bool) -> str:
+            formatted = self._format(part, mapper, {})
+            return truncate_path(formatted, max_filename_length, keep_extension=isfile)
 
         return replace_path(pathlike, format_part)

{streamlink-6.7.2 → streamlink-6.7.3}/src/streamlink_cli/utils/path.py

@@ -35,9 +35,31 @@ def replace_chars(path: str, charmap: Optional[str] = None, replacement: str = R
     return pattern.sub(replacement, path)
 
 
-def replace_path(pathlike: Union[str, Path], mapper: Callable[[str], str]) -> Path:
-    def get_part(part):
-        newpart = mapper(part)
+# This method does not take care of unicode modifier characters when truncating
+def truncate_path(path: str, length: int = 255, keep_extension: bool = True) -> str:
+    parts = path.rsplit(".", 1)
+
+    # no file name extension (no dot separator in path or file name extension too long):
+    # truncate the whole thing
+    if not keep_extension or len(parts) == 1 or len(parts[1]) > 10:
+        encoded = path.encode("utf-8")
+        truncated = encoded[:length]
+        decoded = truncated.decode("utf-8", errors="ignore")
+        return decoded
+
+    # truncate file name, but keep file name extension
+    encoded = parts[0].encode("utf-8")
+    truncated = encoded[:length - len(parts[1]) - 1]
+    decoded = truncated.decode("utf-8", errors="ignore")
+    return f"{decoded}.{parts[1]}"
+
+
+def replace_path(pathlike: Union[str, Path], mapper: Callable[[str, bool], str]) -> Path:
+    def get_part(part: str, isfile: bool) -> str:
+        newpart = mapper(part, isfile)
         return REPLACEMENT if part != newpart and newpart in SPECIAL_PATH_PARTS else newpart
 
-    return Path(*(get_part(part) for part in Path(pathlike).expanduser().parts))
+    parts = Path(pathlike).expanduser().parts
+    last = len(parts) - 1
+
+    return Path(*(get_part(part, i == last) for i, part in enumerate(parts)))

{streamlink-6.7.2 → streamlink-6.7.3}/tests/cli/utils/test_formatter.py

@@ -1,6 +1,7 @@
 from datetime import datetime
 from os.path import sep
 from pathlib import Path
+from string import ascii_letters as alphabet
 from unittest.mock import Mock, call, patch
 
 import pytest
@@ -79,3 +80,19 @@ class TestCLIFormatter:
         path = formatter.path(f"{{current}}{sep}{{parent}}{sep}{{dots}}{sep}{{separator}}{sep}foo{sep}.{sep}..{sep}bar")
         assert path == Path("_", "_", "...", "_", "foo", ".", "..", "bar"), \
             "Formats the path's parts separately and ignores current and parent directories in substitutions only"
+
+    def test_path_truncation_ascii(self, formatter: Formatter):
+        formatter.mapping.update({
+            "dir": lambda: alphabet * 10,
+            "file": lambda: alphabet * 10,
+        })
+        path = formatter.path(f"{{dir}}.fakeext{sep}{{file}}.ext")
+        assert path == Path((alphabet * 10)[:255], f"{(alphabet * 10)[:251]}.ext")
+
+    def test_path_truncation_unicode(self, formatter: Formatter):
+        formatter.mapping.update({
+            "dir": lambda: "🐻" * 512,
+            "file": lambda: "🐻" * 512,
+        })
+        path = formatter.path(f"{{dir}}.fakeext{sep}{{file}}.ext")
+        assert path == Path("🐻" * 63, f"{'🐻' * 62}.ext")