streamlink 6.2.0__tar.gz → 6.2.1__tar.gz

{streamlink-6.2.0 → streamlink-6.2.1}/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## streamlink 6.2.1 (2023-10-03)
+
+Patch release:
+
+- Added: official support for Python 3.12 ([#5576](https://github.com/streamlink/streamlink/pull/5576))
+- Fixed plugins: goodgame ([#5557](https://github.com/streamlink/streamlink/pull/5557)), nos ([#5565](https://github.com/streamlink/streamlink/pull/5565)), pandalive ([#5569](https://github.com/streamlink/streamlink/pull/5569)), wwenetwork ([#5559](https://github.com/streamlink/streamlink/pull/5559))
+- Build: added custom setuptools build-backend override which fixes issues with building Windows-specific wheels ([#5558](https://github.com/streamlink/streamlink/pull/5558))
+
+[Full changelog](https://github.com/streamlink/streamlink/compare/6.2.0...6.2.1)
+
+
 ## streamlink 6.2.0 (2023-09-14)
 
 Release highlights:

{streamlink-6.2.0 → streamlink-6.2.1}/MANIFEST.in

@@ -5,6 +5,7 @@ include LICENSE*
 include *requirements.txt
 include icon.svg
 
+recursive-include build_backend *
 recursive-include completions *
 recursive-include docs *
 recursive-include tests *

{streamlink-6.2.0 → streamlink-6.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: streamlink
-Version: 6.2.0
+Version: 6.2.1
 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
@@ -23,6 +23,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Multimedia :: Sound/Audio
 Classifier: Topic :: Multimedia :: Video

streamlink-6.2.1/build_backend/__init__.py

@@ -0,0 +1,79 @@
+import shlex
+from typing import List, Optional, Tuple
+
+from setuptools import build_meta as _build_meta
+
+# re-export everything from `setuptools.build_meta`, so that we don't have to worry about any hooks which we don't override
+# https://peps.python.org/pep-0517/
+# https://peps.python.org/pep-0660/
+# noinspection PyUnresolvedReferences
+from setuptools.build_meta import *  # noqa: F403
+from setuptools.command.egg_info import egg_info as _egg_info
+
+
+# ----
+
+
+def get_requires_for_build_wheel(  # type: ignore[no-redef]
+    config_settings: Optional[dict] = None,
+) -> List[str]:  # pragma: no cover
+    # Streamlink publishes three wheels on PyPI: the generic "any" wheel, the "win32" wheel and the "win-amd64" wheel:
+    # The Windows-wheels are special, because they include a "gui_scripts" entry point, which is used by the `pip` frontend
+    # to generate the "streamlinkw" launcher, which doesn't open a terminal window when launching it from a GUI application.
+    #
+    # In order to build these special Windows-wheels, the `--plat-name=...` CLI argument needs to get passed
+    # to the `bdist_wheel` setuptools command (provided by the `wheel` package). With the introduction of PEP517 however,
+    # setuptools's CLI is not used directly anymore, and instead, we have to build the wheels using the `build` package
+    # and the `--wheel --config-setting=--build-option=...` args, which are then forwarded to setuptools via the PEP517 hooks.
+    #
+    # Since `build==1.0.0` though, the `--config-setting` data now gets passed to all build-backend hooks involved,
+    # even `get_requires_for_build_wheel()`. This results in the build failing, as it executes setuptools's `egg_info` command,
+    # which doesn't accept the `--plat-name` argument or any other `bdist_wheel` command options.
+    #
+    # As a consequence of this, we need to override the build-backend and the `get_requires_for_build_wheel()` hook, so that
+    # we can filter out arguments which are not relevant to the `egg_info` command.
+    _filter_cmd_option_args(config_settings, "--build-option", _egg_info.user_options)
+
+    return _build_meta.get_requires_for_build_wheel(config_settings)
+
+
+# ----
+
+
+def _filter_cmd_option_args(
+    config_settings: Optional[dict],
+    key: str,
+    options: List[Tuple[str, Optional[str], str]],
+) -> None:
+    """Filter out args which are not recognized by a specific command and its options"""
+
+    if not config_settings or not config_settings.get(key):
+        return
+
+    parsed = shlex.split(config_settings[key])
+
+    result = []
+    val_next = False
+    for item in parsed:
+        if val_next:
+            val_next = False
+            result.append(item)
+            continue
+        for full, shorthand, *_ in options:
+            is_boolean = full[-1] != "="
+            is_shorthand = shorthand is not None and item == f"-{shorthand}"
+            if not is_boolean and (is_shorthand or item == f"--{full[:-1]}"):
+                val_next = True
+                result.append(item)
+                break
+            if (
+                is_boolean and (is_shorthand or item == f"--{full}")
+                or not is_boolean and item.startswith(f"--{full}")
+            ):
+                result.append(item)
+                break
+
+    if result:
+        config_settings[key] = shlex.join(result)
+    else:
+        del config_settings[key]

streamlink-6.2.1/build_backend/test_build_backend.py

@@ -0,0 +1,41 @@
+import pytest
+from setuptools.command.egg_info import egg_info
+
+from build_backend import _filter_cmd_option_args
+
+
+@pytest.mark.parametrize(("config_settings", "expected", "options"), [
+    pytest.param(
+        None,
+        None,
+        egg_info.user_options,
+        id="Empty config_settings",
+    ),
+    pytest.param(
+        {"foo": "bar"},
+        {"foo": "bar"},
+        egg_info.user_options,
+        id="No --build-option key",
+    ),
+    pytest.param(
+        {"--build-option": "--egg-base=foo/bar -e baz/qux --tag-build foo -b bar --tag-date --no-date -D"},
+        {"--build-option": "--egg-base=foo/bar -e baz/qux --tag-build foo -b bar --tag-date --no-date -D"},
+        egg_info.user_options,
+        id="All egg_info options",
+    ),
+    pytest.param(
+        {"--build-option": "--foo --bar --baz"},
+        {},
+        egg_info.user_options,
+        id="Options unknown to egg_info",
+    ),
+    pytest.param(
+        {"--build-option": "-p win32 --plat-name win32 --plat-name=win32"},
+        {},
+        egg_info.user_options,
+        id="bdist_wheel --plat-name option",
+    ),
+])
+def test_filter_cmd_option_args(config_settings: dict, expected: str, options: list):
+    _filter_cmd_option_args(config_settings, "--build-option", options)
+    assert config_settings == expected

{streamlink-6.2.0 → streamlink-6.2.1}/dev-requirements.txt

@@ -14,7 +14,7 @@ pytest-cov
 coverage[toml]
 
 # code-linting
-ruff ==0.0.287
+ruff ==0.0.291
 
 # typing
 mypy
@@ -22,6 +22,7 @@ lxml-stubs
 trio-typing
 types-freezegun
 types-requests
+types-setuptools
 types-urllib3
 
 # scripts

{streamlink-6.2.0 → streamlink-6.2.1}/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" "Sep 14, 2023" "6.2.0" "Streamlink"
+.TH "STREAMLINK" "1" "Oct 03, 2023" "6.2.1" "Streamlink"
 .SH NAME
 streamlink \- extracts streams from various services and pipes them into a video player of choice
 .SH SYNOPSIS

{streamlink-6.2.0 → streamlink-6.2.1}/docs/changelog.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## streamlink 6.2.1 (2023-10-03)
+
+Patch release:
+
+- Added: official support for Python 3.12 ([#5576](https://github.com/streamlink/streamlink/pull/5576))
+- Fixed plugins: goodgame ([#5557](https://github.com/streamlink/streamlink/pull/5557)), nos ([#5565](https://github.com/streamlink/streamlink/pull/5565)), pandalive ([#5569](https://github.com/streamlink/streamlink/pull/5569)), wwenetwork ([#5559](https://github.com/streamlink/streamlink/pull/5559))
+- Build: added custom setuptools build-backend override which fixes issues with building Windows-specific wheels ([#5558](https://github.com/streamlink/streamlink/pull/5558))
+
+[Full changelog](https://github.com/streamlink/streamlink/compare/6.2.0...6.2.1)
+
+
 ## streamlink 6.2.0 (2023-09-14)
 
 Release highlights:

{streamlink-6.2.0 → streamlink-6.2.1}/docs/install.rst

@@ -136,6 +136,12 @@ Linux and BSD
       - See the `Linux AppImages`_ section below
     * - :octicon:`verified` Python pip
       - See the `PyPI package and source code`_ section below
+    * - :octicon:`package-dependents` `Alpine Linux (edge, testing)`_
+      - .. code-block:: bash
+
+            sudo apk add streamlink
+
+        `Enabling the edge/testing repository`_
     * - :octicon:`package-dependents` `Arch Linux`_
       - .. code-block:: bash
 
@@ -167,6 +173,16 @@ Linux and BSD
       - .. code-block:: bash
 
             sudo dnf install streamlink
+    * - :octicon:`package-dependents` `FreeBSD (pkg)`_
+      - .. code-block:: bash
+
+            pkg install multimedia/streamlink
+
+    * - :octicon:`package-dependents` `FreeBSD (ports)`_
+      - .. code-block:: bash
+
+            cd /usr/ports/multimedia/streamlink
+            make config install clean
     * - :octicon:`package-dependents` `Gentoo Linux`_
       - .. code-block:: bash
 
@@ -195,20 +211,24 @@ Linux and BSD
 
             sudo xbps-install streamlink
 
+.. _Alpine Linux (edge, testing): https://pkgs.alpinelinux.org/packages?name=streamlink
 .. _Arch Linux: https://archlinux.org/packages/extra/any/streamlink/
 .. _Arch Linux (aur, git): https://aur.archlinux.org/packages/streamlink-git/
-.. _Debian (sid, testing): https://packages.debian.org/unstable/streamlink
-.. _Debian (stable): https://packages.debian.org/unstable/streamlink
+.. _Debian (sid, testing): https://packages.debian.org/sid/streamlink
+.. _Debian (stable): https://packages.debian.org/bullseye-backports/streamlink
 .. _Fedora: https://src.fedoraproject.org/rpms/python-streamlink
+.. _FreeBSD (pkg): https://ports.freebsd.org/cgi/ports.cgi?query=streamlink&stype=name
+.. _FreeBSD (ports): https://www.freshports.org/multimedia/streamlink
 .. _Gentoo Linux: https://packages.gentoo.org/package/net-misc/streamlink
 .. _NetBSD (pkgsrc): https://pkgsrc.se/multimedia/streamlink
 .. _NixOS: https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/video/streamlink
 .. _openSUSE: https://build.opensuse.org/package/show/multimedia:apps/streamlink
-.. _Solus: https://github.com/solus-packages/streamlink
+.. _Solus: https://github.com/getsolus/packages/tree/main/packages/s/streamlink
 .. _Void: https://github.com/void-linux/void-packages/tree/master/srcpkgs/streamlink
 
-.. _Installing AUR packages: https://wiki.archlinux.org/index.php/Arch_User_Repository#Installing_packages
-.. _Installing Debian backported packages: https://wiki.debian.org/Backports#Using_the_command_line
+.. _Enabling the edge/testing repository: https://wiki.alpinelinux.org/wiki/Repositories#Edge
+.. _Installing AUR packages: https://wiki.archlinux.org/index.php/Arch_User_Repository
+.. _Installing Debian backported packages: https://wiki.debian.org/Backports
 .. _NixOS channel: https://search.nixos.org/packages?show=streamlink&query=streamlink
 
 
@@ -221,6 +241,8 @@ Package maintainers
 
     * - Distribution / Platform
       - Maintainer
+    * - Alpine Linux
+      - Robert Sacks <robert at sacks.email>
     * - Arch
       - Giancarlo Razzolini <grazzolini at archlinux.org>
     * - Arch (aur, git)
@@ -231,6 +253,8 @@ Package maintainers
       - Alexis Murzeau <amubtdx at gmail.com>
     * - Fedora
       - Mohamed El Morabity <melmorabity at fedoraproject.org>
+    * - FreeBSD
+      - Takefu <takefu at airport.fm>
     * - Gentoo
       - soredake <fdsfgs at krutt.org>
     * - NetBSD

{streamlink-6.2.0 → streamlink-6.2.1}/pyproject.toml

@@ -1,10 +1,13 @@
 [build-system]
-build-backend = "setuptools.build_meta"
 requires = [
   "setuptools >=64",
   "wheel",
   "versioningit >=2.0.0, <3",
 ]
+# setuptools build-backend override
+# https://setuptools.pypa.io/en/stable/build_meta.html
+backend-path = ["build_backend"]
+build-backend = "__init__"
 
 
 # https://peps.python.org/pep-0621/
@@ -34,6 +37,7 @@ classifiers = [
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Topic :: Internet :: WWW/HTTP",
   "Topic :: Multimedia :: Sound/Audio",
   "Topic :: Multimedia :: Video",
@@ -110,6 +114,10 @@ build-file = "streamlink/_version.py"
 # https://docs.pytest.org/en/latest/reference/customize.html#configuration
 # https://docs.pytest.org/en/latest/reference/reference.html#ini-options-ref
 [tool.pytest.ini_options]
+testpaths = [
+  "build_backend",
+  "tests",
+]
 filterwarnings = [
   "always",
   "ignore:::pkg_resources",
@@ -121,6 +129,7 @@ filterwarnings = [
 [tool.coverage.run]
 branch = true
 source = [
+  "build_backend",
   "src",
   "tests",
 ]
@@ -140,15 +149,20 @@ exclude_lines = [
 ]
 
 
-# https://beta.ruff.rs/docs/configuration/
+# https://docs.astral.sh/ruff/configuration/
 [tool.ruff]
-src = ["src", "tests"]
+src = [
+  "build_backend",
+  "src",
+  "tests",
+]
 target-version = "py38"
 fix = false
 ignore-init-module-imports = true
 line-length = 128
 show-source = true
-format = "grouped"
+output-format = "grouped"
+preview = true
 select = [
   # pycodestyle
   "E",
@@ -233,6 +247,7 @@ show_error_context = true
 show_column_numbers = true
 warn_no_return = false
 files = [
+  "build_backend",
   "src/streamlink/",
   "src/streamlink_cli/",
   "tests/",

{streamlink-6.2.0 → streamlink-6.2.1}/src/streamlink/_version.py

@@ -12,4 +12,4 @@ def _get_version() -> str:
 
 # The following _get_version() call will get replaced by versioningit with a static version string when building streamlink
 # `pip install .` / `pip wheel .` / `python setup.py build` / `python setup.py bdist_wheel` / etc.
-__version__ = "6.2.0"
+__version__ = "6.2.1"

{streamlink-6.2.0 → streamlink-6.2.1}/src/streamlink/plugin/api/useragents.py

@@ -1,11 +1,11 @@
-ANDROID = "Mozilla/5.0 (Linux; Android 13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.5845.163 Mobile Safari/537.36"
-CHROME = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"
+ANDROID = "Mozilla/5.0 (Linux; Android 13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.5938.140 Mobile Safari/537.36"
+CHROME = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36"
 CHROME_OS = "Mozilla/5.0 (X11; CrOS x86_64 15359.58.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.5615.134 Safari/537.36"
-FIREFOX = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/117.0"
+FIREFOX = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/118.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 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.5 Mobile/15E148 Safari/604.1"
-OPERA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36 OPR/102.0.0.0"
-SAFARI = "Mozilla/5.0 (Macintosh; Intel Mac OS X 13_5_1) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.5 Safari/605.1.15"
+IPHONE = "Mozilla/5.0 (iPhone; CPU iPhone OS 17_0_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.5 Mobile/15E148 Safari/604.1"
+OPERA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36 OPR/102.0.0.0"
+SAFARI = "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_0) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.5 Safari/605.1.15"
 
 # Backwards compatibility
 EDGE = CHROME

streamlink-6.2.1/src/streamlink/plugins/goodgame.py

@@ -0,0 +1,89 @@
+"""
+$description Russian live-streaming platform for live video game broadcasts.
+$url goodgame.ru
+$type live
+$metadata id
+$metadata author
+$metadata category
+$metadata title
+"""
+
+import logging
+import re
+import sys
+from urllib.parse import urlparse, urlunparse
+
+from streamlink.plugin import Plugin, pluginmatcher
+from streamlink.plugin.api import validate
+from streamlink.stream.hls import HLSStream
+
+
+log = logging.getLogger(__name__)
+
+
+@pluginmatcher(re.compile(
+    r"https?://(?:www\.)?goodgame\.ru/(?:channel/)?(?P<user>[^/]+)",
+))
+class GoodGame(Plugin):
+    @classmethod
+    def stream_weight(cls, stream):
+        if stream == "source":
+            return sys.maxsize, stream
+        return super().stream_weight(stream)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # `/channel/user` returns different JSON data with less useful information
+        url = urlparse(self.url)
+        self.url = urlunparse(url._replace(path=re.sub(r"^/channel/", "/", url.path)))
+
+    def _get_streams(self):
+        data = self.session.http.get(
+            self.url,
+            schema=validate.Schema(
+                validate.parse_html(),
+                validate.xml_xpath_string(".//script[contains(text(),'channel:{')][1]/text()"),
+                re.compile(r"channel:(?P<json>{.+?}),?\n"),
+                validate.none_or_all(
+                    validate.get("json"),
+                    validate.parse_json(),
+                    {
+                        "status": bool,
+                        "id": int,
+                        "streamer": {"username": str},
+                        "game": str,
+                        "title": str,
+                        "sources": validate.all(
+                            {str: validate.url()},
+                            validate.filter(lambda k, v: ".m3u8" in v),
+                        ),
+                    },
+                    validate.union_get(
+                        "status",
+                        "id",
+                        ("streamer", "username"),
+                        "game",
+                        "title",
+                        "sources",
+                    ),
+                ),
+            ),
+        )
+
+        if not data:
+            log.error("Could not find channel info")
+            return
+
+        status, self.id, self.author, self.category, self.title, sources = data
+
+        if not status:
+            log.debug("Channel appears to be offline")
+            return
+
+        for name, url in sources.items():
+            name = f"{name}{'p' if name.isnumeric() else ''}"
+            yield name, HLSStream(self.session, url)
+
+
+__plugin__ = GoodGame

streamlink-6.2.1/src/streamlink/plugins/nos.py

@@ -0,0 +1,61 @@
+"""
+$description Live TV channels and video on-demand service from NOS, a Dutch public, state-owned broadcaster.
+$url nos.nl
+$type live, vod
+$metadata id
+$metadata title
+$region Netherlands
+"""
+
+import logging
+import re
+
+from streamlink.plugin import Plugin, pluginmatcher
+from streamlink.plugin.api import validate
+from streamlink.stream.hls import HLSStream
+
+
+log = logging.getLogger(__name__)
+
+
+@pluginmatcher(re.compile(
+    r"https?://(?:\w+\.)?nos\.nl/(?:live|video|collectie)",
+))
+class NOS(Plugin):
+    def _get_streams(self):
+        data = self.session.http.get(
+            self.url,
+            schema=validate.Schema(
+                validate.parse_html(),
+                validate.xml_xpath_string(".//script[@type='application/ld+json'][1]/text()"),
+                validate.none_or_all(
+                    validate.parse_json(),
+                    {
+                        "@type": "VideoObject",
+                        "encodingFormat": "application/vnd.apple.mpegurl",
+                        "contentUrl": validate.url(),
+                        "identifier": validate.any(int, str),
+                        "name": str,
+                    },
+                    validate.union_get(
+                        "contentUrl",
+                        "identifier",
+                        "name",
+                    ),
+                ),
+            ),
+        )
+        if not data:
+            return
+
+        hls_url, self.id, self.title = data
+
+        res = self.session.http.get(hls_url, raise_for_status=False)
+        if res.status_code >= 400:
+            log.error("Content is inaccessible or may have expired")
+            return
+
+        return HLSStream.parse_variant_playlist(self.session, hls_url)
+
+
+__plugin__ = NOS

{streamlink-6.2.0 → streamlink-6.2.1}/src/streamlink/plugins/pandalive.py

@@ -18,7 +18,7 @@ log = logging.getLogger(__name__)
 
 
 @pluginmatcher(re.compile(
-    r"https?://(?:www\.)?pandalive\.co\.kr/",
+    r"https?://(?:www\.)?pandalive\.co\.kr/live/play/[^/]+",
 ))
 class Pandalive(Plugin):
     def _get_streams(self):
@@ -34,10 +34,14 @@ class Pandalive(Plugin):
 
         json = self.session.http.post(
             "https://api.pandalive.co.kr/v1/live/play",
+            headers={
+                "Referer": self.url,
+            },
             data={
                 "action": "watch",
                 "userId": media_code,
             },
+            acceptable_status=(200, 400),
             schema=validate.Schema(
                 validate.parse_json(),
                 validate.any(