gitlab-com-dstftw/youtube-dl
1
0
Fork 0
mirror of https://gitlab.com/dstftw/youtube-dl.git synced 2020-11-16 09:42:26 +00:00
Code Issues Releases Wiki Activity

[novamov] Improve existence checking

Browse source
This commit is contained in:
Yen Chi Hsuan 2015-12-13 15:37:52 +08:00
parent 47c7f3d995
commit b5424acdb9
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
youtube_dl/extractor/novamov.py
View file

@ -40,6 +40,10 @@ class NovaMovIE(InfoExtractor):
'skip': '"Invalid token" errors abound (in web interface as well as youtube-dl, there is nothing we can do about it.)' 'skip': '"Invalid token" errors abound (in web interface as well as youtube-dl, there is nothing we can do about it.)'
} }
def _check_existence(self, webpage, video_id):
if re.search(self._FILE_DELETED_REGEX, webpage) is not None:
raise ExtractorError('Video %s does not exist' % video_id, expected=True)
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
@ -48,8 +52,7 @@ class NovaMovIE(InfoExtractor):
webpage = self._download_webpage( webpage = self._download_webpage(
url, video_id, 'Downloading video page') url, video_id, 'Downloading video page')
if re.search(self._FILE_DELETED_REGEX, webpage) is not None: self._check_existence(webpage, video_id)
raise ExtractorError('Video %s does not exist' % video_id, expected=True)
def extract_filekey(default=NO_DEFAULT): def extract_filekey(default=NO_DEFAULT):
filekey = self._search_regex( filekey = self._search_regex(
@ -75,6 +78,7 @@ class NovaMovIE(InfoExtractor):
request.add_header('Referer', post_url) request.add_header('Referer', post_url)
webpage = self._download_webpage( webpage = self._download_webpage(
request, video_id, 'Downloading continue to the video page') request, video_id, 'Downloading continue to the video page')
self._check_existence(webpage, video_id)
filekey = extract_filekey() filekey = extract_filekey()