R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Relax regex, prevent empty string match, and move title extraction before return.

Browse Source
This commit is contained in:
Curon 2018-04-14 20:52:04 +01:00
parent a829420352
commit 69af907995
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/extractor/senedd.py
View File

@ -29,10 +29,12 @@ class SeneddIE(InfoExtractor):
video_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
iframe_src = self._html_search_regex(r'(?:<iframe src=|var src = )"([^"]*)"', webpage, 'iframe source') title = self._og_search_title(webpage)
iframe_src = self._html_search_regex(r'(?:<iframe src=|var src = )"(.+)"', webpage, 'iframe source')
iframe = self._download_webpage(iframe_src, video_id) iframe = self._download_webpage(iframe_src, video_id)
m3u8 = self._html_search_regex(r'var file = "([^"]*)"', iframe, 'm3u8 source') m3u8 = self._html_search_regex(r'var file = "(.+)"', iframe, 'm3u8 source')
language = 'cy' if re.search(r'verbatim', m3u8) else 'en' language = 'cy' if re.search(r'verbatim', m3u8) else 'en'
formats = self._extract_m3u8_formats(m3u8, video_id, 'mp4', entry_protocol='m3u8_native') formats = self._extract_m3u8_formats(m3u8, video_id, 'mp4', entry_protocol='m3u8_native')
@ -49,7 +51,7 @@ class SeneddIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'title': self._og_search_title(webpage), 'title': title,
'formats': formats, 'formats': formats,
'language': language, 'language': language,
'thumbnail': 'http://static.content.nafw.vualto.com/meeting/%s/thumb/default.jpg' % video_id, 'thumbnail': 'http://static.content.nafw.vualto.com/meeting/%s/thumb/default.jpg' % video_id,