paradizelost/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[funnyordie] Correct JSON interpretation

Browse Source
This commit is contained in:
Philipp Hagemeister 2014-03-13 00:52:57 +01:00
parent f36aacba0f
commit cddcfd90b4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
youtube_dl/extractor/funnyordie.py
View File

@ -34,12 +34,14 @@ class FunnyOrDieIE(InfoExtractor):
if mobj.group('type') == 'embed': if mobj.group('type') == 'embed':
post_json = self._search_regex( post_json = self._search_regex(
r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details') r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details')
post = json.loads(post_json)['attachment'] post = json.loads(post_json)
title = post['name'] title = post['name']
description = post.get('description') description = post.get('description')
thumbnail = post.get('picture')
else: else:
title = self._og_search_title(webpage) title = self._og_search_title(webpage)
description = self._og_search_description(webpage) description = self._og_search_description(webpage)
thumbnail = None
return { return {
'id': video_id, 'id': video_id,
@ -47,4 +49,5 @@ class FunnyOrDieIE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
'title': title, 'title': title,
'description': description, 'description': description,
'thumbnail': thumbnail,
} }