]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[once] add support for vmap urls
authorRemita Amine <remitamine@gmail.com>
Wed, 11 Oct 2017 15:48:32 +0000 (15:48 +0000)
committerRemita Amine <remitamine@gmail.com>
Wed, 11 Oct 2017 15:50:20 +0000 (15:50 +0000)
youtube_dl/extractor/gamespot.py
youtube_dl/extractor/once.py

index 00d311158f6b7846a470dd90488d3db54d484910..02804d297a4709198371e2e2acfd8a83857095be 100644 (file)
@@ -105,7 +105,7 @@ class GameSpotIE(OnceIE):
             onceux_url = self._parse_json(unescapeHTML(onceux_json), page_id).get('metadataUri')
             if onceux_url:
                 formats.extend(self._extract_once_formats(re.sub(
-                    r'https?://[^/]+', 'http://once.unicornmedia.com', onceux_url).replace('ads/vmap/', '')))
+                    r'https?://[^/]+', 'http://once.unicornmedia.com', onceux_url)))
 
         if not formats:
             for quality in ['sd', 'hd']:
index 1bf96ea56e29849725db4b9c799ec63330c34224..a637c8ecfb0f03ecc46536363800c38f716fe557 100644 (file)
@@ -7,7 +7,7 @@ from .common import InfoExtractor
 
 
 class OnceIE(InfoExtractor):
-    _VALID_URL = r'https?://.+?\.unicornmedia\.com/now/[^/]+/[^/]+/(?P<domain_id>[^/]+)/(?P<application_id>[^/]+)/(?:[^/]+/)?(?P<media_item_id>[^/]+)/content\.(?:once|m3u8|mp4)'
+    _VALID_URL = r'https?://.+?\.unicornmedia\.com/now/(?:ads/vmap/)?[^/]+/[^/]+/(?P<domain_id>[^/]+)/(?P<application_id>[^/]+)/(?:[^/]+/)?(?P<media_item_id>[^/]+)/content\.(?:once|m3u8|mp4)'
     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'