projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube:live] Extend _VALID_URL (Closes #10839)
[youtube-dl]
/
youtube_dl
/
extractor
/
makertv.py
diff --git
a/youtube_dl/extractor/makertv.py
b/youtube_dl/extractor/makertv.py
index 0256e4e243f660cfb97fa50ee87a3716d911b5ef..3c34d4604f20699d99937b29a11aad7f8f4116a4 100644
(file)
--- a/
youtube_dl/extractor/makertv.py
+++ b/
youtube_dl/extractor/makertv.py
@@
-5,12
+5,12
@@
from .common import InfoExtractor
class MakerTVIE(InfoExtractor):
class MakerTVIE(InfoExtractor):
- _VALID_URL = r'https?://(?:(?:www\.)?maker\.tv/(?:[^/]+/)
?video|http://
makerplayer.com/embed/maker)/(?P<id>[a-zA-Z0-9]{12})'
+ _VALID_URL = r'https?://(?:(?:www\.)?maker\.tv/(?:[^/]+/)
*video|
makerplayer.com/embed/maker)/(?P<id>[a-zA-Z0-9]{12})'
_TEST = {
'url': 'http://www.maker.tv/video/Fh3QgymL9gsc',
'md5': 'ca237a53a8eb20b6dc5bd60564d4ab3e',
'info_dict': {
_TEST = {
'url': 'http://www.maker.tv/video/Fh3QgymL9gsc',
'md5': 'ca237a53a8eb20b6dc5bd60564d4ab3e',
'info_dict': {
- 'id': '
brOEcGut
',
+ 'id': '
Fh3QgymL9gsc
',
'ext': 'mp4',
'title': 'Maze Runner: The Scorch Trials Official Movie Review',
'description': 'md5:11ff3362d7ef1d679fdb649f6413975a',
'ext': 'mp4',
'title': 'Maze Runner: The Scorch Trials Official Movie Review',
'description': 'md5:11ff3362d7ef1d679fdb649f6413975a',
@@
-22,6
+22,11
@@
class MakerTVIE(InfoExtractor):
def _real_extract(self, url):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
def _real_extract(self, url):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
- jwplatform_id = self._search_regex(
[r'jwid="([^"]+)"', r'Maker.jw_id\s*=\s*"([^"]+)";']
, webpage, 'jwplatform id')
+ jwplatform_id = self._search_regex(
r'jw_?id="([^"]+)"'
, webpage, 'jwplatform id')
- return self.url_result('jwplatform:%s' % jwplatform_id, 'JWPlatform')
+ return {
+ '_type': 'url_transparent',
+ 'id': video_id,
+ 'url': 'jwplatform:%s' % jwplatform_id,
+ 'ie_key': 'JWPlatform',
+ }