aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2015-04-14 15:27:56 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2015-04-14 15:27:56 +0800
commit8da1bb04186d4147f89923abc09a9db0fa2a4fec (patch)
tree256e1527551c08c7a2d14b8f325464cc4f66657e /youtube_dl
parent01c58f84738e056733717174d1076ec465c62500 (diff)
[miomio] Enhance error checking and replace dead test case
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/miomio.py17
1 files changed, 11 insertions, 6 deletions
diff --git a/youtube_dl/extractor/miomio.py b/youtube_dl/extractor/miomio.py
index cc3f27194..d41195a96 100644
--- a/youtube_dl/extractor/miomio.py
+++ b/youtube_dl/extractor/miomio.py
@@ -7,6 +7,7 @@ from .common import InfoExtractor
from ..utils import (
xpath_text,
int_or_none,
+ ExtractorError,
)
@@ -14,13 +15,14 @@ class MioMioIE(InfoExtractor):
IE_NAME = 'miomio.tv'
_VALID_URL = r'https?://(?:www\.)?miomio\.tv/watch/cc(?P<id>[0-9]+)'
_TESTS = [{
- 'url': 'http://www.miomio.tv/watch/cc179734/',
- 'md5': '48de02137d0739c15b440a224ad364b9',
+ # "type=video" in flashvars
+ 'url': 'http://www.miomio.tv/watch/cc88912/',
+ 'md5': '317a5f7f6b544ce8419b784ca8edae65',
'info_dict': {
- 'id': '179734',
+ 'id': '88912',
'ext': 'flv',
- 'title': '手绘动漫鬼泣但丁全程画法',
- 'duration': 354,
+ 'title': '【SKY】字幕 铠武昭和VS平成 假面骑士大战FEAT战队 魔星字幕组 字幕',
+ 'duration': 5923,
},
}, {
'url': 'http://www.miomio.tv/watch/cc184024/',
@@ -42,7 +44,7 @@ class MioMioIE(InfoExtractor):
r'src="(/mioplayer/[^"]+)"', webpage, 'ref_path')
xml_config = self._search_regex(
- r'flashvars="type=sina&amp;(.+?)&amp;',
+ r'flashvars="type=(?:sina|video)&amp;(.+?)&amp;',
webpage, 'xml config')
# 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,
}
+ if not int_or_none(xpath_text(vid_config, 'timelength')):
+ raise ExtractorError('Unable to load videos!', expected=True)
+
entries = []
for f in vid_config.findall('./durl'):
segment_url = xpath_text(f, 'url', 'video url')