Skip to content

Commit

Permalink
[facebook] Make thumbnail and duration optional
Browse files Browse the repository at this point in the history
Fixes #4425.
Looks like both properties aren't given to us anymore. For now, just fall back to not returning them.
  • Loading branch information
phihag committed Dec 10, 2014
1 parent 5f3544b commit 2fc9f2b
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions youtube_dl/extractor/facebook.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
compat_urllib_request,
)
from ..utils import (
urlencode_postdata,
ExtractorError,
int_or_none,
limit_length,
urlencode_postdata,
)


Expand All @@ -36,7 +37,6 @@ class FacebookIE(InfoExtractor):
'info_dict': {
'id': '637842556329505',
'ext': 'mp4',
'duration': 38,
'title': 're:Did you know Kei Nishikori is the first Asian man to ever reach a Grand Slam',
}
}, {
Expand Down Expand Up @@ -107,9 +107,7 @@ def _real_initialize(self):
self._login()

def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')

video_id = self._match_id(url)
url = 'https://www.facebook.com/video/video.php?v=%s' % video_id
webpage = self._download_webpage(url, video_id)

Expand Down Expand Up @@ -149,6 +147,6 @@ def _real_extract(self, url):
'id': video_id,
'title': video_title,
'url': video_url,
'duration': int(video_data['video_duration']),
'thumbnail': video_data['thumbnail_src'],
'duration': int_or_none(video_data.get('video_duration')),
'thumbnail': video_data.get('thumbnail_src'),
}

0 comments on commit 2fc9f2b

Please sign in to comment.