projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d53a4af
)
[vodlocker] Capture file not found error (Closes #7696)
author
Sergey M․
<dstftw@gmail.com>
Sun, 29 Nov 2015 21:58:39 +0000
(
03:58
+0600)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 29 Nov 2015 21:58:39 +0000
(
03:58
+0600)
youtube_dl/extractor/vodlocker.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/vodlocker.py
b/youtube_dl/extractor/vodlocker.py
index be0a2780f5299571ee134ac47e17eda6476673ac..357594a11debd4e4946e6fd29b0f2b4d4fb241b9 100644
(file)
--- a/
youtube_dl/extractor/vodlocker.py
+++ b/
youtube_dl/extractor/vodlocker.py
@@
-3,11
+3,14
@@
from __future__ import unicode_literals
from .common import InfoExtractor
from ..compat import compat_urllib_parse
from .common import InfoExtractor
from ..compat import compat_urllib_parse
-from ..utils import sanitized_Request
+from ..utils import (
+ ExtractorError,
+ sanitized_Request,
+)
class VodlockerIE(InfoExtractor):
class VodlockerIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?vodlocker\.com/(?P<id>[0-9a-zA-Z]+)(?:\..*?)?'
+ _VALID_URL = r'https?://(?:www\.)?vodlocker\.com/(?
:embed-)?(?
P<id>[0-9a-zA-Z]+)(?:\..*?)?'
_TESTS = [{
'url': 'http://vodlocker.com/e8wvyzz4sl42',
_TESTS = [{
'url': 'http://vodlocker.com/e8wvyzz4sl42',
@@
-24,6
+27,12
@@
class VodlockerIE(InfoExtractor):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
+ if any(p in webpage for p in (
+ '>THIS FILE WAS DELETED<',
+ '>File Not Found<',
+ 'The file you were looking for could not be found, sorry for any inconvenience.<')):
+ raise ExtractorError('Video %s does not exist' % video_id, expected=True)
+
fields = self._hidden_inputs(webpage)
if fields['op'] == 'download1':
fields = self._hidden_inputs(webpage)
if fields['op'] == 'download1':