]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[youtube] Extend JS player signature function name regexes (closes #18890, closes...
authorSergey M․ <dstftw@gmail.com>
Thu, 17 Jan 2019 03:24:44 +0000 (10:24 +0700)
committerSergey M․ <dstftw@gmail.com>
Thu, 17 Jan 2019 03:24:44 +0000 (10:24 +0700)
youtube_dl/extractor/youtube.py

index 730935657981ca23ffe981b4e4afce2bbca22078..c8bf98b5864fcce75d830f49e719797af6af7205 100644 (file)
@@ -1198,8 +1198,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         funcname = self._search_regex(
             (r'(["\'])signature\1\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
              r'\.sig\|\|(?P<sig>[a-zA-Z0-9$]+)\(',
-             r'yt\.akamaized\.net/\)\s*\|\|\s*.*?\s*c\s*&&\s*d\.set\([^,]+\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
-             r'\bc\s*&&\s*d\.set\([^,]+\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'yt\.akamaized\.net/\)\s*\|\|\s*.*?\s*c\s*&&\s*d\.set\([^,]+\s*,\s*(?:encodeURIComponent\s*\()?(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'\bc\s*&&\s*d\.set\([^,]+\s*,\s*(?:encodeURIComponent\s*\()?\s*(?P<sig>[a-zA-Z0-9$]+)\(',
              r'\bc\s*&&\s*d\.set\([^,]+\s*,\s*\([^)]*\)\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\('),
             jscode, 'Initial JS player signature function name', group='sig')