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

Combine ExtractorError calls

Browse Source
This commit is contained in:
mars67857 2017-10-15 17:53:14 -07:00
parent 8e4f219648
commit f70b37ef4f
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
youtube_dl/extractor/cammodels.py
View File

@ -6,7 +6,6 @@ import re
from ..utils import int_or_none from ..utils import int_or_none
class CamModelsIE(InfoExtractor): class CamModelsIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?cammodels\.com/cam/(?P<id>\w+)' _VALID_URL = r'https?://(?:www\.)?cammodels\.com/cam/(?P<id>\w+)'
_HEADERS = { _HEADERS = {
@ -33,26 +32,20 @@ class CamModelsIE(InfoExtractor):
'offline indicator', 'offline indicator',
None, None,
False) False)
if offline:
raise ExtractorError(
'This user is currently offline, so nothing can be downloaded.',
expected=True,
video_id=video_id)
private = self._html_search_regex( private = self._html_search_regex(
r'(?P<id>I’m in a private show right now)', r'(?P<id>I’m in a private show right now)',
webpage, webpage,
'private show indicator', 'private show indicator',
None, None,
False) False)
if private: err = 'This user is currently offline, so nothing can be downloaded.' if offline \
raise ExtractorError( else 'This user is doing a private show, which requires payment. This extractor currently does not support private streams.' if private \
'This user is doing a private show, which requires payment. This extractor currently does not support private streams.', else 'Unable to find link to stream info on webpage. Room is not offline, so something else is wrong.'
expected=True,
video_id=video_id)
raise ExtractorError( raise ExtractorError(
'Unable to find link to stream info on webpage. Room is not offline, so something else is wrong.', err,
expected=False, expected=True if offline or private else False,
video_id=video_id) video_id=video_id
)
manifest_url = manifest_url_root + video_id + '.json' manifest_url = manifest_url_root + video_id + '.json'
manifest = self._download_json( manifest = self._download_json(
manifest_url, manifest_url,