Skip to content

Commit

Permalink
[peertube] Extract files also from streamingPlaylists (ytdl-org#27728)
Browse files Browse the repository at this point in the history
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 ytdl-org#26002
closes ytdl-org#27586
  • Loading branch information
0l-l0 authored and ThirumalaiK committed Jan 28, 2021
1 parent 191a150 commit e2e099b
Showing 1 changed file with 21 additions and 1 deletion.
22 changes: 21 additions & 1 deletion youtube_dl/extractor/peertube.py
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,18 @@ class PeerTubeIE(InfoExtractor):
'tags': ['framasoft', 'peertube'],
'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',
'only_matching': True,
Expand Down Expand Up @@ -526,7 +538,15 @@ def _real_extract(self, url):
title = video['name']

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):
continue
file_url = url_or_none(file_.get('fileUrl'))
Expand Down

0 comments on commit e2e099b

Please sign in to comment.