mirror of
https://github.com/blackjack4494/yt-dlc.git
synced 2024-12-23 00:07:49 +00:00
Merge branch 'pmrowla-mwave-meetgreet'
This commit is contained in:
commit
eb5ad31ce1
2 changed files with 27 additions and 1 deletions
|
@ -438,7 +438,7 @@ from .mtv import (
|
|||
)
|
||||
from .muenchentv import MuenchenTVIE
|
||||
from .musicplayon import MusicPlayOnIE
|
||||
from .mwave import MwaveIE
|
||||
from .mwave import MwaveIE, MwaveMeetGreetIE
|
||||
from .myspace import MySpaceIE, MySpaceAlbumIE
|
||||
from .myspass import MySpassIE
|
||||
from .myvi import MyviIE
|
||||
|
|
|
@ -10,6 +10,7 @@ from ..utils import (
|
|||
|
||||
class MwaveIE(InfoExtractor):
|
||||
_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'
|
||||
_TEST = {
|
||||
'url': 'http://mwave.interest.me/mnettv/videodetail.m?searchVideoDetailVO.clip_id=168859',
|
||||
# md5 is unstable
|
||||
|
@ -56,3 +57,28 @@ class MwaveIE(InfoExtractor):
|
|||
'view_count': int_or_none(vod_info.get('hit')),
|
||||
'formats': formats,
|
||||
}
|
||||
|
||||
|
||||
class MwaveMeetGreetIE(InfoExtractor):
|
||||
_VALID_URL = r'https?://mwave\.interest\.me/meetgreet/view/(?P<id>\d+)'
|
||||
_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=(\d+)',
|
||||
webpage, 'clip ID')
|
||||
clip_url = MwaveIE._URL_TEMPLATE % clip_id
|
||||
return self.url_result(clip_url, 'Mwave', clip_id)
|
||||
|
|
Loading…
Reference in a new issue