Merge remote-tracking branch 'sehrgut/Grooveshark'

[youtube-dl.git] / youtube_dl / extractor / livestream.py

diff --git a/youtube_dl/extractor/livestream.py b/youtube_dl/extractor/livestream.py
index 2914343b962ecbd2e3ffceab316d8f292de66773..281a0ce4052eb986d7d4df6d10b8c29b36cab6d5 100644 (file)
--- a/youtube_dl/extractor/livestream.py
+++ b/youtube_dl/extractor/livestream.py
@@ -33,6 +33,49 @@ class LivestreamIE(InfoExtractor):
         }
     }
 
+    def _parse_smil(self, video_id, smil_url):
+        formats = []
+        _SWITCH_XPATH = (
+            './/{http://www.w3.org/2001/SMIL20/Language}body/'
+            '{http://www.w3.org/2001/SMIL20/Language}switch')
+        smil_doc = self._download_xml(
+            smil_url, video_id,
+            note='Downloading SMIL information',
+            errnote='Unable to download SMIL information',
+            fatal=False)
+        if smil_doc is False:  # Download failed
+            return formats
+        title_node = find_xpath_attr(
+            smil_doc, './/{http://www.w3.org/2001/SMIL20/Language}meta',
+            'name', 'title')
+        if title_node is None:
+            self.report_warning('Cannot find SMIL id')
+            switch_node = smil_doc.find(_SWITCH_XPATH)
+        else:
+            title_id = title_node.attrib['content']
+            switch_node = find_xpath_attr(
+                smil_doc, _SWITCH_XPATH, 'id', title_id)
+        if switch_node is None:
+            raise ExtractorError('Cannot find switch node')
+        video_nodes = switch_node.findall(
+            '{http://www.w3.org/2001/SMIL20/Language}video')
+
+        for vn in video_nodes:
+            tbr = int_or_none(vn.attrib.get('system-bitrate'))
+            furl = (
+                'http://livestream-f.akamaihd.net/%s?v=3.0.3&fp=WIN%%2014,0,0,145' %
+                (vn.attrib['src']))
+            if 'clipBegin' in vn.attrib:
+                furl += '&ssek=' + vn.attrib['clipBegin']
+            formats.append({
+                'url': furl,
+                'format_id': 'smil_%d' % tbr,
+                'ext': 'flv',
+                'tbr': tbr,
+                'preference': -1000,
+            })
+        return formats
+
     def _extract_video_info(self, video_data):
         video_id = compat_str(video_data['id'])
 
@@ -49,41 +92,7 @@ class LivestreamIE(InfoExtractor):
 
         smil_url = video_data.get('smil_url')
         if smil_url:
-            _SWITCH_XPATH = (
-                './/{http://www.w3.org/2001/SMIL20/Language}body/'
-                '{http://www.w3.org/2001/SMIL20/Language}switch')
-            smil_doc = self._download_xml(
-                smil_url, video_id, note='Downloading SMIL information')
-
-            title_node = find_xpath_attr(
-                smil_doc, './/{http://www.w3.org/2001/SMIL20/Language}meta',
-                'name', 'title')
-            if title_node is None:
-                self.report_warning('Cannot find SMIL id')
-                switch_node = smil_doc.find(_SWITCH_XPATH)
-            else:
-                title_id = title_node.attrib['content']
-                switch_node = find_xpath_attr(
-                    smil_doc, _SWITCH_XPATH, 'id', title_id)
-            if switch_node is None:
-                raise ExtractorError('Cannot find switch node')
-            video_nodes = switch_node.findall(
-                '{http://www.w3.org/2001/SMIL20/Language}video')
-
-            for vn in video_nodes:
-                tbr = int_or_none(vn.attrib.get('system-bitrate'))
-                furl = (
-                    'http://livestream-f.akamaihd.net/%s?v=3.0.3&fp=WIN%%2014,0,0,145' %
-                    (vn.attrib['src']))
-                if 'clipBegin' in vn.attrib:
-                    furl += '&ssek=' + vn.attrib['clipBegin']
-                formats.append({
-                    'url': furl,
-                    'format_id': 'smil_%d' % tbr,
-                    'ext': 'flv',
-                    'tbr': tbr,
-                    'preference': -1000,
-                })
+            formats.extend(self._parse_smil(video_id, smil_url))
         self._sort_formats(formats)
 
         return {
@@ -102,17 +111,28 @@ class LivestreamIE(InfoExtractor):
         event_name = mobj.group('event_name')
         webpage = self._download_webpage(url, video_id or event_name)
 
-        if video_id is None:
-            # This is an event page:
+        og_video = self._og_search_video_url(webpage, 'player url', fatal=False, default=None)
+        if og_video is None:
             config_json = self._search_regex(
                 r'window.config = ({.*?});', webpage, 'window config')
             info = json.loads(config_json)['event']
+
+            def is_relevant(vdata, vid):
+                result = vdata['type'] == 'video'
+                if video_id is not None:
+                    result = result and compat_str(vdata['data']['id']) == vid
+                return result
+
             videos = [self._extract_video_info(video_data['data'])
-                for video_data in info['feed']['data']
-                if video_data['type'] == 'video']
-            return self.playlist_result(videos, info['id'], info['full_name'])
+                      for video_data in info['feed']['data']
+                      if is_relevant(video_data, video_id)]
+            if video_id is None:
+                # This is an event page:
+                return self.playlist_result(videos, info['id'], info['full_name'])
+            else:
+                if videos:
+                    return videos[0]
         else:
-            og_video = self._og_search_video_url(webpage, 'player url')
             query_str = compat_urllib_parse_urlparse(og_video).query
             query = compat_urlparse.parse_qs(query_str)
             api_url = query['play_url'][0].replace('.smil', '')