projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Fix extraction (closes #20758, closes #20759, closes #20761, closes #20762...
[youtube-dl]
/
youtube_dl
/
extractor
/
wimp.py
diff --git
a/youtube_dl/extractor/wimp.py
b/youtube_dl/extractor/wimp.py
index 54eb5142793827f8b733592d22b979d326593bee..ea234e3c5088f7c7c99e049ab95f1e69542dd38f 100644
(file)
--- a/
youtube_dl/extractor/wimp.py
+++ b/
youtube_dl/extractor/wimp.py
@@
-1,10
+1,10
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
+from .common import InfoExtractor
from .youtube import YoutubeIE
from .youtube import YoutubeIE
-from .jwplatform import JWPlatformBaseIE
-class WimpIE(
JWPlatformBaseIE
):
+class WimpIE(
InfoExtractor
):
_VALID_URL = r'https?://(?:www\.)?wimp\.com/(?P<id>[^/]+)'
_TESTS = [{
'url': 'http://www.wimp.com/maru-is-exhausted/',
_VALID_URL = r'https?://(?:www\.)?wimp\.com/(?P<id>[^/]+)'
_TESTS = [{
'url': 'http://www.wimp.com/maru-is-exhausted/',
@@
-36,14
+36,11
@@
class WimpIE(JWPlatformBaseIE):
webpage = self._download_webpage(url, video_id)
youtube_id = self._search_regex(
webpage = self._download_webpage(url, video_id)
youtube_id = self._search_regex(
- r"videoId\s*:\s*[\"']([0-9A-Za-z_-]{11})[\"']",
+ (r"videoId\s*:\s*[\"']([0-9A-Za-z_-]{11})[\"']",
+ r'data-id=["\']([0-9A-Za-z_-]{11})'),
webpage, 'video URL', default=None)
if youtube_id:
webpage, 'video URL', default=None)
if youtube_id:
- return {
- '_type': 'url',
- 'url': youtube_id,
- 'ie_key': YoutubeIE.ie_key(),
- }
+ return self.url_result(youtube_id, YoutubeIE.ie_key())
info_dict = self._extract_jwplayer_data(
webpage, video_id, require_title=False)
info_dict = self._extract_jwplayer_data(
webpage, video_id, require_title=False)