From: Sergey M․ <dstftw@gmail.com>
Date: Sat, 18 Apr 2015 22:09:01 +0000 (+0600)
Subject: [megavideoz] Check non-existing videos
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=6e218b3f9a57f42756aa3016fa9dd530fb58c452;p=youtube-dl.git

[megavideoz] Check non-existing videos
---

diff --git a/youtube_dl/extractor/megavideoz.py b/youtube_dl/extractor/megavideoz.py
index d80f3633e..a15b6a32a 100644
--- a/youtube_dl/extractor/megavideoz.py
+++ b/youtube_dl/extractor/megavideoz.py
@@ -5,6 +5,7 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     float_or_none,
     xpath_text,
 )
@@ -31,6 +32,9 @@ class MegaVideozIE(InfoExtractor):
 
         webpage = self._download_webpage(url, display_id)
 
+        if '>Video Not Found<' in webpage:
+            raise ExtractorError('Video %s does not exist' % video_id, expected=True)
+
         config = self._download_xml(
             self._search_regex(
                 r"var\s+cnf\s*=\s*'([^']+)'", webpage, 'cnf url'),