R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[sohu] Enhance error handling

Browse Source
This commit is contained in:
Yen Chi Hsuan 2015-05-09 13:19:54 +08:00
parent de765f6c31
commit 3dbec410a0
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
youtube_dl/extractor/sohu.py
View File

@ -8,7 +8,10 @@ from ..compat import (
compat_str, compat_str,
compat_urllib_request compat_urllib_request
) )
from ..utils import sanitize_url_path_consecutive_slashes from ..utils import (
sanitize_url_path_consecutive_slashes,
ExtractorError,
)
class SohuIE(InfoExtractor): class SohuIE(InfoExtractor):
@ -117,6 +120,15 @@ class SohuIE(InfoExtractor):
r'var vid ?= ?["\'](\d+)["\']', r'var vid ?= ?["\'](\d+)["\']',
webpage, 'video path') webpage, 'video path')
vid_data = _fetch_data(vid, mytv) vid_data = _fetch_data(vid, mytv)
if vid_data['play'] != 1:
if vid_data.get('status') == 12:
raise ExtractorError(
'Sohu said: There\'s something wrong in the video.',
expected=True)
else:
raise ExtractorError(
'Sohu said: The video is only licensed to users in Mainland China.',
expected=True)
formats_json = {} formats_json = {}
for format_id in ('nor', 'high', 'super', 'ori', 'h2644k', 'h2654k'): for format_id in ('nor', 'high', 'super', 'ori', 'h2644k', 'h2654k'):