Merge 2d900facc4 into e1b3fa242c

[Youtube] Find n function name in player 3400486c
Fixes #32877
2024-09-08 05:43:18 +09:00 · 2024-07-25 17:41:58 +07:00 · 2024-07-25 00:16:00 +01:00 · 2024-07-24 14:33:34 +01:00 · 2021-05-28 13:59:16 +08:00
3 changed files with 19 additions and 4 deletions
--- a/test/test_youtube_signature.py
+++ b/test/test_youtube_signature.py
@ -166,6 +166,14 @@ _NSIG_TESTS = [
        'https://www.youtube.com/s/player/b22ef6e7/player_ias.vflset/en_US/base.js',
        'b6HcntHGkvBLk_FRf', 'kNPW6A7FyP2l8A',
    ),
+    (
+        'https://www.youtube.com/s/player/3400486c/player_ias.vflset/en_US/base.js',
+        'lL46g3XifCKUZn1Xfw', 'z767lhet6V2Skl',
+    ),
+    (
+        'https://www.youtube.com/s/player/5604538d/player_ias.vflset/en_US/base.js',
+        '7X-he4jjvMx7BCX', 'sViSydX8IHtdWA',
+    ),
 ]


--- a/youtube_dl/extractor/safari.py
+++ b/youtube_dl/extractor/safari.py
@ -193,6 +193,9 @@ class SafariApiIE(SafariBaseIE):
        part = self._download_json(
            url, '%s/%s' % (mobj.group('course_id'), mobj.group('part')),
            'Downloading part JSON')
+        part['web_url'] = part['asset_base_url'].replace('library/view',
+                                                         'videos') +\
+            part['videoclips'][0]['reference_id'] + '/'
        return self.url_result(part['web_url'], SafariIE.ie_key())


--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@ -1647,7 +1647,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
        except JSInterpreter.Exception as e:
            self.report_warning(
                '%s (%s %s)' % (
-                    'Unable to decode n-parameter: download likely to be throttled',
+                    'Unable to decode n-parameter: expect download to be blocked or throttled',
                    error_to_compat_str(e),
                    traceback.format_exc()),
                video_id=video_id)
@ -1659,18 +1659,22 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
    def _extract_n_function_name(self, jscode):
        func_name, idx = self._search_regex(
            # new: (b=String.fromCharCode(110),c=a.get(b))&&c=nfunc[idx](c)
+            # or:  (b="nn"[+a.D],c=a.get(b))&&(c=nfunc[idx](c)s
            # old: .get("n"))&&(b=nfunc[idx](b)
            # older: .get("n"))&&(b=nfunc(b)
            r'''(?x)
-                (?:\(\s*(?P<b>[a-z])\s*=\s*String\s*\.\s*fromCharCode\s*\(\s*110\s*\)\s*,(?P<c>[a-z])\s*=\s*[a-z]\s*)?
-                \.\s*get\s*\(\s*(?(b)(?P=b)|"n")(?:\s*\)){2}\s*&&\s*\(\s*(?(c)(?P=c)|b)\s*=\s*
+                (?:\(\s*(?P<b>[a-z])\s*=\s*(?:
+                    String\s*\.\s*fromCharCode\s*\(\s*110\s*\)|
+                    "n+"\[\s*\+?s*[\w$.]+\s*]
+                )\s*,(?P<c>[a-z])\s*=\s*[a-z]\s*)?
+                \.\s*get\s*\(\s*(?(b)(?P=b)|"n{1,2}")(?:\s*\)){2}\s*&&\s*\(\s*(?(c)(?P=c)|b)\s*=\s*
                (?P<nfunc>[a-zA-Z_$][\w$]*)(?:\s*\[(?P<idx>\d+)\])?\s*\(\s*[\w$]+\s*\)
            ''', jscode, 'Initial JS player n function name', group=('nfunc', 'idx'))
        if not idx:
            return func_name

        return self._parse_json(self._search_regex(
-            r'var {0}\s*=\s*(\[.+?\])\s*[,;]'.format(re.escape(func_name)), jscode,
+            r'var\s+{0}\s*=\s*(\[.+?\])\s*[,;]'.format(re.escape(func_name)), jscode,
            'Initial JS player n function list ({0}.{1})'.format(func_name, idx)),
            func_name, transform_source=js_to_json)[int(idx)]
Author	SHA1	Message	Date
cdarlint	c8ea79651a	Merge `2d900facc4` into `e1b3fa242c`	2024-07-25 17:41:58 +07:00
dirkf	e1b3fa242c	[Youtube] Find `n` function name in player `3400486c` Fixes #32877	2024-07-25 00:16:00 +01:00
dirkf	451046d62a	[Youtube] Make n-sig throttling diagnostic up-to-date	2024-07-24 14:33:34 +01:00
cdarlint	2d900facc4	[safari] fix 404 on Manning videos URL schema of videos /library/view/ would default 302 redirect to /videos/ but fails to redirect on some Manning videos, and got 404 this commit fix this and default schema to use /videos/	2021-05-28 13:59:16 +08:00