From: Philipp Hagemeister Date: Sun, 26 Oct 2014 23:50:22 +0000 (+0100) Subject: [promptfile] Fix check for deleted videos X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=15956b5aa1867e9511d5edeebc5d4e9e70ed39c0;p=youtube-dl [promptfile] Fix check for deleted videos --- diff --git a/youtube_dl/extractor/promptfile.py b/youtube_dl/extractor/promptfile.py index 463e85501..7fcde086c 100644 --- a/youtube_dl/extractor/promptfile.py +++ b/youtube_dl/extractor/promptfile.py @@ -14,7 +14,6 @@ from ..utils import ( class PromptFileIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?promptfile\.com/l/(?P[0-9A-Z\-]+)' - _FILE_NOT_FOUND_REGEX = r'.+[^-]' _TEST = { 'url': 'http://www.promptfile.com/l/D21B4746E9-F01462F0FF', 'md5': 'd1451b6302da7215485837aaea882c4c', @@ -27,11 +26,10 @@ class PromptFileIE(InfoExtractor): } def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') + video_id = self._match_id(url) webpage = self._download_webpage(url, video_id) - if re.search(self._FILE_NOT_FOUND_REGEX, webpage) is not None: + if re.search(r'(?!We are).+[^-]', webpage) is not None: raise ExtractorError('Video %s does not exist' % video_id, expected=True)