ansol/youtube-dl
7
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-20 12:04:03 +00:00
Code Issues Projects Releases Wiki Activity

[miomio] Enhance error checking and replace dead test case

Browse Source
This commit is contained in:
Yen Chi Hsuan 2015-04-14 15:27:56 +08:00
parent 01c58f8473
commit 8da1bb0418
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
youtube_dl/extractor/miomio.py
View File

@ -7,6 +7,7 @@ from .common import InfoExtractor
from ..utils import ( from ..utils import (
xpath_text, xpath_text,
int_or_none, int_or_none,
ExtractorError,
) )
@ -14,13 +15,14 @@ class MioMioIE(InfoExtractor):
IE_NAME = 'miomio.tv' IE_NAME = 'miomio.tv'
_VALID_URL = r'https?://(?:www\.)?miomio\.tv/watch/cc(?P<id>[0-9]+)' _VALID_URL = r'https?://(?:www\.)?miomio\.tv/watch/cc(?P<id>[0-9]+)'
_TESTS = [{ _TESTS = [{
'url': 'http://www.miomio.tv/watch/cc179734/', # "type=video" in flashvars
'md5': '48de02137d0739c15b440a224ad364b9', 'url': 'http://www.miomio.tv/watch/cc88912/',
'md5': '317a5f7f6b544ce8419b784ca8edae65',
'info_dict': { 'info_dict': {
'id': '179734', 'id': '88912',
'ext': 'flv', 'ext': 'flv',
'title': '手绘动漫鬼泣但丁全程画法', 'title': '【SKY】字幕 铠武昭和VS平成 假面骑士大战FEAT战队 魔星字幕组 字幕',
'duration': 354, 'duration': 5923,
}, },
}, { }, {
'url': 'http://www.miomio.tv/watch/cc184024/', 'url': 'http://www.miomio.tv/watch/cc184024/',
@ -42,7 +44,7 @@ class MioMioIE(InfoExtractor):
r'src="(/mioplayer/[^"]+)"', webpage, 'ref_path') r'src="(/mioplayer/[^"]+)"', webpage, 'ref_path')
xml_config = self._search_regex( xml_config = self._search_regex(
r'flashvars="type=sina&amp;(.+?)&amp;', r'flashvars="type=(?:sina|video)&amp;(.+?)&amp;',
webpage, 'xml config') webpage, 'xml config')
# skipping the following page causes lags and eventually connection drop-outs # skipping the following page causes lags and eventually connection drop-outs
@ -59,6 +61,9 @@ class MioMioIE(InfoExtractor):
'Referer': 'http://www.miomio.tv%s' % mioplayer_path, 'Referer': 'http://www.miomio.tv%s' % mioplayer_path,
} }
if not int_or_none(xpath_text(vid_config, 'timelength')):
raise ExtractorError('Unable to load videos!', expected=True)
entries = [] entries = []
for f in vid_config.findall('./durl'): for f in vid_config.findall('./durl'):
segment_url = xpath_text(f, 'url', 'video url') segment_url = xpath_text(f, 'url', 'video url')