]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[vlive] Fixes for review
authorping <lipng.ong@gmail.com>
Mon, 31 Aug 2015 04:46:28 +0000 (12:46 +0800)
committerping <lipng.ong@gmail.com>
Mon, 31 Aug 2015 04:46:28 +0000 (12:46 +0800)
youtube_dl/extractor/vlive.py

index 6a403cc649e5071c70f8940e90a4c44b5ae08a09..17ae3b96475a724a6f1fb23f92edeb40c32f85f1 100644 (file)
@@ -39,7 +39,7 @@ class VLiveIE(InfoExtractor):
         title = self._og_search_title(webpage)
         thumbnail = self._og_search_thumbnail(webpage)
         creator = self._html_search_regex(
-            r'<span class="name">([^<>]+)</span>', webpage, 'creator')
+            r'<span[^>]+class="name">([^<>]+)</span>', webpage, 'creator')
         
         url = 'http://global.apis.naver.com/globalV/globalV/vod/%s/playinfo?' % video_id
         msgpad = '%.0f' % (time() * 1000)
@@ -51,7 +51,7 @@ class VLiveIE(InfoExtractor):
         playinfo = self._download_json(url, video_id, 'Downloading video json')
 
         if playinfo.get('message', '') != 'success':
-            raise ExtractorError(playinfo['message'])
+            raise ExtractorError(playinfo.get('message', 'JSON request unsuccessful'))
 
         if not playinfo.get('result'):
             raise ExtractorError('No videos found.')