From ce36339575da408c5d795f691d07d2e310292b28 Mon Sep 17 00:00:00 2001 From: felix Date: Sun, 7 Dec 2014 11:52:03 +0100 Subject: [PATCH] add teamfourstar.com support --- youtube_dl/extractor/screenwavemedia.py | 32 +++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/youtube_dl/extractor/screenwavemedia.py b/youtube_dl/extractor/screenwavemedia.py index 3fb3bfa32..cf9b8e0de 100644 --- a/youtube_dl/extractor/screenwavemedia.py +++ b/youtube_dl/extractor/screenwavemedia.py @@ -6,6 +6,7 @@ import re from .common import InfoExtractor from ..utils import ( ExtractorError, + month_by_name, int_or_none, ) @@ -13,6 +14,7 @@ class ScreenwaveMediaIE(InfoExtractor): _VALID_URL = r'(?:http://)?(?' \ r':(?Pplayer\.screenwavemedia\.com/play/[a-zA-Z]+\.php\?[^"]*\bid=(?P.+))' \ r'|(?P(?:www\.)?cinemassacre\.com/(?P[0-9]{4})/(?P[0-9]{2})/(?P[0-9]{2})/(?P[^?#/]+))' \ + r'|(?P(?:www\.)?teamfourstar\.com/video/(?P[a-z0-9\-]+)/?)' \ r')' _TESTS = [ @@ -65,6 +67,34 @@ class ScreenwaveMediaIE(InfoExtractor): '_embed_url': playerdata_url, } + def _teamfourstar_get_info(self, url): + mobj = re.match(self._VALID_URL, url) + display_id = mobj.group('tfs_display_id') + webpage = self._download_webpage(url, display_id) + + mobj = re.search(r'src="(?Phttp://player\.screenwavemedia\.com/play/[a-zA-Z]+\.php\?[^"]*\bid=.+?)"', webpage) + if not mobj: + raise ExtractorError('Can\'t extract embed url and video id') + playerdata_url = mobj.group('embed_url') + + video_title = self._html_search_regex( + r'
(?P.+?)</div>', webpage, 'title') + video_date = self._html_search_regex( + r'<div class="heroheadingdate">(?P<date>.+?)</div>', webpage, 'date') + mobj = re.match('(?P<month>[A-Z][a-z]+) (?P<day>\d+), (?P<year>\d+)', video_date) + video_date = '%04u%02u%02u' % (int(mobj.group('year')), month_by_name(mobj.group('month')), int(mobj.group('day'))) + video_description = self._html_search_regex( + r'<div class="postcontent">(?P<description>.+?)</div>', webpage, 'description', flags=re.DOTALL) + video_thumbnail = self._og_search_thumbnail(webpage) + + return { + 'title': video_title, + 'description': video_description, + 'upload_date': video_date, + 'thumbnail': video_thumbnail, + '_embed_url': playerdata_url, + } + def _screenwavemedia_get_info(self, url): mobj = re.match(self._VALID_URL, url) if not mobj: @@ -148,6 +178,8 @@ class ScreenwaveMediaIE(InfoExtractor): if mobj: if mobj.group('cinemassacre'): site_info = self._cinemassacre_get_info(url) + elif mobj.group('teamfourstar'): + site_info = self._teamfourstar_get_info(url) if not swm_info: if site_info: