Update upstream source from tag 'upstream/2019.06.08'

[youtubedl] / youtube_dl / extractor / periscope.py

diff --git a/youtube_dl/extractor/periscope.py b/youtube_dl/extractor/periscope.py
index 1add6b84035041176f77f2bf454ca6bbfb8c7137..b337a56c0575c670e9d8ecf5043bde22962098f3 100644 (file)
--- a/youtube_dl/extractor/periscope.py
+++ b/youtube_dl/extractor/periscope.py
@@ -5,6 +5,7 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
 
 from .common import InfoExtractor
 from ..utils import (

+    int_or_none,

     parse_iso8601,
     unescapeHTML,
 )
     parse_iso8601,
     unescapeHTML,
 )


@@ -49,25 +50,23 @@ class PeriscopeIE(PeriscopeBaseIE):
     @staticmethod
     def _extract_url(webpage):
         mobj = re.search(
     @staticmethod
     def _extract_url(webpage):
         mobj = re.search(

-            r'<iframe[^>]+src=([\'"])(?P<url>(?:https?:)?//(?:www\.)?periscope\.tv/(?:(?!\1).)+)\1', webpage)
+            r'<iframe[^>]+src=([\'"])(?P<url>(?:https?:)?//(?:www\.)?(?:periscope|pscp)\.tv/(?:(?!\1).)+)\1', webpage)

         if mobj:
             return mobj.group('url')
 
     def _real_extract(self, url):
         token = self._match_id(url)
 
         if mobj:
             return mobj.group('url')
 
     def _real_extract(self, url):
         token = self._match_id(url)
 

-        broadcast_data = self._call_api(
-            'getBroadcastPublic', {'broadcast_id': token}, token)
-        broadcast = broadcast_data['broadcast']
-        status = broadcast['status']
+        stream = self._call_api(
+            'accessVideoPublic', {'broadcast_id': token}, token)

 
 

-        user = broadcast_data.get('user', {})
+        broadcast = stream['broadcast']
+        title = broadcast['status']

 
 

-        uploader = broadcast.get('user_display_name') or user.get('display_name')
-        uploader_id = (broadcast.get('username') or user.get('username') or
-                       broadcast.get('user_id') or user.get('id'))
+        uploader = broadcast.get('user_display_name') or broadcast.get('username')
+        uploader_id = (broadcast.get('user_id') or broadcast.get('username'))

 
 

-        title = '%s - %s' % (uploader, status) if uploader else status
+        title = '%s - %s' % (uploader, title) if uploader else title

         state = broadcast.get('state').lower()
         if state == 'running':
             title = self._live_title(title)
         state = broadcast.get('state').lower()
         if state == 'running':
             title = self._live_title(title)


@@ -77,21 +76,37 @@ class PeriscopeIE(PeriscopeBaseIE):
             'url': broadcast[image],
         } for image in ('image_url', 'image_url_small') if broadcast.get(image)]
 
             'url': broadcast[image],
         } for image in ('image_url', 'image_url_small') if broadcast.get(image)]
 

-        stream = self._call_api(
-            'getAccessPublic', {'broadcast_id': token}, token)
+        width = int_or_none(broadcast.get('width'))
+        height = int_or_none(broadcast.get('height'))
+
+        def add_width_and_height(f):
+            for key, val in (('width', width), ('height', height)):
+                if not f.get(key):
+                    f[key] = val

 
 

+        video_urls = set()

         formats = []
         formats = []

-        for format_id in ('replay', 'rtmp', 'hls', 'https_hls'):
+        for format_id in ('replay', 'rtmp', 'hls', 'https_hls', 'lhls', 'lhlsweb'):

             video_url = stream.get(format_id + '_url')
             video_url = stream.get(format_id + '_url')

-            if not video_url:
+            if not video_url or video_url in video_urls:

                 continue
                 continue

-            f = {
+            video_urls.add(video_url)
+            if format_id != 'rtmp':
+                m3u8_formats = self._extract_m3u8_formats(
+                    video_url, token, 'mp4',
+                    entry_protocol='m3u8_native'
+                    if state in ('ended', 'timed_out') else 'm3u8',
+                    m3u8_id=format_id, fatal=False)
+                if len(m3u8_formats) == 1:
+                    add_width_and_height(m3u8_formats[0])
+                formats.extend(m3u8_formats)
+                continue
+            rtmp_format = {

                 'url': video_url,
                 'ext': 'flv' if format_id == 'rtmp' else 'mp4',
             }
                 'url': video_url,
                 'ext': 'flv' if format_id == 'rtmp' else 'mp4',
             }

-            if format_id != 'rtmp':
-                f['protocol'] = 'm3u8_native' if state in ('ended', 'timed_out') else 'm3u8'
-            formats.append(f)
+            add_width_and_height(rtmp_format)
+            formats.append(rtmp_format)

         self._sort_formats(formats)
 
         return {
         self._sort_formats(formats)
 
         return {