[peertube] Extract files also from streamingPlaylists (#27728)
JSON objects with an empty "files" tag seem to be a valid PeerTube API response. In those cases the "files" arrays contained in the "streamingPlaylists" members can be used instead. closes #26002 closes #27586
This commit is contained in:
parent
61e669acff
commit
170e1c1995
|
@ -450,6 +450,18 @@ class PeerTubeIE(InfoExtractor):
|
||||||
'tags': ['framasoft', 'peertube'],
|
'tags': ['framasoft', 'peertube'],
|
||||||
'categories': ['Science & Technology'],
|
'categories': ['Science & Technology'],
|
||||||
}
|
}
|
||||||
|
}, {
|
||||||
|
# Issue #26002
|
||||||
|
'url': 'peertube:spacepub.space:d8943b2d-8280-497b-85ec-bc282ec2afdc',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'd8943b2d-8280-497b-85ec-bc282ec2afdc',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': 'Dot matrix printer shell demo',
|
||||||
|
'uploader_id': '3',
|
||||||
|
'timestamp': 1587401293,
|
||||||
|
'upload_date': '20200420',
|
||||||
|
'uploader': 'Drew DeVault',
|
||||||
|
}
|
||||||
}, {
|
}, {
|
||||||
'url': 'https://peertube.tamanoir.foucry.net/videos/watch/0b04f13d-1e18-4f1d-814e-4979aa7c9c44',
|
'url': 'https://peertube.tamanoir.foucry.net/videos/watch/0b04f13d-1e18-4f1d-814e-4979aa7c9c44',
|
||||||
'only_matching': True,
|
'only_matching': True,
|
||||||
|
@ -526,7 +538,15 @@ class PeerTubeIE(InfoExtractor):
|
||||||
title = video['name']
|
title = video['name']
|
||||||
|
|
||||||
formats = []
|
formats = []
|
||||||
for file_ in video['files']:
|
files = video.get('files') or []
|
||||||
|
for playlist in (video.get('streamingPlaylists') or []):
|
||||||
|
if not isinstance(playlist, dict):
|
||||||
|
continue
|
||||||
|
playlist_files = playlist.get('files')
|
||||||
|
if not (playlist_files and isinstance(playlist_files, list)):
|
||||||
|
continue
|
||||||
|
files.extend(playlist_files)
|
||||||
|
for file_ in files:
|
||||||
if not isinstance(file_, dict):
|
if not isinstance(file_, dict):
|
||||||
continue
|
continue
|
||||||
file_url = url_or_none(file_.get('fileUrl'))
|
file_url = url_or_none(file_.get('fileUrl'))
|
||||||
|
|
Loading…
Reference in New Issue