aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/makertv.py
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-12-21 04:24:58 +0100
committerremitamine <remitamine@gmail.com>2015-12-21 04:24:58 +0100
commit7cb09524749d4a061acc801d0a2d6ad08463e549 (patch)
treeab769aa8a8d1cce53103e848334bb79137f3d0b3 /youtube_dl/extractor/makertv.py
parent78653a33aa00ba5205940c2baac5d9f019795b88 (diff)
[makertv] improve extraction
Diffstat (limited to 'youtube_dl/extractor/makertv.py')
-rw-r--r--youtube_dl/extractor/makertv.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/youtube_dl/extractor/makertv.py b/youtube_dl/extractor/makertv.py
index 0256e4e24..3c34d4604 100644
--- a/youtube_dl/extractor/makertv.py
+++ b/youtube_dl/extractor/makertv.py
@@ -5,12 +5,12 @@ from .common import 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': {
- 'id': 'brOEcGut',
+ 'id': 'Fh3QgymL9gsc',
'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)
- 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',
+ }