Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2025-02-16 17:07:54 +01:00
Code Issues Releases Wiki Activity

Refactor according to requests

Browse Source
This commit is contained in:
Lukas Anzinger 2020-05-11 16:33:39 +02:00
parent fbfd54d0b8
commit 2508a4b6aa
3 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/test_InfoExtractor.py
View File

@ -831,7 +831,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'height': 1080, 'height': 1080,
}], }],
{}, {},
), ( ),
(
# https://github.com/ytdl-org/youtube-dl/pull/14844 # https://github.com/ytdl-org/youtube-dl/pull/14844
'urls_only', 'urls_only',
'http://unknown/manifest.mpd', # mpd_url 'http://unknown/manifest.mpd', # mpd_url
@ -915,7 +916,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'height': 1080, 'height': 1080,
}], }],
{}, {},
), ( ),
(
# https://github.com/ytdl-org/youtube-dl/issues/20346 # https://github.com/ytdl-org/youtube-dl/issues/20346
# Media considered unfragmented even though it contains # Media considered unfragmented even though it contains
# Initialization tag # Initialization tag
@ -933,7 +935,6 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'vcodec': 'none', 'vcodec': 'none',
'tbr': 129.87, 'tbr': 129.87,
'asr': 48000, 'asr': 48000,
}, { }, {
'url': 'https://v.redd.it/hw1x7rcg7zl21/DASH_240', 'url': 'https://v.redd.it/hw1x7rcg7zl21/DASH_240',
'manifest_url': 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd', 'manifest_url': 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd',
@ -962,7 +963,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'fps': 30, 'fps': 30,
}], }],
{}, {},
), ( ),
(
'subtitles', 'subtitles',
'https://example.com/streams/1/playlist/playlist.mpd', # mpd_url 'https://example.com/streams/1/playlist/playlist.mpd', # mpd_url
'https://example.com/streams/1/playlist', # mpd_base_url 'https://example.com/streams/1/playlist', # mpd_base_url
@ -1064,12 +1066,12 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
for mpd_file, mpd_url, mpd_base_url, expected_formats, expected_subtitles in _TEST_CASES: for mpd_file, mpd_url, mpd_base_url, expected_formats, expected_subtitles in _TEST_CASES:
with io.open('./test/testdata/mpd/%s.mpd' % mpd_file, with io.open('./test/testdata/mpd/%s.mpd' % mpd_file,
mode='r', encoding='utf-8') as f: mode='r', encoding='utf-8') as f:
formats, subtitles = self.ie._parse_mpd_formats_subtitles( info_dict = self.ie._parse_mpd_formats_subtitles(
compat_etree_fromstring(f.read().encode('utf-8')), compat_etree_fromstring(f.read().encode('utf-8')),
mpd_base_url=mpd_base_url, mpd_url=mpd_url) mpd_base_url=mpd_base_url, mpd_url=mpd_url)
self.ie._sort_formats(formats) self.ie._sort_formats(info_dict['formats'])
expect_value(self, formats, expected_formats, None) expect_value(self, info_dict['formats'], expected_formats, None)
expect_value(self, subtitles, expected_subtitles, None) expect_value(self, info_dict['subtitles'], expected_subtitles, None)
def test_parse_f4m_formats(self): def test_parse_f4m_formats(self):
_TEST_CASES = [ _TEST_CASES = [

20
youtube_dl/extractor/common.py
View File

@ -2023,8 +2023,10 @@ class InfoExtractor(object):
}) })
return entries return entries
def _extract_mpd_formats(self, *args, **kwargs): def _extract_mpd_formats(self, mpd_url, video_id, mpd_id=None, note=None, errnote=None, fatal=True, formats_dict={}, data=None, headers={}, query={}):
return self._extract_mpd_formats_subtitles(*args, **kwargs)[0] return self._extract_mpd_formats_subtitles(
mpd_url, video_id, mpd_id=mpd_id, note=note, errnote=errnote, fatal=fatal,
formats_dict=formats_dict, data=data, headers=headers, query=query)['formats']
def _extract_mpd_formats_subtitles(self, mpd_url, video_id, mpd_id=None, note=None, errnote=None, fatal=True, formats_dict={}, data=None, headers={}, query={}): def _extract_mpd_formats_subtitles(self, mpd_url, video_id, mpd_id=None, note=None, errnote=None, fatal=True, formats_dict={}, data=None, headers={}, query={}):
res = self._download_xml_handle( res = self._download_xml_handle(
@ -2040,11 +2042,13 @@ class InfoExtractor(object):
mpd_base_url = base_url(urlh.geturl()) mpd_base_url = base_url(urlh.geturl())
return self._parse_mpd_formats_subtitles( return self._parse_mpd_formats_subtitles(
mpd_doc, mpd_id=mpd_id, mpd_base_url=mpd_base_url, mpd_doc, mpd_id=mpd_id, mpd_base_url=mpd_base_url, formats_dict=formats_dict,
formats_dict=formats_dict, mpd_url=mpd_url) mpd_url=mpd_url)
def _parse_mpd_formats(self, *args, **kwargs): def _parse_mpd_formats(self, mpd_doc, mpd_id=None, mpd_base_url='', formats_dict={}, mpd_url=None):
return self._parse_mpd_formats_subtitles(*args, **kwargs)[0] return self._parse_mpd_formats_subtitles(
mpd_doc, mpd_id=mpd_id, mpd_base_url=mpd_base_url, formats_dict=formats_dict,
mpd_url=mpd_url)['formats']
def _parse_mpd_formats_subtitles(self, mpd_doc, mpd_id=None, mpd_base_url='', formats_dict={}, mpd_url=None): def _parse_mpd_formats_subtitles(self, mpd_doc, mpd_id=None, mpd_base_url='', formats_dict={}, mpd_url=None):
""" """
@ -2055,7 +2059,7 @@ class InfoExtractor(object):
2. https://en.wikipedia.org/wiki/Dynamic_Adaptive_Streaming_over_HTTP 2. https://en.wikipedia.org/wiki/Dynamic_Adaptive_Streaming_over_HTTP
""" """
if mpd_doc.get('type') == 'dynamic': if mpd_doc.get('type') == 'dynamic':
return [] return {'formats': [], 'subtitles': {}}
namespace = self._search_regex(r'(?i)^{([^}]+)?}MPD$', mpd_doc.tag, 'namespace', default=None) namespace = self._search_regex(r'(?i)^{([^}]+)?}MPD$', mpd_doc.tag, 'namespace', default=None)
@ -2337,7 +2341,7 @@ class InfoExtractor(object):
formats.append(full_info) formats.append(full_info)
else: else:
self.report_warning('Unknown MIME type %s in DASH manifest' % mime_type) self.report_warning('Unknown MIME type %s in DASH manifest' % mime_type)
return formats, subtitles return {'formats': formats, 'subtitles': subtitles}
def _extract_ism_formats(self, ism_url, video_id, ism_id=None, note=None, errnote=None, fatal=True, data=None, headers={}, query={}): def _extract_ism_formats(self, ism_url, video_id, ism_id=None, note=None, errnote=None, fatal=True, data=None, headers={}, query={}):
res = self._download_xml_handle( res = self._download_xml_handle(

13
youtube_dl/extractor/generic.py
View File

@ -2390,14 +2390,11 @@ class GenericIE(InfoExtractor):
xspf_base_url=full_response.geturl()), xspf_base_url=full_response.geturl()),
video_id) video_id)
elif re.match(r'(?i)^(?:{[^}]+})?MPD$', doc.tag): elif re.match(r'(?i)^(?:{[^}]+})?MPD$', doc.tag):
formats, subtitles = self._parse_mpd_formats_subtitles( info_dict.update(
doc, self._parse_mpd_formats_subtitles(
mpd_base_url=full_response.geturl().rpartition('/')[0], doc, mpd_base_url=full_response.geturl().rpartition('/')[0],
mpd_url=url) mpd_url=url))
self._sort_formats(formats) self._sort_formats(info_dict['formats'])
info_dict['formats'] = formats
if subtitles:
info_dict['subtitles'] = subtitles
return info_dict return info_dict
elif re.match(r'^{http://ns\.adobe\.com/f4m/[12]\.0}manifest$', doc.tag): elif re.match(r'^{http://ns\.adobe\.com/f4m/[12]\.0}manifest$', doc.tag):
info_dict['formats'] = self._parse_f4m_formats(doc, url, video_id) info_dict['formats'] = self._parse_f4m_formats(doc, url, video_id)