diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-12-10 15:18:34 +0100 | 
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-12-10 15:18:36 +0100 | 
| commit | 2fc9f2b41d362f15c7d61fd2b16c541e53d03b87 (patch) | |
| tree | 1f8ec3bb9442a428fa4d7dcfe486dec3b1cacd69 | |
| parent | 5f3544baa36b76b31b030e07ef6c120b1dd432c4 (diff) | |
[facebook] Make thumbnail and duration optional
Fixes #4425.
Looks like both properties aren't given to us anymore. For now, just fall back to not returning them.
| -rw-r--r-- | youtube_dl/extractor/facebook.py | 12 | 
1 files changed, 5 insertions, 7 deletions
| diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py index 2139f68aa..1ad4e77a8 100644 --- a/youtube_dl/extractor/facebook.py +++ b/youtube_dl/extractor/facebook.py @@ -13,9 +13,10 @@ from ..compat import (      compat_urllib_request,  )  from ..utils import ( -    urlencode_postdata,      ExtractorError, +    int_or_none,      limit_length, +    urlencode_postdata,  ) @@ -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',          }      }, { @@ -107,9 +107,7 @@ class FacebookIE(InfoExtractor):          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) @@ -149,6 +147,6 @@ class FacebookIE(InfoExtractor):              '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'),          } | 
