[pornhd] Fix extraction (fixes #4915)

This commit is contained in:
Philipp Hagemeister 2015-02-10 03:41:31 +01:00
parent 845734773d
commit f7a211dcc8
1 changed files with 10 additions and 9 deletions

View File

@ -46,14 +46,15 @@ class PornHdIE(InfoExtractor):
quality = qualities(['sd', 'hd']) quality = qualities(['sd', 'hd'])
sources = json.loads(js_to_json(self._search_regex( sources = json.loads(js_to_json(self._search_regex(
r"(?s)'sources'\s*:\s*(\{.+?\})\s*\}\);", webpage, 'sources'))) r"(?s)'sources'\s*:\s*(\{.+?\})\s*\}[;,)]",
webpage, 'sources')))
formats = [] formats = []
for container, s in sources.items(): for qname, video_url in sources.items():
for qname, video_url in s.items(): if not video_url:
continue
formats.append({ formats.append({
'url': video_url, 'url': video_url,
'container': container, 'format_id': qname,
'format_id': '%s-%s' % (container, qname),
'quality': quality(qname), 'quality': quality(qname),
}) })
self._sort_formats(formats) self._sort_formats(formats)