diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-09-13 09:01:57 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-09-13 09:01:57 +0200 |
| commit | 50317dbbada099eaefdc4bc56fff8109907a827a (patch) | |
| tree | 1ce6fd0cddbfbd4f6b3e05977589e86814ae8cb5 /youtube_dl/extractor | |
| parent | 6539c91a7806112be9750a72c154f5a1f99e6c78 (diff) | |
[facebook] Fix and caption if title is empty
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/facebook.py | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py index afb34ce51..d675a939d 100644 --- a/youtube_dl/extractor/facebook.py +++ b/youtube_dl/extractor/facebook.py @@ -29,13 +29,13 @@ class FacebookIE(InfoExtractor): _NETRC_MACHINE = 'facebook' IE_NAME = 'facebook' _TESTS = [{ - 'url': 'https://www.facebook.com/photo.php?v=120708114770723', - 'md5': '48975a41ccc4b7a581abd68651c1a5a8', + 'url': 'https://www.facebook.com/video.php?v=637842556329505&fref=nf', + 'md5': '6a40d33c0eccbb1af76cf0485a052659', 'info_dict': { - 'id': '120708114770723', + 'id': '637842556329505', 'ext': 'mp4', - 'duration': 279, - 'title': 'PEOPLE ARE AWESOME 2013', + 'duration': 38, + 'title': 'Did you know Kei Nishikori is the first Asian man to ever reach a Grand Slam fin...', } }, { 'url': 'https://www.facebook.com/video.php?v=10204634152394104', @@ -125,7 +125,16 @@ class FacebookIE(InfoExtractor): raise ExtractorError('Cannot find video URL') video_title = self._html_search_regex( - r'<h2 class="uiHeaderTitle">([^<]*)</h2>', webpage, 'title') + r'<h2 class="uiHeaderTitle">([^<]*)</h2>', webpage, 'title', + fatal=False) + if not video_title: + video_title = self._html_search_regex( + r'(?s)<span class="fbPhotosPhotoCaption".*?id="fbPhotoPageCaption"><span class="hasCaption">(.*?)</span>', + webpage, 'alternative title', default=None) + if len(video_title) > 80 + 3: + video_title = video_title[:80] + '...' + if not video_title: + video_title = 'Facebook video #%s' % video_id return { 'id': video_id, |