From: Sergey M Date: Sun, 5 Oct 2014 18:48:01 +0000 (+0700) Subject: [gorillavid] Add check for non existing videos X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=3ae165aa10e6747173adbcce8da0e2c8d30eed33;p=youtube-dl [gorillavid] Add check for non existing videos --- diff --git a/youtube_dl/extractor/gorillavid.py b/youtube_dl/extractor/gorillavid.py index 0f0012f1f..45cca1d24 100644 --- a/youtube_dl/extractor/gorillavid.py +++ b/youtube_dl/extractor/gorillavid.py @@ -20,6 +20,8 @@ class GorillaVidIE(InfoExtractor): (?:embed-)?(?P[0-9a-zA-Z]+)(?:-[0-9]+x[0-9]+\.html)? ''' + _FILE_NOT_FOUND_REGEX = r'>(?:404 - )?File Not Found<' + _TESTS = [{ 'url': 'http://gorillavid.in/06y9juieqpmi', 'md5': '5ae4a3580620380619678ee4875893ba', @@ -58,6 +60,9 @@ class GorillaVidIE(InfoExtractor): webpage = self._download_webpage('http://%s/%s' % (mobj.group('host'), video_id), video_id) + if re.search(self._FILE_NOT_FOUND_REGEX, webpage) is not None: + raise ExtractorError('Video %s does not exist' % video_id, expected=True) + fields = dict(re.findall(r'''(?x)