aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-03-25 03:26:29 +0600
committerSergey M․ <dstftw@gmail.com>2016-03-25 03:26:29 +0600
commit98e68806fb8cfe2a81ee8a6ac6705bb3d61ed2d1 (patch)
tree50c22656ee7c7e99753f60e030cb18c7157c0d7c
parente0317686666f9de4a6eca3fc26ede32e664f2bec (diff)
[mnet] Improve (Closes #8958)
-rw-r--r--youtube_dl/extractor/mnet.py85
1 files changed, 45 insertions, 40 deletions
diff --git a/youtube_dl/extractor/mnet.py b/youtube_dl/extractor/mnet.py
index 8e83b1fc3..e3f42e7bd 100644
--- a/youtube_dl/extractor/mnet.py
+++ b/youtube_dl/extractor/mnet.py
@@ -11,66 +11,71 @@ from ..utils import (
class MnetIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?mnet\.(?:com|interest\.me)/tv/vod/(?:.*?\bclip_id=)?(?P<id>[0-9]+)'
- _TESTS = [
- {
- 'url': 'http://www.mnet.com/tv/vod/171008',
- 'md5': '6abd7a837fa9fe56d22709a60b19bffb',
- 'info_dict': {
- 'id': '171008',
- 'title': 'SS_이해인@히든박스',
- 'description': 'md5:b9efa592c3918b615ba69fe9f8a05c55',
- 'duration': 88,
- 'upload_date': '20151231',
- 'timestamp': 1451564040,
- 'age_limit': 0,
- 'thumbnails': 'mincount:5',
- 'ext': 'flv',
- },
- },
- {
- 'url': 'http://mnet.interest.me/tv/vod/172790',
- 'only_matching': True,
+ _TESTS = [{
+ 'url': 'http://www.mnet.com/tv/vod/171008',
+ 'info_dict': {
+ 'id': '171008',
+ 'title': 'SS_이해인@히든박스',
+ 'description': 'md5:b9efa592c3918b615ba69fe9f8a05c55',
+ 'duration': 88,
+ 'upload_date': '20151231',
+ 'timestamp': 1451564040,
+ 'age_limit': 0,
+ 'thumbnails': 'mincount:5',
+ 'thumbnail': 're:^https?://.*\.jpg$',
+ 'ext': 'flv',
},
- {
- 'url': 'http://www.mnet.com/tv/vod/vod_view.asp?clip_id=172790&tabMenu=',
- 'only_matching': True,
+ 'params': {
+ # rtmp download
+ 'skip_download': True,
},
- ]
+ }, {
+ 'url': 'http://mnet.interest.me/tv/vod/172790',
+ 'only_matching': True,
+ }, {
+ 'url': 'http://www.mnet.com/tv/vod/vod_view.asp?clip_id=172790&tabMenu=',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
video_id = self._match_id(url)
- info_url = 'http://content.api.mnet.com/player/vodConfig?id=%s' % video_id
- info = self._download_json(info_url, video_id)
- info = info['data']['info']
+
+ info = self._download_json(
+ 'http://content.api.mnet.com/player/vodConfig?id=%s&ctype=CLIP' % video_id,
+ video_id, 'Downloading vod config JSON')['data']['info']
title = info['title']
- rtmp_info_url = info['cdn'] + 'CLIP'
- rtmp_info = self._download_json(rtmp_info_url, video_id)
- file_url = rtmp_info['serverurl'] + rtmp_info['fileurl']
+
+ rtmp_info = self._download_json(
+ info['cdn'], video_id, 'Downloading vod cdn JSON')
+
+ formats = [{
+ 'url': rtmp_info['serverurl'] + rtmp_info['fileurl'],
+ 'ext': 'flv',
+ 'page_url': url,
+ 'player_url': 'http://flvfile.mnet.com/service/player/201602/cjem_player_tv.swf?v=201602191318',
+ }]
+
description = info.get('ment')
duration = parse_duration(info.get('time'))
timestamp = parse_iso8601(info.get('date'), delimiter=' ')
age_limit = info.get('adult')
if age_limit is not None:
age_limit = 0 if age_limit == 'N' else 18
- thumbnails = [
- {
- 'id': thumb_format,
- 'url': thumb['url'],
- 'width': int_or_none(thumb.get('width')),
- 'height': int_or_none(thumb.get('height')),
- }
- for (thumb_format, thumb) in info.get('cover', {}).items()
- ]
+ thumbnails = [{
+ 'id': thumb_format,
+ 'url': thumb['url'],
+ 'width': int_or_none(thumb.get('width')),
+ 'height': int_or_none(thumb.get('height')),
+ } for thumb_format, thumb in info.get('cover', {}).items() if thumb.get('url')]
return {
'id': video_id,
'title': title,
- 'url': file_url,
'description': description,
'duration': duration,
'timestamp': timestamp,
'age_limit': age_limit,
'thumbnails': thumbnails,
- 'ext': 'flv',
+ 'formats': formats,
}