瀏覽代碼

[periscope] Support pscp.tv URLs in embedded frames

And fix a relevant twitter test
Yen Chi Hsuan 8 年之前
父節點
當前提交
7f176ac477
共有 3 個文件被更改,包括 5 次插入3 次删除
  1. 1 0
      ChangeLog
  2. 1 1
      youtube_dl/extractor/periscope.py
  3. 3 2
      youtube_dl/extractor/twitter.py

+ 1 - 0
ChangeLog

@@ -1,6 +1,7 @@
 version <unreleased>
 version <unreleased>
 
 
 Extractors
 Extractors
++ [periscope] Support pscp.tv URLs in embedded frames
 * [niconico] Fix authentication error handling (#12486)
 * [niconico] Fix authentication error handling (#12486)
 * [giantbomb] Extract m3u8 formats (#13626)
 * [giantbomb] Extract m3u8 formats (#13626)
 
 

+ 1 - 1
youtube_dl/extractor/periscope.py

@@ -49,7 +49,7 @@ class PeriscopeIE(PeriscopeBaseIE):
     @staticmethod
     @staticmethod
     def _extract_url(webpage):
     def _extract_url(webpage):
         mobj = re.search(
         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:
         if mobj:
             return mobj.group('url')
             return mobj.group('url')
 
 

+ 3 - 2
youtube_dl/extractor/twitter.py

@@ -335,10 +335,11 @@ class TwitterIE(InfoExtractor):
         'info_dict': {
         'info_dict': {
             'id': '1zqKVVlkqLaKB',
             'id': '1zqKVVlkqLaKB',
             'ext': 'mp4',
             'ext': 'mp4',
-            'title': 'Sgt Kerry Schmidt - Ontario Provincial Police - Road rage, mischief, assault, rollover and fire in one occurrence',
+            'title': 'Sgt Kerry Schmidt - LIVE on #Periscope: Road rage, mischief, assault, rollover and fire in one occurrence',
+            'description': 'Sgt Kerry Schmidt on Twitter: "LIVE on #Periscope: Road rage, mischief, assault, rollover and fire in one occurrence  https://t.co/EKrVgIXF3s"',
             'upload_date': '20160923',
             'upload_date': '20160923',
             'uploader_id': 'OPP_HSD',
             'uploader_id': 'OPP_HSD',
-            'uploader': 'Sgt Kerry Schmidt - Ontario Provincial Police',
+            'uploader': 'Sgt Kerry Schmidt',
             'timestamp': 1474613214,
             'timestamp': 1474613214,
         },
         },
         'add_ie': ['Periscope'],
         'add_ie': ['Periscope'],