[PATCH] plugins: fix regex capture groups

Billy2011 · Aug 29, 2022 · 90abf7e · 90abf7e
1 parent ba536ac
commit 90abf7e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/src/streamlink/plugins/albavision.py b/src/streamlink/plugins/albavision.py
@@ -94,9 +94,9 @@ def _get_live_url(self):
         schema = validate.Schema(
             validate.xml_xpath_string(".//script[contains(text(), 'LIVE_URL')]/text()"),
             validate.none_or_all(
-                re.compile(r"""LIVE_URL\s*=\s*(?P<q>['"])(.+?)(?P=q)"""),
+                re.compile(r"""LIVE_URL\s*=\s*(?P<q>['"])(?P<url>.+?)(?P=q)"""),
                 validate.none_or_all(
-                    validate.get(1),
+                    validate.get("url"),
                     validate.url(),
                 ),
             ),
@@ -109,9 +109,9 @@ def _get_token_req_url(self):
         schema = validate.Schema(
             validate.xml_xpath_string(".//script[contains(text(), 'LIVE_URL')]/text()"),
             validate.none_or_all(
-                re.compile(r"""jQuery\.get\s*\((?P<q>['"])(.+?)(?P=q)"""),
+                re.compile(r"""jQuery\.get\s*\((?P<q>['"])(?P<token>.+?)(?P=q)"""),
                 validate.none_or_all(
-                    validate.get(1),
+                    validate.get("token"),
                     validate.url(),
                 ),
             ),
@@ -122,8 +122,8 @@ def _get_token_req_url(self):
         schema = validate.Schema(
             validate.xml_xpath_string(".//script[contains(text(), 'LIVE_URL')]/text()"),
             validate.none_or_all(
-                re.compile(r"""Math\.floor\(Date\.now\(\)\s*/\s*3600000\),\s*(?P<q>['"])(.+?)(?P=q)"""),
-                validate.none_or_all(validate.get(1)),
+                re.compile(r"""Math\.floor\(Date\.now\(\)\s*/\s*3600000\),\s*(?P<q>['"])(?P<token>.+?)(?P=q)"""),
+                validate.none_or_all(validate.get("token")),
             ),
         )
         token_req_str = schema.validate(self.page)

diff --git a/src/streamlink/plugins/hiplayer.py b/src/streamlink/plugins/hiplayer.py
@@ -38,8 +38,11 @@ def _get_streams(self):
                 validate.parse_html(),
                 validate.xml_xpath_string(".//script[contains(text(), 'https://hiplayer.hibridcdn.net/l/')]/text()"),
                 validate.none_or_all(
-                    re.compile(r"""(?P<q>['"])(https://hiplayer.hibridcdn.net/l/.+?)(?P=q)"""),
-                    validate.none_or_all(validate.get(1), validate.url()),
+                    re.compile(r"""(?P<q>['"])(?P<url>https://hiplayer.hibridcdn.net/l/.+?)(?P=q)"""),
+                    validate.none_or_all(
+                        validate.get("url"),
+                        validate.url(),
+                    ),
                 ),
             ),
         )

diff --git a/src/streamlink/plugins/htv.py b/src/streamlink/plugins/htv.py
@@ -80,8 +80,11 @@ def _get_streams(self):
                 validate.parse_html(),
                 validate.xml_xpath_string(".//script[contains(text(), 'playlist.m3u8')]/text()"),
                 validate.none_or_all(
-                    re.compile(r"""var\s+iosUrl\s*=\s*(?P<q>")(.+?)(?P=q)"""),
-                    validate.none_or_all(validate.get(1), validate.url()),
+                    re.compile(r"""var\s+iosUrl\s*=\s*(?P<q>")(?P<url>.+?)(?P=q)"""),
+                    validate.none_or_all(
+                        validate.get("url"),
+                        validate.url(),
+                    ),
                 ),
             ),
         )