[extractor/common] Add support for schemeless URLs in _extract_wowza_formats (closes #13088, closes #13092)

This commit is contained in:
Sergey M․ 2017-05-16 22:11:34 +07:00
parent 7073015a23
commit 6f76679804
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D

View file

@ -2205,8 +2205,9 @@ class InfoExtractor(object):
def _extract_wowza_formats(self, url, video_id, m3u8_entry_protocol='m3u8_native', skip_protocols=[]): def _extract_wowza_formats(self, url, video_id, m3u8_entry_protocol='m3u8_native', skip_protocols=[]):
url = re.sub(r'/(?:manifest|playlist|jwplayer)\.(?:m3u8|f4m|mpd|smil)', '', url) url = re.sub(r'/(?:manifest|playlist|jwplayer)\.(?:m3u8|f4m|mpd|smil)', '', url)
url_base = self._search_regex(r'(?:https?|rtmp|rtsp)(://[^?]+)', url, 'format url') url_base = self._search_regex(
http_base_url = 'http' + url_base r'(?:(?:https?|rtmp|rtsp):)?(//[^?]+)', url, 'format url')
http_base_url = self._proto_relative_url(url_base, scheme='http:')
formats = [] formats = []
if 'm3u8' not in skip_protocols: if 'm3u8' not in skip_protocols:
formats.extend(self._extract_m3u8_formats( formats.extend(self._extract_m3u8_formats(