projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ddde919
)
[mwave] Relax _VALID_URLs (Closes #10735, closes #10748)
author
Sergey M․
<dstftw@gmail.com>
Sat, 24 Sep 2016 23:14:32 +0000
(06:14 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 24 Sep 2016 23:14:32 +0000
(06:14 +0700)
youtube_dl/extractor/mwave.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/mwave.py
b/youtube_dl/extractor/mwave.py
index a103e0323a6c62e4b0d283afdb6d4f5662bb1869..fea1caf478b2a862ae3a028b4a80041b734a5e1b 100644
(file)
--- a/
youtube_dl/extractor/mwave.py
+++ b/
youtube_dl/extractor/mwave.py
@@
-9,9
+9,9
@@
from ..utils import (
class MwaveIE(InfoExtractor):
class MwaveIE(InfoExtractor):
- _VALID_URL = r'https?://mwave\.interest\.me/mnettv/videodetail\.m\?searchVideoDetailVO\.clip_id=(?P<id>[0-9]+)'
+ _VALID_URL = r'https?://mwave\.interest\.me/
(?:[^/]+/)?
mnettv/videodetail\.m\?searchVideoDetailVO\.clip_id=(?P<id>[0-9]+)'
_URL_TEMPLATE = 'http://mwave.interest.me/mnettv/videodetail.m?searchVideoDetailVO.clip_id=%s'
_URL_TEMPLATE = 'http://mwave.interest.me/mnettv/videodetail.m?searchVideoDetailVO.clip_id=%s'
- _TEST
=
{
+ _TEST
S = [
{
'url': 'http://mwave.interest.me/mnettv/videodetail.m?searchVideoDetailVO.clip_id=168859',
# md5 is unstable
'info_dict': {
'url': 'http://mwave.interest.me/mnettv/videodetail.m?searchVideoDetailVO.clip_id=168859',
# md5 is unstable
'info_dict': {
@@
-23,7
+23,10
@@
class MwaveIE(InfoExtractor):
'duration': 206,
'view_count': int,
}
'duration': 206,
'view_count': int,
}
- }
+ }, {
+ 'url': 'http://mwave.interest.me/en/mnettv/videodetail.m?searchVideoDetailVO.clip_id=176199',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
video_id = self._match_id(url)
def _real_extract(self, url):
video_id = self._match_id(url)
@@
-60,8
+63,8
@@
class MwaveIE(InfoExtractor):
class MwaveMeetGreetIE(InfoExtractor):
class MwaveMeetGreetIE(InfoExtractor):
- _VALID_URL = r'https?://mwave\.interest\.me/meetgreet/view/(?P<id>\d+)'
- _TEST
=
{
+ _VALID_URL = r'https?://mwave\.interest\.me/
(?:[^/]+/)?
meetgreet/view/(?P<id>\d+)'
+ _TEST
S = [
{
'url': 'http://mwave.interest.me/meetgreet/view/256',
'info_dict': {
'id': '173294',
'url': 'http://mwave.interest.me/meetgreet/view/256',
'info_dict': {
'id': '173294',
@@
-72,7
+75,10
@@
class MwaveMeetGreetIE(InfoExtractor):
'duration': 3634,
'view_count': int,
}
'duration': 3634,
'view_count': int,
}
- }
+ }, {
+ 'url': 'http://mwave.interest.me/en/meetgreet/view/256',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
video_id = self._match_id(url)
def _real_extract(self, url):
video_id = self._match_id(url)