From: Philipp Hagemeister Date: Sun, 23 Jun 2013 20:30:16 +0000 (+0200) Subject: [howcast] Move into own file X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=e17d368ae2473f83c4d88cdcc08f1e74af598561;p=youtube-dl [howcast] Move into own file --- diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 4bb4aa84a..cc685e274 100755 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -34,6 +34,7 @@ from .extractor.gametrailers import GametrailersIE from .extractor.generic import GenericIE from .extractor.googleplus import GooglePlusIE from .extractor.googlesearch import GoogleSearchIE +from .extractor.howcast import HowcastIE from .extractor.hypem import HypemIE from .extractor.ina import InaIE from .extractor.infoq import InfoQIE @@ -106,39 +107,6 @@ from .extractor.zdf import ZDFIE -class HowcastIE(InfoExtractor): - """Information Extractor for Howcast.com""" - _VALID_URL = r'(?:https?://)?(?:www\.)?howcast\.com/videos/(?P\d+)' - - def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - - video_id = mobj.group('id') - webpage_url = 'http://www.howcast.com/videos/' + video_id - webpage = self._download_webpage(webpage_url, video_id) - - self.report_extraction(video_id) - - video_url = self._search_regex(r'\'?file\'?: "(http://mobile-media\.howcast\.com/[0-9]+\.mp4)', - webpage, u'video URL') - - video_title = self._html_search_regex(r'\d+)' + + def _real_extract(self, url): + mobj = re.match(self._VALID_URL, url) + + video_id = mobj.group('id') + webpage_url = 'http://www.howcast.com/videos/' + video_id + webpage = self._download_webpage(webpage_url, video_id) + + self.report_extraction(video_id) + + video_url = self._search_regex(r'\'?file\'?: "(http://mobile-media\.howcast\.com/[0-9]+\.mp4)', + webpage, u'video URL') + + video_title = self._html_search_regex(r'