From 5e1912cfc102f457fb9cb2472fb93c973cb68732 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Sat, 13 Dec 2014 11:02:24 +0100 Subject: [5min] Remove helper method and modernize Previously, other extractor would go call a private(!) helper method. Instead, just hardcode the 5min:video_id format - it's not if that would ever change. --- youtube_dl/extractor/fivemin.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'youtube_dl/extractor/fivemin.py') diff --git a/youtube_dl/extractor/fivemin.py b/youtube_dl/extractor/fivemin.py index f9c127ce6..5b24b921c 100644 --- a/youtube_dl/extractor/fivemin.py +++ b/youtube_dl/extractor/fivemin.py @@ -1,11 +1,11 @@ from __future__ import unicode_literals -import re - from .common import InfoExtractor -from ..utils import ( +from ..compat import ( compat_str, compat_urllib_parse, +) +from ..utils import ( ExtractorError, ) @@ -13,7 +13,7 @@ from ..utils import ( class FiveMinIE(InfoExtractor): IE_NAME = '5min' _VALID_URL = r'''(?x) - (?:https?://[^/]*?5min\.com/Scripts/PlayerSeed\.js\?(.*?&)?playList=| + (?:https?://[^/]*?5min\.com/Scripts/PlayerSeed\.js\?(?:.*?&)?playList=| 5min:) (?P\d+) ''' @@ -41,13 +41,8 @@ class FiveMinIE(InfoExtractor): }, ] - @classmethod - def _build_result(cls, video_id): - return cls.url_result('5min:%s' % video_id, cls.ie_key()) - def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') + video_id = self._match_id(url) embed_url = 'https://embed.5min.com/playerseed/?playList=%s' % video_id embed_page = self._download_webpage(embed_url, video_id, 'Downloading embed page') -- cgit v1.2.3