Browse Source

[promptfile] Fix check for deleted videos

totalwebcasting
Philipp Hagemeister 10 years ago
parent
commit
15956b5aa1
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      youtube_dl/extractor/promptfile.py

+ 2
- 4
youtube_dl/extractor/promptfile.py View File

@ -14,7 +14,6 @@ from ..utils import (
class PromptFileIE(InfoExtractor): class PromptFileIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?promptfile\.com/l/(?P<id>[0-9A-Z\-]+)' _VALID_URL = r'https?://(?:www\.)?promptfile\.com/l/(?P<id>[0-9A-Z\-]+)'
_FILE_NOT_FOUND_REGEX = r'<div.+id="not_found_msg".+>.+</div>[^-]'
_TEST = { _TEST = {
'url': 'http://www.promptfile.com/l/D21B4746E9-F01462F0FF', 'url': 'http://www.promptfile.com/l/D21B4746E9-F01462F0FF',
'md5': 'd1451b6302da7215485837aaea882c4c', 'md5': 'd1451b6302da7215485837aaea882c4c',
@ -27,11 +26,10 @@ class PromptFileIE(InfoExtractor):
} }
def _real_extract(self, url): 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) webpage = self._download_webpage(url, video_id)
if re.search(self._FILE_NOT_FOUND_REGEX, webpage) is not None:
if re.search(r'<div.+id="not_found_msg".+>(?!We are).+</div>[^-]', webpage) is not None:
raise ExtractorError('Video %s does not exist' % video_id, raise ExtractorError('Video %s does not exist' % video_id,
expected=True) expected=True)


Loading…
Cancel
Save