aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M. <dstftw@gmail.com>2014-09-11 19:20:13 +0700
committerSergey M. <dstftw@gmail.com>2014-09-11 19:20:13 +0700
commitde00ff6494c1852c7c5bf7a2d13208203b5eb27c (patch)
tree1c7ea1c0f5816cc7833a359dc44b2847474f7122
parent36169979296e2dbcf3d421e3d82999af1de51c2d (diff)
parent08d037309ed301a74fbf672ab723a4f3377099de (diff)
Merge pull request #3716 from naglis/nosvideo
[nosvideo] Check for deleted video
-rw-r--r--youtube_dl/extractor/nosvideo.py17
1 files changed, 11 insertions, 6 deletions
diff --git a/youtube_dl/extractor/nosvideo.py b/youtube_dl/extractor/nosvideo.py
index 095965add..8c2c428fc 100644
--- a/youtube_dl/extractor/nosvideo.py
+++ b/youtube_dl/extractor/nosvideo.py
@@ -5,8 +5,9 @@ import re
from .common import InfoExtractor
from ..utils import (
- compat_urllib_parse,
+ ExtractorError,
compat_urllib_request,
+ urlencode_postdata,
xpath_with_ns,
)
@@ -18,11 +19,12 @@ class NosVideoIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?nosvideo\.com/' + \
'(?:embed/|\?v=)(?P<id>[A-Za-z0-9]{12})/?'
_PLAYLIST_URL = 'http://nosvideo.com/xml/{xml_id:s}.xml'
+ _FILE_DELETED_REGEX = r'<b>File Not Found</b>'
_TEST = {
- 'url': 'http://nosvideo.com/?v=drlp6s40kg54',
- 'md5': '4b4ac54c6ad5d70ab88f2c2c6ccec71c',
+ 'url': 'http://nosvideo.com/?v=mu8fle7g7rpq',
+ 'md5': '6124ed47130d8be3eacae635b071e6b6',
'info_dict': {
- 'id': 'drlp6s40kg54',
+ 'id': 'mu8fle7g7rpq',
'ext': 'mp4',
'title': 'big_buck_bunny_480p_surround-fix.avi.mp4',
'thumbnail': 're:^https?://.*\.jpg$',
@@ -38,11 +40,14 @@ class NosVideoIE(InfoExtractor):
'op': 'download1',
'method_free': 'Continue to Video',
}
- post = compat_urllib_parse.urlencode(fields)
- req = compat_urllib_request.Request(url, post)
+ req = compat_urllib_request.Request(url, urlencode_postdata(fields))
req.add_header('Content-type', 'application/x-www-form-urlencoded')
webpage = self._download_webpage(req, video_id,
'Downloading download page')
+ if re.search(self._FILE_DELETED_REGEX, webpage) is not None:
+ raise ExtractorError('Video %s does not exist' % video_id,
+ expected=True)
+
xml_id = self._search_regex(r'php\|([^\|]+)\|', webpage, 'XML ID')
playlist_url = self._PLAYLIST_URL.format(xml_id=xml_id)
playlist = self._download_xml(playlist_url, video_id)