jens
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[gamespot] lower the preference of http formats(#14652)

This commit is contained in:
Remita Amine 2017-11-13 10:24:35 +01:00
parent 5fc12b9549
commit d4e31b72b9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/extractor/gamespot.py
View File

@ -109,7 +109,7 @@ class GameSpotIE(OnceIE):
if onceux_url: if onceux_url:
formats.extend(self._extract_once_formats(re.sub( formats.extend(self._extract_once_formats(re.sub(
r'https?://[^/]+', 'http://once.unicornmedia.com', onceux_url), r'https?://[^/]+', 'http://once.unicornmedia.com', onceux_url),
skip_http_formats=True)) http_formats_preference=-1))
if not formats: if not formats:
for quality in ['sd', 'hd']: for quality in ['sd', 'hd']:

5
youtube_dl/extractor/once.py
View File

@ -11,7 +11,7 @@ class OnceIE(InfoExtractor):
ADAPTIVE_URL_TEMPLATE = 'http://once.unicornmedia.com/now/master/playlist/%s/%s/%s/content.m3u8' ADAPTIVE_URL_TEMPLATE = 'http://once.unicornmedia.com/now/master/playlist/%s/%s/%s/content.m3u8'
PROGRESSIVE_URL_TEMPLATE = 'http://once.unicornmedia.com/now/media/progressive/%s/%s/%s/%s/content.mp4' PROGRESSIVE_URL_TEMPLATE = 'http://once.unicornmedia.com/now/media/progressive/%s/%s/%s/%s/content.mp4'
def _extract_once_formats(self, url, skip_http_formats=False): def _extract_once_formats(self, url, http_formats_preference=None):
domain_id, application_id, media_item_id = re.match( domain_id, application_id, media_item_id = re.match(
OnceIE._VALID_URL, url).groups() OnceIE._VALID_URL, url).groups()
formats = self._extract_m3u8_formats( formats = self._extract_m3u8_formats(
@ -27,7 +27,7 @@ class OnceIE(InfoExtractor):
rendition_id = self._search_regex( rendition_id = self._search_regex(
r'/now/media/playlist/[^/]+/[^/]+/([^/]+)', r'/now/media/playlist/[^/]+/[^/]+/([^/]+)',
adaptive_format['url'], 'redition id', default=None) adaptive_format['url'], 'redition id', default=None)
if rendition_id and not skip_http_formats: if rendition_id:
progressive_format = adaptive_format.copy() progressive_format = adaptive_format.copy()
progressive_format.update({ progressive_format.update({
'url': self.PROGRESSIVE_URL_TEMPLATE % ( 'url': self.PROGRESSIVE_URL_TEMPLATE % (
@ -35,6 +35,7 @@ class OnceIE(InfoExtractor):
'format_id': adaptive_format['format_id'].replace( 'format_id': adaptive_format['format_id'].replace(
'hls', 'http'), 'hls', 'http'),
'protocol': 'http', 'protocol': 'http',
'preference': http_formats_preference,
}) })
progressive_formats.append(progressive_format) progressive_formats.append(progressive_format)
self._check_formats(progressive_formats, media_item_id) self._check_formats(progressive_formats, media_item_id)