[miomio] Enhance error checking and replace dead test case

diff --git a/youtube_dl/extractor/miomio.py b/youtube_dl/extractor/miomio.py
index cc3f2719484d7011e5f88a882af90d95dafe905e..d41195a9647a7cdd329009c5ce448388f0ec8f20 100644 (file)
--- 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': 'æ\89\8bç»\98å\8a¨æ¼«é¬¼æ³£ä½\86ä¸\81å\85¨ç¨\8bç\94»æ³\95',
-            'duration': 354,
+            'title': 'ã\80\90SKYã\80\91å­\97å¹\95 é\93 æ­¦æ\98­å\92\8cVSå¹³æ\88\90 å\81\87é\9d¢éª\91士大æ\88\98FEATæ\88\98é\98\9f é­\94æ\98\9få­\97å¹\95ç»\84 å­\97å¹\95',
+            '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')