mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-23 08:26:50 +00:00
[xvideos] Fix HLS extraction (Closes #10356)
This commit is contained in:
parent
837e56c8ee
commit
70a2829fee
@ -42,24 +42,24 @@ class XVideosIE(InfoExtractor):
|
|||||||
video_url = compat_urllib_parse_unquote(self._search_regex(
|
video_url = compat_urllib_parse_unquote(self._search_regex(
|
||||||
r'flv_url=(.+?)&', webpage, 'video URL', default=''))
|
r'flv_url=(.+?)&', webpage, 'video URL', default=''))
|
||||||
if video_url:
|
if video_url:
|
||||||
formats.append({'url': video_url})
|
formats.append({
|
||||||
|
'url': video_url,
|
||||||
|
'format_id': 'flv',
|
||||||
|
})
|
||||||
|
|
||||||
player_args = self._search_regex(
|
for kind, _, format_url in re.findall(
|
||||||
r'(?s)new\s+HTML5Player\((.+?)\)', webpage, ' html5 player', default=None)
|
r'setVideo([^(]+)\((["\'])(http.+?)\2\)', webpage):
|
||||||
if player_args:
|
format_id = kind.lower()
|
||||||
for arg in player_args.split(','):
|
if format_id == 'hls':
|
||||||
format_url = self._search_regex(
|
|
||||||
r'(["\'])(?P<url>https?://.+?)\1', arg, 'url',
|
|
||||||
default=None, group='url')
|
|
||||||
if not format_url:
|
|
||||||
continue
|
|
||||||
ext = determine_ext(format_url)
|
|
||||||
if ext == 'mp4':
|
|
||||||
formats.append({'url': format_url})
|
|
||||||
elif ext == 'm3u8':
|
|
||||||
formats.extend(self._extract_m3u8_formats(
|
formats.extend(self._extract_m3u8_formats(
|
||||||
format_url, video_id, 'mp4',
|
format_url, video_id, 'mp4',
|
||||||
entry_protocol='m3u8_native', m3u8_id='hls', fatal=False))
|
entry_protocol='m3u8_native', m3u8_id='hls', fatal=False))
|
||||||
|
elif format_id in ('urllow', 'urlhigh'):
|
||||||
|
formats.append({
|
||||||
|
'url': format_url,
|
||||||
|
'format_id': '%s-%s' % (determine_ext(format_url, 'mp4'), format_id[3:]),
|
||||||
|
'quality': -2 if format_id.endswith('low') else None,
|
||||||
|
})
|
||||||
|
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user