projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ted] Fix hls audio/video-only formats
[youtube-dl]
/
youtube_dl
/
extractor
/
promptfile.py
diff --git
a/youtube_dl/extractor/promptfile.py
b/youtube_dl/extractor/promptfile.py
index 463e855014fada90cce969f8dccc0b9f1e80cde7..f536e6e6cdfb3d71e21c98614e2baf117387493b 100644
(file)
--- 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
import re
from .common import InfoExtractor
-from ..utils import (
- ExtractorError,
- determine_ext,
+from ..compat import (
compat_urllib_parse,
compat_urllib_request,
)
compat_urllib_parse,
compat_urllib_request,
)
+from ..utils import (
+ determine_ext,
+ ExtractorError,
+)
class PromptFileIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?promptfile\.com/l/(?P<id>[0-9A-Z\-]+)'
class PromptFileIE(InfoExtractor):
_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 = {
'url': 'http://www.promptfile.com/l/D21B4746E9-F01462F0FF',
'md5': 'd1451b6302da7215485837aaea882c4c',
_TEST = {
'url': 'http://www.promptfile.com/l/D21B4746E9-F01462F0FF',
'md5': 'd1451b6302da7215485837aaea882c4c',
@@
-27,11
+28,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,
expected=True)
raise ExtractorError('Video %s does not exist' % video_id,
expected=True)