X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fperiscope.py;h=63cc764bb8eceed80893606e640466b355279a0d;hb=b2ca35ddbcd29b737075c6e2b270c925da2d306d;hp=5219e1a7559c26ad2c4251e5143807a024d1cf83;hpb=3550821fb4ca2f0e47542a7fa16b6543b06df724;p=youtube-dl

diff --git a/youtube_dl/extractor/periscope.py b/youtube_dl/extractor/periscope.py
index 5219e1a75..63cc764bb 100644
--- a/youtube_dl/extractor/periscope.py
+++ b/youtube_dl/extractor/periscope.py
@@ -2,15 +2,14 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
-from ..utils import (
-    parse_iso8601,
-    unescapeHTML,
-)
+from ..utils import parse_iso8601
 
 
 class PeriscopeIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?periscope\.tv/w/(?P<id>[^/?#]+)'
-    _TEST = {
+    IE_DESC = 'Periscope'
+    _VALID_URL = r'https?://(?:www\.)?periscope\.tv/[^/]+/(?P<id>[^/?#]+)'
+    # Alive example URLs can be found here http://onperiscope.com/
+    _TESTS = [{
         'url': 'https://www.periscope.tv/w/aJUQnjY3MjA3ODF8NTYxMDIyMDl2zCg2pECBgwTqRpQuQD352EMPTKQjT4uqlM3cgWFA-g==',
         'md5': '65b57957972e503fcbbaeed8f4fa04ca',
         'info_dict': {
@@ -23,23 +22,23 @@ class PeriscopeIE(InfoExtractor):
             'uploader_id': '1465763',
         },
         'skip': 'Expires in 24 hours',
-    }
+    }, {
+        'url': 'https://www.periscope.tv/w/1ZkKzPbMVggJv',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.periscope.tv/bastaakanoggano/1OdKrlkZZjOJX',
+        'only_matching': True,
+    }]
 
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        replay = self._download_json(
-            'https://api.periscope.tv/api/v2/getAccessPublic?token=%s' % video_id, video_id)
-
-        video_url = replay['replay_url']
-
-        webpage = self._download_webpage(url, video_id)
+    def _call_api(self, method, value):
+        attribute = 'token' if len(value) > 13 else 'broadcast_id'
+        return self._download_json(
+            'https://api.periscope.tv/api/v2/%s?%s=%s' % (method, attribute, value), value)
 
-        broadcast_data = self._parse_json(
-            unescapeHTML(self._html_search_meta(
-                'broadcast-data', webpage, 'broadcast data', fatal=True)),
-            video_id)
+    def _real_extract(self, url):
+        token = self._match_id(url)
 
+        broadcast_data = self._call_api('getBroadcastPublic', token)
         broadcast = broadcast_data['broadcast']
         status = broadcast['status']
 
@@ -47,20 +46,37 @@ class PeriscopeIE(InfoExtractor):
         uploader_id = broadcast.get('user_id') or broadcast_data.get('user', {}).get('id')
 
         title = '%s - %s' % (uploader, status) if uploader else status
+        state = broadcast.get('state').lower()
+        if state == 'running':
+            title = self._live_title(title)
         timestamp = parse_iso8601(broadcast.get('created_at'))
 
         thumbnails = [{
             'url': broadcast[image],
         } for image in ('image_url', 'image_url_small') if broadcast.get(image)]
 
+        stream = self._call_api('getAccessPublic', token)
+
+        formats = []
+        for format_id in ('replay', 'rtmp', 'hls', 'https_hls'):
+            video_url = stream.get(format_id + '_url')
+            if not video_url:
+                continue
+            f = {
+                'url': video_url,
+                'ext': 'flv' if format_id == 'rtmp' else 'mp4',
+            }
+            if format_id != 'rtmp':
+                f['protocol'] = 'm3u8_native' if state == 'ended' else 'm3u8'
+            formats.append(f)
+        self._sort_formats(formats)
+
         return {
-            'id': broadcast.get('id') or video_id,
-            'url': video_url,
-            'ext': 'mp4',
-            'protocol': 'm3u8_native',
+            'id': broadcast.get('id') or token,
             'title': title,
             'timestamp': timestamp,
             'uploader': uploader,
             'uploader_id': uploader_id,
             'thumbnails': thumbnails,
+            'formats': formats,
         }