X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Frtlnow.py;h=785a8045e09d65f31405fbd15106dbeb684afcc9;hb=233c1c0e76d64c9e13dc8968bfd8a014c49e66a8;hp=285c3c4bebf8ec7c2cd793d2b40739222c18a5ca;hpb=8940b8608e567dba09b3ea146b89b297190ec6d6;p=youtube-dl diff --git a/youtube_dl/extractor/rtlnow.py b/youtube_dl/extractor/rtlnow.py index 285c3c4be..785a8045e 100644 --- a/youtube_dl/extractor/rtlnow.py +++ b/youtube_dl/extractor/rtlnow.py @@ -91,6 +91,15 @@ class RTLnowIE(InfoExtractor): }, }, { + 'url': 'http://rtl-now.rtl.de/der-bachelor/folge-4.php?film_id=188729&player=1&season=5', + 'info_dict': { + 'id': '188729', + 'ext': 'flv', + 'upload_date': '20150204', + 'description': 'md5:5e1ce23095e61a79c166d134b683cecc', + 'title': 'Der Bachelor - Folge 4', + } + }, { 'url': 'http://www.n-tvnow.de/deluxe-alles-was-spass-macht/thema-ua-luxushotel-fuer-vierbeiner.php?container_id=153819&player=1&season=0', 'only_matching': True, }, @@ -134,9 +143,18 @@ class RTLnowIE(InfoExtractor): 'player_url': video_page_url + 'includes/vodplayer.swf', } else: - fmt = { - 'url': filename.text, - } + mobj = re.search(r'.*/(?P[^/]+)/videos/(?P.+)\.f4m', filename.text) + if mobj: + fmt = { + 'url': 'rtmpe://fms.rtl.de/' + mobj.group('hoster'), + 'play_path': 'mp4:' + mobj.group('play_path'), + 'page_url': url, + 'player_url': video_page_url + 'includes/vodplayer.swf', + } + else: + fmt = { + 'url': filename.text, + } fmt.update({ 'width': int_or_none(filename.get('width')), 'height': int_or_none(filename.get('height')),