X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fpromptfile.py;h=f536e6e6cdfb3d71e21c98614e2baf117387493b;hb=644096b15c8af723d06635dceb72754b5b929127;hp=9ef49b19a91c9218d84dea08e9d248614975625a;hpb=8e72edfb19b5f6f87210f62f02fe876789641dbe;p=youtube-dl.git diff --git a/youtube_dl/extractor/promptfile.py b/youtube_dl/extractor/promptfile.py index 9ef49b19a..f536e6e6c 100644 --- a/youtube_dl/extractor/promptfile.py +++ b/youtube_dl/extractor/promptfile.py @@ -4,17 +4,18 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ( - ExtractorError, - determine_ext, +from ..compat import ( compat_urllib_parse, compat_urllib_request, ) +from ..utils import ( + determine_ext, + ExtractorError, +) 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 +28,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) @@ -56,8 +56,8 @@ class PromptFileIE(InfoExtractor): 'format_id': 'sd', 'url': url, 'ext': determine_ext(title), - 'quality': 1, }] + self._sort_formats(formats) return { 'id': video_id,