Fix: [Facebook] Cannot parse data
The internal structure for the video urls seems to have been changed
This commit is contained in:
parent
66ab0814c4
commit
57e5a1fddc
@ -420,12 +420,12 @@ class FacebookIE(InfoExtractor):
|
|||||||
|
|
||||||
def extract_relay_data(_filter):
|
def extract_relay_data(_filter):
|
||||||
return self._parse_json(self._search_regex(
|
return self._parse_json(self._search_regex(
|
||||||
r'handleWithCustomApplyEach\([^,]+,\s*({.*?%s.*?})\);' % _filter,
|
[r'handleWithCustomApplyEach\([^,]+,\s*({.*?%s.*?})\);' % _filter, r'<script.*?>(.*?%s.*?)</script>' % _filter],
|
||||||
webpage, 'replay data', default='{}'), video_id, fatal=False) or {}
|
webpage, 'replay data', default='{}'), video_id, fatal=False) or {}
|
||||||
|
|
||||||
def extract_relay_prefetched_data(_filter):
|
def extract_relay_prefetched_data(_filter):
|
||||||
replay_data = extract_relay_data(_filter)
|
replay_data = extract_relay_data(_filter)
|
||||||
for require in (replay_data.get('require') or []):
|
for require in ((replay_data.get('require') or []) + (try_get(replay_data, lambda x: x['require'][0][3][0]['__bbox']['require'], list) or [])):
|
||||||
if require[0] == 'RelayPrefetchedStreamCache':
|
if require[0] == 'RelayPrefetchedStreamCache':
|
||||||
return try_get(require, lambda x: x[3][1]['__bbox']['result']['data'], dict) or {}
|
return try_get(require, lambda x: x[3][1]['__bbox']['result']['data'], dict) or {}
|
||||||
|
|
||||||
@ -446,7 +446,7 @@ class FacebookIE(InfoExtractor):
|
|||||||
formats = []
|
formats = []
|
||||||
q = qualities(['sd', 'hd'])
|
q = qualities(['sd', 'hd'])
|
||||||
for (suffix, format_id) in [('', 'sd'), ('_quality_hd', 'hd')]:
|
for (suffix, format_id) in [('', 'sd'), ('_quality_hd', 'hd')]:
|
||||||
playable_url = video.get('playable_url' + suffix)
|
playable_url = video.get('playable_url' + suffix) or video.get('browser_native_'+format_id+'_url')
|
||||||
if not playable_url:
|
if not playable_url:
|
||||||
continue
|
continue
|
||||||
formats.append({
|
formats.append({
|
||||||
|
Loading…
Reference in New Issue
Block a user