diff options
| -rw-r--r-- | youtube_dl/extractor/__init__.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/nowtv.py | 90 | ||||
| -rw-r--r-- | youtube_dl/extractor/rtlnow.py | 174 | 
3 files changed, 91 insertions, 175 deletions
| diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 79bcd9106..bfd07392e 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -355,6 +355,7 @@ from .normalboots import NormalbootsIE  from .nosvideo import NosVideoIE  from .novamov import NovaMovIE  from .nowness import NownessIE +from .nowtv import NowTvIE  from .nowvideo import NowVideoIE  from .npo import (      NPOIE, @@ -438,7 +439,6 @@ from .roxwel import RoxwelIE  from .rtbf import RTBFIE  from .rte import RteIE  from .rtlnl import RtlNlIE -from .rtlnow import RTLnowIE  from .rtl2 import RTL2IE  from .rtp import RTPIE  from .rts import RTSIE diff --git a/youtube_dl/extractor/nowtv.py b/youtube_dl/extractor/nowtv.py new file mode 100644 index 000000000..bf97fe7f4 --- /dev/null +++ b/youtube_dl/extractor/nowtv.py @@ -0,0 +1,90 @@ +# encoding: utf-8 +from __future__ import unicode_literals + +import re + +from .common import InfoExtractor +from ..utils import ( +    ExtractorError, +    qualities, +    unified_strdate, +    int_or_none, +) + +class NowTvIE(InfoExtractor): +    """Information Extractor for RTL NOW, RTL2 NOW, RTL NITRO, SUPER RTL NOW, VOX NOW and n-tv NOW""" +    _VALID_URL = r'''(?x) +                        (?:https?://)? +                        ( +                            (?:www\.)?nowtv\.de +                            /(rtl|rtl2|rtlnitro||superrtl|ntv|vox)(?P<path>/.*?)/player +                        )''' + +    _TESTS = [ +        { +            'url': 'http://www.nowtv.de/vox/der-hundeprofi/buero-fall-chihuahua-joel/player', +            'info_dict': { +                'id': '128953', +                'ext': 'mp4', +                'title': 'B\u00fcro-Fall \/ Chihuahua \'Joel\'', +                'description': 'md5:ce843b6b5901d9a7f7d04d1bbcdb12de', +                'upload_date': '2015-05-23 19:10:00', +                'duration': '00:51:32', +            }, +            'params': { +                'skip_download': True, +            }, +            'skip': 'Only works from Germany', +        }, +    ] + +    def _real_extract(self, url): +        mobj = re.match(self._VALID_URL, url) +        info_url = 'https://api.nowtv.de/v3/movies' + mobj.group('path') + '?fields=*,format,files,breakpoints,paymentPaytypes,trailers' +        info = self._download_json(info_url, None) + +        video_id = info['id'] +        title = info['title'] +        description = info['articleShort'] +        duration = info['duration'] +        upload_date = unified_strdate(info['broadcastStartDate']) +        free = info['free'] +        station = info['format']['station'] +        thumbnail = info['format']['defaultImage169Logo'] + +        if station == 'rtl': +            base_url = 'http://hls.fra.rtlnow.de/hls-vod-enc/' +        elif station == 'rtl2': +            base_url = 'http://hls.fra.rtl2now.de/hls-vod-enc/' +        elif station == 'vox': +            base_url = 'http://hls.fra.voxnow.de/hls-vod-enc/' +        elif station == 'nitro': +            base_url = 'http://hls.fra.rtlnitronow.de/hls-vod-enc/' +        elif station == 'ntv': +            base_url = 'http://hls.fra.n-tvnow.de/hls-vod-enc/' +        elif station == 'superrtl': +            base_url = 'http://hls.fra.superrtlnow.de/hls-vod-enc/' + +        formats = [] +        for item in info['files']['items']: +            if item['type'] != 'video/x-abr': +                continue + +            fmt = { +                'url': base_url + item['path'] + '.m3u8', +                'tbr': int_or_none(item['bitrate']), +                'ext': 'mp4', +                'format_id': int_or_none(item['id']), +            } +            formats.append(fmt) +        self._sort_formats(formats) + +        return { +            'id': video_id, +            'title': title, +            'description': description, +            'thumbnail': thumbnail, +            'upload_date': upload_date, +            'duration': duration, +            'formats': formats, +        } diff --git a/youtube_dl/extractor/rtlnow.py b/youtube_dl/extractor/rtlnow.py deleted file mode 100644 index 785a8045e..000000000 --- a/youtube_dl/extractor/rtlnow.py +++ /dev/null @@ -1,174 +0,0 @@ -# encoding: utf-8 -from __future__ import unicode_literals - -import re - -from .common import InfoExtractor -from ..utils import ( -    ExtractorError, -    clean_html, -    unified_strdate, -    int_or_none, -) - - -class RTLnowIE(InfoExtractor): -    """Information Extractor for RTL NOW, RTL2 NOW, RTL NITRO, SUPER RTL NOW, VOX NOW and n-tv NOW""" -    _VALID_URL = r'''(?x) -                        (?:https?://)? -                        (?P<url> -                            (?P<domain> -                                rtl-now\.rtl\.de| -                                rtl2now\.rtl2\.de| -                                (?:www\.)?voxnow\.de| -                                (?:www\.)?rtlnitronow\.de| -                                (?:www\.)?superrtlnow\.de| -                                (?:www\.)?n-tvnow\.de) -                            /+[a-zA-Z0-9-]+/[a-zA-Z0-9-]+\.php\? -                            (?:container_id|film_id)=(?P<video_id>[0-9]+)& -                            player=1(?:&season=[0-9]+)?(?:&.*)? -                        )''' - -    _TESTS = [ -        { -            'url': 'http://rtl-now.rtl.de/ahornallee/folge-1.php?film_id=90419&player=1&season=1', -            'info_dict': { -                'id': '90419', -                'ext': 'flv', -                'title': 'Ahornallee - Folge 1 - Der Einzug', -                'description': 'md5:ce843b6b5901d9a7f7d04d1bbcdb12de', -                'upload_date': '20070416', -                'duration': 1685, -            }, -            'params': { -                'skip_download': True, -            }, -            'skip': 'Only works from Germany', -        }, -        { -            'url': 'http://rtl2now.rtl2.de/aerger-im-revier/episode-15-teil-1.php?film_id=69756&player=1&season=2&index=5', -            'info_dict': { -                'id': '69756', -                'ext': 'flv', -                'title': 'Ärger im Revier - Ein junger Ladendieb, ein handfester Streit u.a.', -                'description': 'md5:3fb247005ed21a935ffc82b7dfa70cf0', -                'thumbnail': 'http://autoimg.static-fra.de/rtl2now/219850/1500x1500/image2.jpg', -                'upload_date': '20120519', -                'duration': 1245, -            }, -            'params': { -                'skip_download': True, -            }, -            'skip': 'Only works from Germany', -        }, -        { -            'url': 'http://www.voxnow.de/voxtours/suedafrika-reporter-ii.php?film_id=13883&player=1&season=17', -            'info_dict': { -                'id': '13883', -                'ext': 'flv', -                'title': 'Voxtours - Südafrika-Reporter II', -                'description': 'md5:de7f8d56be6fd4fed10f10f57786db00', -                'upload_date': '20090627', -                'duration': 1800, -            }, -            'params': { -                'skip_download': True, -            }, -        }, -        { -            'url': 'http://superrtlnow.de/medicopter-117/angst.php?film_id=99205&player=1', -            'info_dict': { -                'id': '99205', -                'ext': 'flv', -                'title': 'Medicopter 117 - Angst!', -                '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, -            }, -            'params': { -                'skip_download': True, -            }, -        }, -        { -            '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, -        }, -    ] - -    def _real_extract(self, url): -        mobj = re.match(self._VALID_URL, url) -        video_page_url = 'http://%s/' % mobj.group('domain') -        video_id = mobj.group('video_id') - -        webpage = self._download_webpage('http://' + mobj.group('url'), video_id) - -        mobj = re.search(r'(?s)<div style="margin-left: 20px; font-size: 13px;">(.*?)<div id="playerteaser">', webpage) -        if mobj: -            raise ExtractorError(clean_html(mobj.group(1)), expected=True) - -        title = self._og_search_title(webpage) -        description = self._og_search_description(webpage) -        thumbnail = self._og_search_thumbnail(webpage, default=None) - -        upload_date = unified_strdate(self._html_search_meta('uploadDate', webpage, 'upload date')) - -        mobj = re.search(r'<meta itemprop="duration" content="PT(?P<seconds>\d+)S" />', webpage) -        duration = int(mobj.group('seconds')) if mobj else None - -        playerdata_url = self._html_search_regex( -            r"'playerdata': '(?P<playerdata_url>[^']+)'", webpage, 'playerdata_url') - -        playerdata = self._download_xml(playerdata_url, video_id, 'Downloading player data XML') - -        videoinfo = playerdata.find('./playlist/videoinfo') - -        formats = [] -        for filename in videoinfo.findall('filename'): -            mobj = re.search(r'(?P<url>rtmpe://(?:[^/]+/){2})(?P<play_path>.+)', filename.text) -            if mobj: -                fmt = { -                    'url': mobj.group('url'), -                    'play_path': 'mp4:' + mobj.group('play_path'), -                    'page_url': video_page_url, -                    'player_url': video_page_url + 'includes/vodplayer.swf', -                } -            else: -                mobj = re.search(r'.*/(?P<hoster>[^/]+)/videos/(?P<play_path>.+)\.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')), -                'vbr': int_or_none(filename.get('bitrate')), -                'ext': 'flv', -            }) -            formats.append(fmt) - -        return { -            'id': video_id, -            'title': title, -            'description': description, -            'thumbnail': thumbnail, -            'upload_date': upload_date, -            'duration': duration, -            'formats': formats, -        } | 
