w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[metacafe] More modernize

Browse source
This commit is contained in:
Sergey M․ 2014-03-23 05:13:15 +07:00
parent 391dc3ee07
commit 401983c6a0
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
youtube_dl/extractor/metacafe.py
View file

@ -13,7 +13,7 @@ from ..utils import (
class MetacafeIE(InfoExtractor): class MetacafeIE(InfoExtractor):
_VALID_URL = r'(?:http://)?(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+)/.*' _VALID_URL = r'http://(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+)/.*'
_DISCLAIMER = 'http://www.metacafe.com/family_filter/' _DISCLAIMER = 'http://www.metacafe.com/family_filter/'
_FILTER_POST = 'http://www.metacafe.com/f/index.php?inputType=filter&controllerGroup=user' _FILTER_POST = 'http://www.metacafe.com/f/index.php?inputType=filter&controllerGroup=user'
IE_NAME = 'metacafe' IE_NAME = 'metacafe'
@ -26,7 +26,7 @@ class MetacafeIE(InfoExtractor):
'id': '_aUehQsCQtM', 'id': '_aUehQsCQtM',
'ext': 'mp4', 'ext': 'mp4',
'upload_date': '20090102', 'upload_date': '20090102',
'title': 'The Electric Company | \"Short I\" | PBS KIDS GO!', 'title': 'The Electric Company | "Short I" | PBS KIDS GO!',
'description': 'md5:2439a8ef6d5a70e380c22f5ad323e5a8', 'description': 'md5:2439a8ef6d5a70e380c22f5ad323e5a8',
'uploader': 'PBS', 'uploader': 'PBS',
'uploader_id': 'PBS' 'uploader_id': 'PBS'
@ -86,7 +86,6 @@ class MetacafeIE(InfoExtractor):
] ]
def report_disclaimer(self): def report_disclaimer(self):
"""Report disclaimer retrieval."""
self.to_screen('Retrieving disclaimer') self.to_screen('Retrieving disclaimer')
def _real_initialize(self): def _real_initialize(self):
@ -103,7 +102,7 @@ class MetacafeIE(InfoExtractor):
request.add_header('Content-Type', 'application/x-www-form-urlencoded') request.add_header('Content-Type', 'application/x-www-form-urlencoded')
self.report_age_confirmation() self.report_age_confirmation()
self._download_webpage(request, None, False, 'Unable to confirm age') self._download_webpage(request, None, False, 'Unable to confirm age')
"""Report disclaimer retrieval."""
def _real_extract(self, url): def _real_extract(self, url):
# Extract id and simplified title from URL # Extract id and simplified title from URL
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)