X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Frtlnow.py;h=1a41cbe409acc666a30a056c4d07c63afbadd863;hb=42e12102a979a03f156e71fc86006f61c905f7dd;hp=76a9704fd6481bede2c9eb2834c5b6f4ab34b11f;hpb=995befe0e9b2a829b7aa4aeab76b4a44979c2061;p=youtube-dl diff --git a/youtube_dl/extractor/rtlnow.py b/youtube_dl/extractor/rtlnow.py index 76a9704fd..1a41cbe40 100644 --- a/youtube_dl/extractor/rtlnow.py +++ b/youtube_dl/extractor/rtlnow.py @@ -8,7 +8,6 @@ from ..utils import ( ExtractorError, clean_html, unified_strdate, - parse_duration, int_or_none, ) @@ -82,7 +81,7 @@ class RTLnowIE(InfoExtractor): 'id': '99205', 'ext': 'flv', 'title': 'Medicopter 117 - Angst!', - 'description': 'md5:895b1df01639b5f61a04fc305a5cb94d', + 'description': 're:^Im Therapiezentrum \'Sonnalm\' kommen durch eine Unachtsamkeit die für die B.handlung mit Phobikern gehaltenen Voglespinnen frei\. Eine Ausreißerin', 'thumbnail': 'http://autoimg.static-fra.de/superrtlnow/287529/1500x1500/image2.jpg', 'upload_date': '20080928', 'duration': 2691, @@ -93,16 +92,7 @@ class RTLnowIE(InfoExtractor): }, { 'url': 'http://www.n-tvnow.de/deluxe-alles-was-spass-macht/thema-ua-luxushotel-fuer-vierbeiner.php?container_id=153819&player=1&season=0', - 'info_dict': { - 'id': '153819', - 'ext': 'flv', - 'title': 'Deluxe - Alles was Spaß macht - Thema u.a.: Luxushotel für Vierbeiner', - 'description': 'md5:c3705e1bb32e1a5b2bcd634fc065c631', - 'thumbnail': 'http://autoimg.static-fra.de/ntvnow/383157/1500x1500/image2.jpg', - 'upload_date': '20140221', - 'duration': 2429, - }, - 'skip': 'Only works from Germany', + 'only_matching': True, }, ] @@ -123,14 +113,16 @@ class RTLnowIE(InfoExtractor): upload_date = unified_strdate(self._html_search_meta('uploadDate', webpage, 'upload date')) + mobj = re.search(r'', webpage) + duration = int(mobj.group('seconds')) if mobj else None + playerdata_url = self._html_search_regex( r"'playerdata': '(?P[^']+)'", webpage, 'playerdata_url') playerdata = self._download_xml(playerdata_url, video_id, 'Downloading player data XML') videoinfo = playerdata.find('./playlist/videoinfo') - duration = parse_duration(videoinfo.find('duration').text) - + formats = [] for filename in videoinfo.findall('filename'): mobj = re.search(r'(?Prtmpe://(?:[^/]+/){2})(?P.+)', filename.text)