diff options
| -rw-r--r-- | youtube_dl/extractor/__init__.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/nowtv.py | 169 | ||||
| -rw-r--r-- | youtube_dl/extractor/rtlnow.py | 174 | 
3 files changed, 170 insertions, 175 deletions
| diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 80c9cb107..3c1e8d526 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -354,6 +354,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, @@ -437,7 +438,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..5c91acec6 --- /dev/null +++ b/youtube_dl/extractor/nowtv.py @@ -0,0 +1,169 @@ +# coding: utf-8 +from __future__ import unicode_literals + +import re + +from .common import InfoExtractor +from ..compat import compat_str +from ..utils import ( +    ExtractorError, +    int_or_none, +    parse_iso8601, +    parse_duration, +    remove_start, +) + + +class NowTVIE(InfoExtractor): +    _VALID_URL = r'https?://(?:www\.)?nowtv\.de/(?P<station>rtl|rtl2|rtlnitro|superrtl|ntv|vox)/(?P<id>.+?)/player' + +    _TESTS = [{ +        # rtl +        'url': 'http://www.nowtv.de/rtl/bauer-sucht-frau/die-neuen-bauern-und-eine-hochzeit/player', +        'info_dict': { +            'id': '203519', +            'display_id': 'bauer-sucht-frau/die-neuen-bauern-und-eine-hochzeit', +            'ext': 'mp4', +            'title': 'Die neuen Bauern und eine Hochzeit', +            'description': 'md5:e234e1ed6d63cf06be5c070442612e7e', +            'thumbnail': 're:^https?://.*\.jpg$', +            'timestamp': 1432580700, +            'upload_date': '20150525', +            'duration': 2786, +        }, +        'params': { +            # m3u8 download +            'skip_download': True, +        }, +    }, { +        # rtl2 +        'url': 'http://www.nowtv.de/rtl2/berlin-tag-nacht/berlin-tag-nacht-folge-934/player', +        'info_dict': { +            'id': '203481', +            'display_id': 'berlin-tag-nacht/berlin-tag-nacht-folge-934', +            'ext': 'mp4', +            'title': 'Berlin - Tag & Nacht (Folge 934)', +            'description': 'md5:c85e88c2e36c552dfe63433bc9506dd0', +            'thumbnail': 're:^https?://.*\.jpg$', +            'timestamp': 1432666800, +            'upload_date': '20150526', +            'duration': 2641, +        }, +        'params': { +            # m3u8 download +            'skip_download': True, +        }, +    }, { +        # superrtl +        'url': 'http://www.nowtv.de/superrtl/medicopter-117/angst/player', +        'info_dict': { +            'id': '99205', +            'display_id': 'medicopter-117/angst', +            'ext': 'mp4', +            'title': 'Angst!', +            'description': 'md5:30cbc4c0b73ec98bcd73c9f2a8c17c4e', +            'thumbnail': 're:^https?://.*\.jpg$', +            'timestamp': 1222632900, +            'upload_date': '20080928', +            'duration': 3025, +        }, +        'params': { +            # m3u8 download +            'skip_download': True, +        }, +    }, { +        # ntv +        'url': 'http://www.nowtv.de/ntv/ratgeber-geld/thema-ua-der-erste-blick-die-apple-watch/player', +        'info_dict': { +            'id': '203521', +            'display_id': 'ratgeber-geld/thema-ua-der-erste-blick-die-apple-watch', +            'ext': 'mp4', +            'title': 'Thema u.a.: Der erste Blick: Die Apple Watch', +            'description': 'md5:4312b6c9d839ffe7d8caf03865a531af', +            'thumbnail': 're:^https?://.*\.jpg$', +            'timestamp': 1432751700, +            'upload_date': '20150527', +            'duration': 1083, +        }, +        'params': { +            # m3u8 download +            'skip_download': True, +        }, +    }, { +        # vox +        'url': 'http://www.nowtv.de/vox/der-hundeprofi/buero-fall-chihuahua-joel/player', +        'info_dict': { +            'id': '128953', +            'display_id': 'der-hundeprofi/buero-fall-chihuahua-joel', +            'ext': 'mp4', +            'title': "Büro-Fall / Chihuahua 'Joel'", +            'description': 'md5:e62cb6bf7c3cc669179d4f1eb279ad8d', +            'thumbnail': 're:^https?://.*\.jpg$', +            'timestamp': 1432408200, +            'upload_date': '20150523', +            'duration': 3092, +        }, +        'params': { +            # m3u8 download +            'skip_download': True, +        }, +    }] + +    def _real_extract(self, url): +        mobj = re.match(self._VALID_URL, url) +        display_id = mobj.group('id') +        station = mobj.group('station') + +        info = self._download_json( +            'https://api.nowtv.de/v3/movies/%s?fields=*,format,files,breakpoints,paymentPaytypes,trailers,pictures' % display_id, +            display_id) + +        video_id = compat_str(info['id']) + +        if info.get('geoblocked'): +            raise ExtractorError( +                'Video %s is not available from your location due to geo restriction' % video_id, +                expected=True) + +        f = info.get('format', {}) +        station = f.get('station') or station + +        STATIONS = { +            'rtl': 'rtlnow', +            'rtl2': 'rtl2now', +            'vox': 'voxnow', +            'nitro': 'rtlnitronow', +            'ntv': 'n-tvnow', +            'superrtl': 'superrtlnow' +        } + +        formats = [] +        for item in info['files']['items']: +            item_path = remove_start(item['path'], '/') +            tbr = int_or_none(item['bitrate']) +            m3u8_url = 'http://hls.fra.%s.de/hls-vod-enc/%s.m3u8' % (STATIONS[station], item_path) +            m3u8_url = m3u8_url.replace('now/', 'now/videos/') +            formats.append({ +                'url': m3u8_url, +                'format_id': '%s-%sk' % (item['id'], tbr), +                'ext': 'mp4', +                'tbr': tbr, +            }) +        self._sort_formats(formats) + +        title = info['title'] +        description = info.get('articleLong') or info.get('articleShort') +        timestamp = parse_iso8601(info.get('broadcastStartDate'), ' ') +        duration = parse_duration(info.get('duration')) +        thumbnail = f.get('defaultImage169Format') or f.get('defaultImage169Logo') + +        return { +            'id': video_id, +            'display_id': display_id, +            'title': title, +            'description': description, +            'thumbnail': thumbnail, +            'timestamp': timestamp, +            '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, -        } | 
