X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fuplynk.py;h=f06bf5b127fd0f352937d79fa6d5267fcb7cdb26;hb=HEAD;hp=a6a685c9dade5b962b3358bf1ca9caab66c98f12;hpb=aaf44a2f47f013e8d864ac9f98b2833904a8be78;p=youtube-dl

diff --git a/youtube_dl/extractor/uplynk.py b/youtube_dl/extractor/uplynk.py
index a6a685c9d..f06bf5b12 100644
--- a/youtube_dl/extractor/uplynk.py
+++ b/youtube_dl/extractor/uplynk.py
@@ -11,6 +11,7 @@ from ..utils import (
 
 
 class UplynkIE(InfoExtractor):
+    IE_NAME = 'uplynk'
     _VALID_URL = r'https?://.*?\.uplynk\.com/(?P<path>ext/[0-9a-f]{32}/(?P<external_id>[^/?&]+)|(?P<id>[0-9a-f]{32}))\.(?:m3u8|json)(?:.*?\bpbs=(?P<session_id>[^&]+))?'
     _TEST = {
         'url': 'http://content.uplynk.com/e89eaf2ce9054aa89d92ddb2d817a52e.m3u8',
@@ -26,15 +27,15 @@ class UplynkIE(InfoExtractor):
         },
     }
 
-    def _real_extract(self, url):
-        path, external_id, video_id, session_id = re.match(self._VALID_URL, url).groups()
+    def _extract_uplynk_info(self, uplynk_content_url):
+        path, external_id, video_id, session_id = re.match(UplynkIE._VALID_URL, uplynk_content_url).groups()
         display_id = video_id or external_id
-        formats = self._extract_m3u8_formats('http://content.uplynk.com/%s.m3u8' % path, display_id, 'mp4')
+        formats = self._extract_m3u8_formats(
+            'http://content.uplynk.com/%s.m3u8' % path,
+            display_id, 'mp4', 'm3u8_native')
         if session_id:
             for f in formats:
-                f['extra_param_to_segment_url'] = {
-                    'pbs': session_id,
-                }
+                f['extra_param_to_segment_url'] = 'pbs=' + session_id
         self._sort_formats(formats)
         asset = self._download_json('http://content.uplynk.com/player/assetinfo/%s.json' % path, display_id)
         if asset.get('error') == 1:
@@ -49,9 +50,14 @@ class UplynkIE(InfoExtractor):
             'formats': formats,
         }
 
+    def _real_extract(self, url):
+        return self._extract_uplynk_info(url)
+
 
-class UplynkPreplayIE(InfoExtractor):
+class UplynkPreplayIE(UplynkIE):
+    IE_NAME = 'uplynk:preplay'
     _VALID_URL = r'https?://.*?\.uplynk\.com/preplay2?/(?P<path>ext/[0-9a-f]{32}/(?P<external_id>[^/?&]+)|(?P<id>[0-9a-f]{32}))\.json'
+    _TEST = None
 
     def _real_extract(self, url):
         path, external_id, video_id = re.match(self._VALID_URL, url).groups()
@@ -61,4 +67,4 @@ class UplynkPreplayIE(InfoExtractor):
         session_id = preplay.get('sid')
         if session_id:
             content_url += '?pbs=' + session_id
-        return self.url_result(content_url, 'Uplynk')
+        return self._extract_uplynk_info(content_url)