|
@ -14,7 +14,6 @@ from ..compat import ( |
|
|
) |
|
|
) |
|
|
from ..utils import ( |
|
|
from ..utils import ( |
|
|
ExtractorError, |
|
|
ExtractorError, |
|
|
int_or_none, |
|
|
|
|
|
limit_length, |
|
|
limit_length, |
|
|
urlencode_postdata, |
|
|
urlencode_postdata, |
|
|
get_element_by_id, |
|
|
get_element_by_id, |
|
@ -142,16 +141,20 @@ class FacebookIE(InfoExtractor): |
|
|
data = dict(json.loads(m.group(1))) |
|
|
data = dict(json.loads(m.group(1))) |
|
|
params_raw = compat_urllib_parse_unquote(data['params']) |
|
|
params_raw = compat_urllib_parse_unquote(data['params']) |
|
|
params = json.loads(params_raw) |
|
|
params = json.loads(params_raw) |
|
|
video_data = params['video_data'][0] |
|
|
|
|
|
|
|
|
|
|
|
formats = [] |
|
|
formats = [] |
|
|
for quality in ['sd', 'hd']: |
|
|
|
|
|
src = video_data.get('%s_src' % quality) |
|
|
|
|
|
if src is not None: |
|
|
|
|
|
formats.append({ |
|
|
|
|
|
'format_id': quality, |
|
|
|
|
|
'url': src, |
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
for format_id, f in params['video_data'].items(): |
|
|
|
|
|
if not f or not isinstance(f, list): |
|
|
|
|
|
continue |
|
|
|
|
|
for quality in ('sd', 'hd'): |
|
|
|
|
|
for src_type in ('src', 'src_no_ratelimit'): |
|
|
|
|
|
src = f[0].get('%s_%s' % (quality, src_type)) |
|
|
|
|
|
if src: |
|
|
|
|
|
formats.append({ |
|
|
|
|
|
'format_id': '%s_%s_%s' % (format_id, quality, src_type), |
|
|
|
|
|
'url': src, |
|
|
|
|
|
'preference': -10 if format_id == 'progressive' else 0, |
|
|
|
|
|
}) |
|
|
if not formats: |
|
|
if not formats: |
|
|
raise ExtractorError('Cannot find video formats') |
|
|
raise ExtractorError('Cannot find video formats') |
|
|
|
|
|
|
|
@ -171,7 +174,5 @@ class FacebookIE(InfoExtractor): |
|
|
'id': video_id, |
|
|
'id': video_id, |
|
|
'title': video_title, |
|
|
'title': video_title, |
|
|
'formats': formats, |
|
|
'formats': formats, |
|
|
'duration': int_or_none(video_data.get('video_duration')), |
|
|
|
|
|
'thumbnail': video_data.get('thumbnail_src'), |
|
|
|
|
|
'uploader': uploader, |
|
|
'uploader': uploader, |
|
|
} |
|
|
} |