1
1
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-30 21:12:54 +01:00

[escapist] Make regexes more robust (Closes #5028)

This commit is contained in:
Sergey M․ 2015-02-22 23:11:33 +06:00
parent 35b7982303
commit c010af6f19

View File

@ -31,10 +31,10 @@ class EscapistIE(InfoExtractor):
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
uploader_id = self._html_search_regex( uploader_id = self._html_search_regex(
r"<h1 class='headline'><a href='/videos/view/(.*?)'", r"<h1\s+class='headline'>\s*<a\s+href='/videos/view/(.*?)'",
webpage, 'uploader ID', fatal=False) webpage, 'uploader ID', fatal=False)
uploader = self._html_search_regex( uploader = self._html_search_regex(
r"<h1 class='headline'>(.*?)</a>", r"<h1\s+class='headline'>(.*?)</a>",
webpage, 'uploader', fatal=False) webpage, 'uploader', fatal=False)
description = self._html_search_meta('description', webpage) description = self._html_search_meta('description', webpage)
@ -42,7 +42,7 @@ class EscapistIE(InfoExtractor):
title = raw_title.partition(' : ')[2] title = raw_title.partition(' : ')[2]
config_url = compat_urllib_parse.unquote(self._html_search_regex( config_url = compat_urllib_parse.unquote(self._html_search_regex(
r'<param name="flashvars" value="config=([^"&]+)', webpage, 'config URL')) r'<param\s+name="flashvars"\s+value="config=([^"&]+)', webpage, 'config URL'))
formats = [] formats = []