diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2017-07-11 15:35:19 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2017-07-11 15:35:19 +0800 |
| commit | 7f176ac4775aed5e5a72d2f0c4b579d1b886d419 (patch) | |
| tree | 0720bfb657b5b8a2d78a53a34d2a80ec9c20a196 | |
| parent | 2edfd745df4b7a764d7456e7536e47ef140de24d (diff) | |
| download | youtube-dl-7f176ac4775aed5e5a72d2f0c4b579d1b886d419.tar.gz youtube-dl-7f176ac4775aed5e5a72d2f0c4b579d1b886d419.tar.xz youtube-dl-7f176ac4775aed5e5a72d2f0c4b579d1b886d419.zip | |
[periscope] Support pscp.tv URLs in embedded frames
And fix a relevant twitter test
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | youtube_dl/extractor/periscope.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/twitter.py | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index db1776dce..ffb4b6994 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ version <unreleased> Extractors ++ [periscope] Support pscp.tv URLs in embedded frames * [niconico] Fix authentication error handling (#12486) * [giantbomb] Extract m3u8 formats (#13626) diff --git a/youtube_dl/extractor/periscope.py b/youtube_dl/extractor/periscope.py index 1add6b840..bfa12edc9 100644 --- a/youtube_dl/extractor/periscope.py +++ b/youtube_dl/extractor/periscope.py @@ -49,7 +49,7 @@ class PeriscopeIE(PeriscopeBaseIE): @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') diff --git a/youtube_dl/extractor/twitter.py b/youtube_dl/extractor/twitter.py index 2041b4199..e4bc7e012 100644 --- a/youtube_dl/extractor/twitter.py +++ b/youtube_dl/extractor/twitter.py @@ -335,10 +335,11 @@ class TwitterIE(InfoExtractor): 'info_dict': { 'id': '1zqKVVlkqLaKB', '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', 'uploader_id': 'OPP_HSD', - 'uploader': 'Sgt Kerry Schmidt - Ontario Provincial Police', + 'uploader': 'Sgt Kerry Schmidt', 'timestamp': 1474613214, }, 'add_ie': ['Periscope'], |