diff options
Diffstat (limited to 'youtube_dl/extractor/sohu.py')
-rw-r--r-- | youtube_dl/extractor/sohu.py | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/youtube_dl/extractor/sohu.py b/youtube_dl/extractor/sohu.py index bebcafb62..07f514a46 100644 --- a/youtube_dl/extractor/sohu.py +++ b/youtube_dl/extractor/sohu.py @@ -1,4 +1,5 @@ # encoding: utf-8 +from __future__ import unicode_literals import json import re @@ -11,13 +12,14 @@ class SohuIE(InfoExtractor): _VALID_URL = r'https?://(?P<mytv>my\.)?tv\.sohu\.com/.+?/(?(mytv)|n)(?P<id>\d+)\.shtml.*?' _TEST = { - u'url': u'http://tv.sohu.com/20130724/n382479172.shtml#super', - u'file': u'382479172.mp4', - u'md5': u'bde8d9a6ffd82c63a1eefaef4eeefec7', - u'info_dict': { - u'title': u'MV:Far East Movement《The Illest》', + 'url': 'http://tv.sohu.com/20130724/n382479172.shtml#super', + 'md5': 'bde8d9a6ffd82c63a1eefaef4eeefec7', + 'info_dict': { + 'id': '382479172', + 'ext': 'mp4', + 'title': 'MV:Far East Movement《The Illest》', }, - u'skip': u'Only available from China', + 'skip': 'Only available from China', } def _real_extract(self, url): @@ -26,11 +28,11 @@ class SohuIE(InfoExtractor): if mytv: base_data_url = 'http://my.tv.sohu.com/play/videonew.do?vid=' else: - base_data_url = u'http://hot.vrs.sohu.com/vrs_flash.action?vid=' + base_data_url = 'http://hot.vrs.sohu.com/vrs_flash.action?vid=' data_url = base_data_url + str(vid_id) data_json = self._download_webpage( data_url, video_id, - note=u'Downloading JSON data for ' + str(vid_id)) + note='Downloading JSON data for ' + str(vid_id)) return json.loads(data_json) mobj = re.match(self._VALID_URL, url) @@ -39,11 +41,11 @@ class SohuIE(InfoExtractor): webpage = self._download_webpage(url, video_id) raw_title = self._html_search_regex(r'(?s)<title>(.+?)</title>', - webpage, u'video title') + webpage, 'video title') title = raw_title.partition('-')[0].strip() vid = self._html_search_regex(r'var vid ?= ?["\'](\d+)["\']', webpage, - u'video path') + 'video path') data = _fetch_data(vid, mytv) QUALITIES = ('ori', 'super', 'high', 'nor') @@ -51,7 +53,7 @@ class SohuIE(InfoExtractor): for q in QUALITIES if data['data'][q + 'Vid'] != 0] if not vid_ids: - raise ExtractorError(u'No formats available for this video') + raise ExtractorError('No formats available for this video') # For now, we just pick the highest available quality vid_id = vid_ids[-1] @@ -69,7 +71,7 @@ class SohuIE(InfoExtractor): (allot, prot, clipsURL[i], su[i])) part_str = self._download_webpage( part_url, video_id, - note=u'Downloading part %d of %d' % (i+1, part_count)) + note='Downloading part %d of %d' % (i + 1, part_count)) part_info = part_str.split('|') video_url = '%s%s?key=%s' % (part_info[0], su[i], part_info[3]) |