|
|
@ -20,6 +20,7 @@ from ..utils import (
|
|
|
|
int_or_none,
|
|
|
|
int_or_none,
|
|
|
|
js_to_json,
|
|
|
|
js_to_json,
|
|
|
|
limit_length,
|
|
|
|
limit_length,
|
|
|
|
|
|
|
|
parse_count,
|
|
|
|
sanitized_Request,
|
|
|
|
sanitized_Request,
|
|
|
|
try_get,
|
|
|
|
try_get,
|
|
|
|
urlencode_postdata,
|
|
|
|
urlencode_postdata,
|
|
|
@ -75,7 +76,7 @@ class FacebookIE(InfoExtractor):
|
|
|
|
'info_dict': {
|
|
|
|
'info_dict': {
|
|
|
|
'id': '274175099429670',
|
|
|
|
'id': '274175099429670',
|
|
|
|
'ext': 'mp4',
|
|
|
|
'ext': 'mp4',
|
|
|
|
'title': 'Asif Nawab Butt posted a video to his Timeline.',
|
|
|
|
'title': 're:^Asif Nawab Butt posted a video',
|
|
|
|
'uploader': 'Asif Nawab Butt',
|
|
|
|
'uploader': 'Asif Nawab Butt',
|
|
|
|
'upload_date': '20140506',
|
|
|
|
'upload_date': '20140506',
|
|
|
|
'timestamp': 1399398998,
|
|
|
|
'timestamp': 1399398998,
|
|
|
@ -133,7 +134,7 @@ class FacebookIE(InfoExtractor):
|
|
|
|
}, {
|
|
|
|
}, {
|
|
|
|
# have 1080P, but only up to 720p in swf params
|
|
|
|
# have 1080P, but only up to 720p in swf params
|
|
|
|
'url': 'https://www.facebook.com/cnn/videos/10155529876156509/',
|
|
|
|
'url': 'https://www.facebook.com/cnn/videos/10155529876156509/',
|
|
|
|
'md5': '0d9813160b146b3bc8744e006027fcc6',
|
|
|
|
'md5': '9571fae53d4165bbbadb17a94651dcdc',
|
|
|
|
'info_dict': {
|
|
|
|
'info_dict': {
|
|
|
|
'id': '10155529876156509',
|
|
|
|
'id': '10155529876156509',
|
|
|
|
'ext': 'mp4',
|
|
|
|
'ext': 'mp4',
|
|
|
@ -142,6 +143,7 @@ class FacebookIE(InfoExtractor):
|
|
|
|
'upload_date': '20161030',
|
|
|
|
'upload_date': '20161030',
|
|
|
|
'uploader': 'CNN',
|
|
|
|
'uploader': 'CNN',
|
|
|
|
'thumbnail': r're:^https?://.*',
|
|
|
|
'thumbnail': r're:^https?://.*',
|
|
|
|
|
|
|
|
'view_count': int,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}, {
|
|
|
|
}, {
|
|
|
|
# bigPipe.onPageletArrive ... onPageletArrive pagelet_group_mall
|
|
|
|
# bigPipe.onPageletArrive ... onPageletArrive pagelet_group_mall
|
|
|
@ -149,7 +151,7 @@ class FacebookIE(InfoExtractor):
|
|
|
|
'info_dict': {
|
|
|
|
'info_dict': {
|
|
|
|
'id': '1417995061575415',
|
|
|
|
'id': '1417995061575415',
|
|
|
|
'ext': 'mp4',
|
|
|
|
'ext': 'mp4',
|
|
|
|
'title': 'md5:a7b86ca673f51800cd54687b7f4012fe',
|
|
|
|
'title': 'md5:1db063d6a8c13faa8da727817339c857',
|
|
|
|
'timestamp': 1486648217,
|
|
|
|
'timestamp': 1486648217,
|
|
|
|
'upload_date': '20170209',
|
|
|
|
'upload_date': '20170209',
|
|
|
|
'uploader': 'Yaroslav Korpan',
|
|
|
|
'uploader': 'Yaroslav Korpan',
|
|
|
@ -176,7 +178,7 @@ class FacebookIE(InfoExtractor):
|
|
|
|
'info_dict': {
|
|
|
|
'info_dict': {
|
|
|
|
'id': '1396382447100162',
|
|
|
|
'id': '1396382447100162',
|
|
|
|
'ext': 'mp4',
|
|
|
|
'ext': 'mp4',
|
|
|
|
'title': 'md5:e2d2700afdf84e121f5d0f999bad13a3',
|
|
|
|
'title': 'md5:19a428bbde91364e3de815383b54a235',
|
|
|
|
'timestamp': 1486035494,
|
|
|
|
'timestamp': 1486035494,
|
|
|
|
'upload_date': '20170202',
|
|
|
|
'upload_date': '20170202',
|
|
|
|
'uploader': 'Elisabeth Ahtn',
|
|
|
|
'uploader': 'Elisabeth Ahtn',
|
|
|
@ -426,6 +428,10 @@ class FacebookIE(InfoExtractor):
|
|
|
|
'timestamp', default=None))
|
|
|
|
'timestamp', default=None))
|
|
|
|
thumbnail = self._og_search_thumbnail(webpage)
|
|
|
|
thumbnail = self._og_search_thumbnail(webpage)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
view_count = parse_count(self._search_regex(
|
|
|
|
|
|
|
|
r'\bviewCount\s*:\s*["\']([\d,.]+)', webpage, 'view count',
|
|
|
|
|
|
|
|
default=None))
|
|
|
|
|
|
|
|
|
|
|
|
info_dict = {
|
|
|
|
info_dict = {
|
|
|
|
'id': video_id,
|
|
|
|
'id': video_id,
|
|
|
|
'title': video_title,
|
|
|
|
'title': video_title,
|
|
|
@ -433,6 +439,7 @@ class FacebookIE(InfoExtractor):
|
|
|
|
'uploader': uploader,
|
|
|
|
'uploader': uploader,
|
|
|
|
'timestamp': timestamp,
|
|
|
|
'timestamp': timestamp,
|
|
|
|
'thumbnail': thumbnail,
|
|
|
|
'thumbnail': thumbnail,
|
|
|
|
|
|
|
|
'view_count': view_count,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return webpage, info_dict
|
|
|
|
return webpage, info_dict
|
|
|
|