projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for https for all extractors as preventive and future-proof measure
[youtube-dl]
/
youtube_dl
/
extractor
/
metacafe.py
diff --git
a/youtube_dl/extractor/metacafe.py
b/youtube_dl/extractor/metacafe.py
index 3c786a36dfb6c8908668cdf3191e660487862c82..c31e8798ae7ccdbaa8ef9baa481336ef8a5e8dd9 100644
(file)
--- a/
youtube_dl/extractor/metacafe.py
+++ b/
youtube_dl/extractor/metacafe.py
@@
-17,7
+17,7
@@
from ..utils import (
class MetacafeIE(InfoExtractor):
class MetacafeIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+)/.*'
+ _VALID_URL = r'http
s?
://(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+)/.*'
_DISCLAIMER = 'http://www.metacafe.com/family_filter/'
_FILTER_POST = 'http://www.metacafe.com/f/index.php?inputType=filter&controllerGroup=user'
IE_NAME = 'metacafe'
_DISCLAIMER = 'http://www.metacafe.com/family_filter/'
_FILTER_POST = 'http://www.metacafe.com/f/index.php?inputType=filter&controllerGroup=user'
IE_NAME = 'metacafe'
@@
-154,10
+154,10
@@
class MetacafeIE(InfoExtractor):
# Extract URL, uploader and title from webpage
self.report_extraction(video_id)
video_url = None
# Extract URL, uploader and title from webpage
self.report_extraction(video_id)
video_url = None
- mobj = re.search(r'(?m)&
media
URL=([^&]+)', webpage)
+ mobj = re.search(r'(?m)&
(?:media|video)
URL=([^&]+)', webpage)
if mobj is not None:
mediaURL = compat_urllib_parse_unquote(mobj.group(1))
if mobj is not None:
mediaURL = compat_urllib_parse_unquote(mobj.group(1))
- video_ext =
mediaURL[-3:]
+ video_ext =
determine_ext(mediaURL)
# Extract gdaKey if available
mobj = re.search(r'(?m)&gdaKey=(.*?)&', webpage)
# Extract gdaKey if available
mobj = re.search(r'(?m)&gdaKey=(.*?)&', webpage)
@@
-229,7
+229,7
@@
class MetacafeIE(InfoExtractor):
age_limit = (
18
age_limit = (
18
- if re.search(r'
"contentRating":
"restricted"', webpage)
+ if re.search(r'
(?:"contentRating":|"rating",)
"restricted"', webpage)
else 0)
if isinstance(video_url, list):
else 0)
if isinstance(video_url, list):