[facebook] Fix and caption if title is empty
parent
6539c91a78
commit
50317dbbad
|
@ -29,13 +29,13 @@ class FacebookIE(InfoExtractor):
|
||||||
_NETRC_MACHINE = 'facebook'
|
_NETRC_MACHINE = 'facebook'
|
||||||
IE_NAME = 'facebook'
|
IE_NAME = 'facebook'
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'https://www.facebook.com/photo.php?v=120708114770723',
|
'url': 'https://www.facebook.com/video.php?v=637842556329505&fref=nf',
|
||||||
'md5': '48975a41ccc4b7a581abd68651c1a5a8',
|
'md5': '6a40d33c0eccbb1af76cf0485a052659',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '120708114770723',
|
'id': '637842556329505',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'duration': 279,
|
'duration': 38,
|
||||||
'title': 'PEOPLE ARE AWESOME 2013',
|
'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',
|
'url': 'https://www.facebook.com/video.php?v=10204634152394104',
|
||||||
|
@ -125,7 +125,16 @@ class FacebookIE(InfoExtractor):
|
||||||
raise ExtractorError('Cannot find video URL')
|
raise ExtractorError('Cannot find video URL')
|
||||||
|
|
||||||
video_title = self._html_search_regex(
|
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 {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
|
|
Loading…
Reference in New Issue