Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[gamespot] skip Brightcove Once http formats(#14652)

pull/9723/merge
Remita Amine 2017-11-11 12:41:15 +01:00
parent 59d2e6d04f
commit a5203935d6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
youtube_dl/extractor/gamespot.py
View File

@ -108,7 +108,8 @@ class GameSpotIE(OnceIE):
onceux_url = self._parse_json(unescapeHTML(onceux_json), page_id).get('metadataUri') onceux_url = self._parse_json(unescapeHTML(onceux_json), page_id).get('metadataUri')
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))
if not formats: if not formats:
for quality in ['sd', 'hd']: for quality in ['sd', 'hd']:

4
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): def _extract_once_formats(self, url, skip_http_formats=False):
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: if rendition_id and not skip_http_formats:
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 % (