R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[mwave] added support for URL language flags

Browse Source
This commit is contained in:
Matthias Heinz 2016-09-24 17:32:54 -04:00
parent 27e99078d3
commit b896e886b9
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
youtube_dl/extractor/mwave.py
View File

@ -9,7 +9,7 @@ from ..utils import (
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/(([a-z][a-z]\/)?)mnettv/videodetail\.m\?searchVideoDetailVO\.clip_id=(?P<id>[0-9]+)'
_URL_TEMPLATE = 'http://mwave.interest.me/mnettv/videodetail.m?searchVideoDetailVO.clip_id=%s'
_TEST = {
'url': 'http://mwave.interest.me/mnettv/videodetail.m?searchVideoDetailVO.clip_id=168859',
@ -28,6 +28,14 @@ class MwaveIE(InfoExtractor):
def _real_extract(self, url):
video_id = self._match_id(url)
# Check that language (if given) is valid
languages = ['en/', 'jp/', 'cn/', 'tw/', 'kr/', 'es/']
start = url.index('mwave.interest.me/') + len('mwave.interest.me/')
end = url.index('mnettv/', start)
if url[start:end] and not url[start:end] in languages:
raise Exception('[mwave] invalid language detected: {}'.format(url[start:end]))
vod_info = self._download_json(
'http://mwave.interest.me/onair/vod_info.m?vodtype=CL&sectorid=&endinfo=Y&id=%s' % video_id,
video_id, 'Download vod JSON')
@ -60,7 +68,7 @@ class MwaveIE(InfoExtractor):
class MwaveMeetGreetIE(InfoExtractor):
_VALID_URL = r'https?://mwave\.interest\.me/meetgreet/view/(?P<id>\d+)'
_VALID_URL = r'https?://mwave\.interest\.me/(([a-z][a-z]\/)?)meetgreet/view/(?P<id>\d+)'
_TEST = {
'url': 'http://mwave.interest.me/meetgreet/view/256',
'info_dict': {
@ -76,6 +84,14 @@ class MwaveMeetGreetIE(InfoExtractor):
def _real_extract(self, url):
video_id = self._match_id(url)
# Check that language (if given) is valid
languages = ['en/', 'jp/', 'cn/', 'tw/', 'kr/', 'es/']
start = url.index('mwave.interest.me/') + len('mwave.interest.me/')
end = url.index('meetgreet/', start)
if url[start:end] and not url[start:end] in languages:
raise Exception('[mwave] invalid language detected: {}'.format(url[start:end]))
webpage = self._download_webpage(url, video_id)
clip_id = self._html_search_regex(
r'<iframe[^>]+src="/mnettv/ifr_clip\.m\?searchVideoDetailVO\.clip_id=(\d+)',