Merge branch 'mark-facebook-live-videos' into fix.25.12.2018

# Conflicts:
#	youtube_dl/extractor/facebook.py
This commit is contained in:
Avichai Cohen 2019-04-02 17:45:43 +03:00
commit 13a0c87cfb

View File

@ -218,6 +218,10 @@ class FacebookIE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
'title': '#ESLOne VoD - Birmingham Finals Day#1 Fnatic vs. @Evil Geniuses', 'title': '#ESLOne VoD - Birmingham Finals Day#1 Fnatic vs. @Evil Geniuses',
'uploader': 'ESL One Dota 2', 'uploader': 'ESL One Dota 2',
'timestamp': 1527084179,
'upload_date': '20180523',
'uploader_id': '234218833769558',
'is_live': False
}, },
'params': { 'params': {
'skip_download': True, 'skip_download': True,
@ -378,6 +382,8 @@ class FacebookIE(InfoExtractor):
if not video_data: if not video_data:
raise ExtractorError('Cannot parse data') raise ExtractorError('Cannot parse data')
is_live = video_data[0].get('is_broadcast', False) and video_data[0].get('is_live_stream', False)
formats = [] formats = []
for f in video_data: for f in video_data:
format_id = f['stream_type'] format_id = f['stream_type']
@ -461,7 +467,8 @@ class FacebookIE(InfoExtractor):
'timestamp': timestamp, 'timestamp': timestamp,
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'view_count': view_count, 'view_count': view_count,
'uploader_id': uploader_id 'uploader_id': uploader_id,
'is_live': is_live
} }
return webpage, info_dict return webpage, info_dict