minhngoc25a
/
yt-dlc
mirror of https://github.com/blackjack4494/yt-dlc
1
0
Fork 1
Code Issues Releases Wiki Activity

harden regex with lookbehind

This commit is contained in:
siikamiika 2020-08-11 00:13:43 +03:00
parent eaedbfd97e
commit 15eae44d74
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/downloader/youtube_live_chat.py
View File

@ -28,8 +28,8 @@ class YoutubeLiveChatReplayFD(FragmentFD):
return self._download_fragment(ctx, url, info_dict, headers) return self._download_fragment(ctx, url, info_dict, headers)
def parse_yt_initial_data(data): def parse_yt_initial_data(data):
window_patt = b'window\\["ytInitialData"\\]\\s*=\\s*(.*?);' window_patt = b'window\\["ytInitialData"\\]\\s*=\\s*(.*?)(?<=});'
var_patt = b'var\\s+ytInitialData\\s*=\\s*(.*?);' var_patt = b'var\\s+ytInitialData\\s*=\\s*(.*?)(?<=});'
for patt in window_patt, var_patt: for patt in window_patt, var_patt:
try: try:
raw_json = re.search(patt, data).group(1) raw_json = re.search(patt, data).group(1)

4
youtube_dl/extractor/youtube.py
View File

@ -1495,8 +1495,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
def _get_yt_initial_data(self, video_id, webpage): def _get_yt_initial_data(self, video_id, webpage):
config = self._search_regex( config = self._search_regex(
(r'window\["ytInitialData"\]\s*=\s*(.*);', (r'window\["ytInitialData"\]\s*=\s*(.*?)(?<=});',
r'var\s+ytInitialData\s*=\s*(.*?);'), r'var\s+ytInitialData\s*=\s*(.*?)(?<=});'),
webpage, 'ytInitialData', default=None) webpage, 'ytInitialData', default=None)
if config: if config:
return self._parse_json( return self._parse_json(