w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[facebook] Make thumbnail and duration optional

Browse source 
Fixes #4425.
Looks like both properties aren't given to us anymore. For now, just fall back to not returning them.
This commit is contained in:
Philipp Hagemeister 2014-12-10 15:18:34 +01:00
parent 5f3544baa3
commit 2fc9f2b41d
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
youtube_dl/extractor/facebook.py
View file

@ -13,9 +13,10 @@ from ..compat import (
compat_urllib_request, compat_urllib_request,
) )
from ..utils import ( from ..utils import (
urlencode_postdata,
ExtractorError, ExtractorError,
int_or_none,
limit_length, limit_length,
urlencode_postdata,
) )
@ -36,7 +37,6 @@ class FacebookIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': '637842556329505', 'id': '637842556329505',
'ext': 'mp4', 'ext': 'mp4',
'duration': 38,
'title': 're:Did you know Kei Nishikori is the first Asian man to ever reach a Grand Slam', 'title': 're:Did you know Kei Nishikori is the first Asian man to ever reach a Grand Slam',
} }
}, { }, {
@ -107,9 +107,7 @@ class FacebookIE(InfoExtractor):
self._login() self._login()
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) video_id = self._match_id(url)
video_id = mobj.group('id')
url = 'https://www.facebook.com/video/video.php?v=%s' % video_id url = 'https://www.facebook.com/video/video.php?v=%s' % video_id
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
@ -149,6 +147,6 @@ class FacebookIE(InfoExtractor):
'id': video_id, 'id': video_id,
'title': video_title, 'title': video_title,
'url': video_url, 'url': video_url,
'duration': int(video_data['video_duration']), 'duration': int_or_none(video_data.get('video_duration')),
'thumbnail': video_data['thumbnail_src'], 'thumbnail': video_data.get('thumbnail_src'),
} }