projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[prosiebensat1] Fix playlist support (Closes #10745)
[youtube-dl]
/
youtube_dl
/
extractor
/
periscope.py
diff --git
a/youtube_dl/extractor/periscope.py
b/youtube_dl/extractor/periscope.py
index 6c640089d4288e8d0136f23c534b109e17bf40b2..e8b2f11c6b2e0bd7842ef4c026e2dbb3cd76bcbf 100644
(file)
--- a/
youtube_dl/extractor/periscope.py
+++ b/
youtube_dl/extractor/periscope.py
@@
-1,6
+1,8
@@
# coding: utf-8
from __future__ import unicode_literals
# coding: utf-8
from __future__ import unicode_literals
+import re
+
from .common import InfoExtractor
from ..utils import (
parse_iso8601,
from .common import InfoExtractor
from ..utils import (
parse_iso8601,
@@
-41,6
+43,13
@@
class PeriscopeIE(PeriscopeBaseIE):
'only_matching': True,
}]
'only_matching': True,
}]
+ @staticmethod
+ def _extract_url(webpage):
+ mobj = re.search(
+ r'<iframe[^>]+src=([\'"])(?P<url>(?:https?:)?//(?:www\.)?periscope\.tv/(?:(?!\1).)+)\1', webpage)
+ if mobj:
+ return mobj.group('url')
+
def _real_extract(self, url):
token = self._match_id(url)
def _real_extract(self, url):
token = self._match_id(url)
@@
-94,7
+103,7
@@
class PeriscopeIE(PeriscopeBaseIE):
class PeriscopeUserIE(PeriscopeBaseIE):
class PeriscopeUserIE(PeriscopeBaseIE):
- _VALID_URL = r'https?://
www\.
periscope\.tv/(?P<id>[^/]+)/?$'
+ _VALID_URL = r'https?://
(?:www\.)?
periscope\.tv/(?P<id>[^/]+)/?$'
IE_DESC = 'Periscope user videos'
IE_NAME = 'periscope:user'
IE_DESC = 'Periscope user videos'
IE_NAME = 'periscope:user'