summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M <dstftw@gmail.com>2014-10-06 01:48:01 +0700
committerSergey M <dstftw@gmail.com>2014-10-06 01:48:01 +0700
commit3ae165aa10e6747173adbcce8da0e2c8d30eed33 (patch)
tree2382c48f2db6249b18542885dfcd6dc5c0bb8fb1
parente4b85e35d083fca70d29a751c01071e287b5cdae (diff)
downloadyoutube-dl-3ae165aa10e6747173adbcce8da0e2c8d30eed33.tar.gz
youtube-dl-3ae165aa10e6747173adbcce8da0e2c8d30eed33.tar.xz
youtube-dl-3ae165aa10e6747173adbcce8da0e2c8d30eed33.zip
[gorillavid] Add check for non existing videos
-rw-r--r--youtube_dl/extractor/gorillavid.py5
1 files changed, 5 insertions, 0 deletions
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<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+