Compare commits

..

No commits in common. "dd9256d832621da1a890fea060ed59afd7cff22e" and "dd5dcf6e1c4e8995e5a15ec29138d9d53cf3f7c8" have entirely different histories.

View File

@ -515,7 +515,7 @@ class FacebookIE(InfoExtractor):
'uploader': uploader, 'uploader': uploader,
'uploader_id': uploader_data.get('id'), 'uploader_id': uploader_data.get('id'),
'timestamp': timestamp, 'timestamp': timestamp,
'thumbnail': thumbnail, 'thumbnails': [{'url': thumbnail}] if url_or_none(thumbnail) else [],
'view_count': parse_count(self._search_regex( 'view_count': parse_count(self._search_regex(
(r'\bviewCount\s*:\s*["\']([\d,.]+)', r'video_view_count["\']\s*:\s*(\d+)',), (r'\bviewCount\s*:\s*["\']([\d,.]+)', r'video_view_count["\']\s*:\s*(\d+)',),
webpage, 'view count', default=None)), webpage, 'view count', default=None)),
@ -680,7 +680,11 @@ class FacebookIE(InfoExtractor):
webpage_info['duration'] = video_info['duration'] webpage_info['duration'] = video_info['duration']
# preserve preferred_thumbnail in video info # preserve preferred_thumbnail in video info
if video_info.get('thumbnail'): if video_info.get('thumbnail'):
webpage_info['thumbnail'] = video_info['thumbnail'] if not [x for x in webpage_info['thumbnails'] if video_info['thumbnail'].split('?')[0] in x['url']]:
webpage_info['thumbnails'].append({
'url': video_info['thumbnail'],
'preference': 1
})
return merge_dicts(webpage_info, video_info) return merge_dicts(webpage_info, video_info)
if not video_data: if not video_data: