w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[vshare] Capture and output error message

Browse source
This commit is contained in:
Sergey M․ 2017-11-14 22:39:54 +07:00
parent 0987f2ddb2
commit ff31f2d5c3
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
youtube_dl/extractor/vshare.py
View file

@ -5,7 +5,10 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_chr from ..compat import compat_chr
from ..utils import decode_packed_codes from ..utils import (
decode_packed_codes,
ExtractorError,
)
class VShareIE(InfoExtractor): class VShareIE(InfoExtractor):
@ -42,6 +45,12 @@ class VShareIE(InfoExtractor):
title = self._html_search_regex(r'<title>([^<]+)</title>', webpage, 'title') title = self._html_search_regex(r'<title>([^<]+)</title>', webpage, 'title')
title = title.split(' - ')[0] title = title.split(' - ')[0]
error = self._html_search_regex(
r'(?s)<div[^>]+\bclass=["\']xxx-error[^>]+>(.+?)</div', webpage,
'error', default=None)
if error:
raise ExtractorError(error, expected=True)
unpacked = self._extract_packed(webpage) unpacked = self._extract_packed(webpage)
video_urls = re.findall(r'<source src="([^"]+)', unpacked) video_urls = re.findall(r'<source src="([^"]+)', unpacked)
formats = [{'url': video_url} for video_url in video_urls] formats = [{'url': video_url} for video_url in video_urls]