]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[gorillavid] Add check for non existing videos
authorSergey M <dstftw@gmail.com>
Sun, 5 Oct 2014 18:48:01 +0000 (01:48 +0700)
committerSergey M <dstftw@gmail.com>
Sun, 5 Oct 2014 18:48:01 +0000 (01:48 +0700)
youtube_dl/extractor/gorillavid.py

index 0f0012f1f2a55bceab161b5ee72ef0e0d55e68fc..45cca1d24e858edd7a1afa3352b2457058163fd7 100644 (file)
@@ -20,6 +20,8 @@ class GorillaVidIE(InfoExtractor):
         (?:embed-)?(?P<id>[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)<input\s+
             type="hidden"\s+
             name="([^"]+)"\s+