mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-11-29 13:42:37 +00:00
Merge branch 'mwave-meetgreet' of https://github.com/pmrowla/youtube-dl into pmrowla-mwave-meetgreet
This commit is contained in:
commit
f8dddaf456
2 changed files with 24 additions and 1 deletions
|
@ -438,7 +438,7 @@ from .mtv import (
|
||||||
)
|
)
|
||||||
from .muenchentv import MuenchenTVIE
|
from .muenchentv import MuenchenTVIE
|
||||||
from .musicplayon import MusicPlayOnIE
|
from .musicplayon import MusicPlayOnIE
|
||||||
from .mwave import MwaveIE
|
from .mwave import MwaveIE, MwaveMeetGreetIE
|
||||||
from .myspace import MySpaceIE, MySpaceAlbumIE
|
from .myspace import MySpaceIE, MySpaceAlbumIE
|
||||||
from .myspass import MySpassIE
|
from .myspass import MySpassIE
|
||||||
from .myvi import MyviIE
|
from .myvi import MyviIE
|
||||||
|
|
|
@ -56,3 +56,26 @@ class MwaveIE(InfoExtractor):
|
||||||
'view_count': int_or_none(vod_info.get('hit')),
|
'view_count': int_or_none(vod_info.get('hit')),
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class MwaveMeetGreetIE(InfoExtractor):
|
||||||
|
_VALID_URL = r'https?://mwave\.interest\.me/meetgreet/view/(?P<id>[0-9]+)'
|
||||||
|
_TEST = {
|
||||||
|
'url': 'http://mwave.interest.me/meetgreet/view/256',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '173294',
|
||||||
|
'ext': 'flv',
|
||||||
|
'title': '[MEET&GREET] Park BoRam',
|
||||||
|
'thumbnail': 're:^https?://.*\.jpg$',
|
||||||
|
'uploader': 'Mwave',
|
||||||
|
'duration': 3634,
|
||||||
|
'view_count': int,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
video_id = self._match_id(url)
|
||||||
|
webpage = self._download_webpage(url, video_id)
|
||||||
|
clip_id = self._html_search_regex(r'<iframe src="/mnettv/ifr_clip\.m\?searchVideoDetailVO\.clip_id=(?P<id>[0-9]+)', webpage, 'clip ID')
|
||||||
|
clip_url = 'http://mwave.interest.me/mnettv/videodetail.m?searchVideoDetailVO.clip_id={0}'.format(clip_id)
|
||||||
|
return self.url_result(clip_url, 'Mwave', clip_id)
|
||||||
|
|
Loading…
Reference in a new issue