[rtl2] PEP8, simplify, make rtmp tests run (#470)

This commit is contained in:
Philipp Hagemeister 2015-01-25 18:09:48 +01:00
parent c9326b38b8
commit 3dee7826e7
3 changed files with 57 additions and 79 deletions

View File

@ -105,7 +105,8 @@ class RtmpFD(FileDownloader):
conn = info_dict.get('rtmp_conn', None) conn = info_dict.get('rtmp_conn', None)
protocol = info_dict.get('rtmp_protocol', None) protocol = info_dict.get('rtmp_protocol', None)
no_resume = info_dict.get('no_resume', False) no_resume = info_dict.get('no_resume', False)
continue_dl = info_dict.get('continuedl', False)
self.report_destination(filename) self.report_destination(filename)
tmpfilename = self.temp_name(filename) tmpfilename = self.temp_name(filename)
test = self.params.get('test', False) test = self.params.get('test', False)
@ -142,10 +143,12 @@ class RtmpFD(FileDownloader):
basic_args += ['--conn', conn] basic_args += ['--conn', conn]
if protocol is not None: if protocol is not None:
basic_args += ['--protocol', protocol] basic_args += ['--protocol', protocol]
if not no_resume:
basic_args += ['--resume'] args = basic_args
if not no_resume and continue_dl and not live:
args = basic_args + [[], ['--skip', '1']][not live and self.params.get('continuedl', False)] args += ['--resume']
if not live and continue_dl:
args += ['--skip', '1']
if sys.platform == 'win32' and sys.version_info < (3, 0): if sys.platform == 'win32' and sys.version_info < (3, 0):
# Windows subprocess module does not actually support Unicode # Windows subprocess module does not actually support Unicode

View File

@ -114,8 +114,11 @@ class InfoExtractor(object):
* http_post_data Additional data to send with a POST * http_post_data Additional data to send with a POST
request. request.
* stretched_ratio If given and not 1, indicates that the * stretched_ratio If given and not 1, indicates that the
video's pixels are not square. video's pixels are not square.
width : height ratio as float. width : height ratio as float.
* no_resume The server does not support resuming the
(HTTP or RTMP) download. Boolean.
url: Final video URL. url: Final video URL.
ext: Video filename extension. ext: Video filename extension.
format: The video format, defaults to ext (used for --get-format) format: The video format, defaults to ext (used for --get-format)

View File

@ -1,100 +1,72 @@
# encoding: utf-8 # encoding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import (
ExtractorError,
clean_html,
unified_strdate,
int_or_none,
)
class RTL2IE(InfoExtractor): class RTL2IE(InfoExtractor):
"""Information Extractor for RTL2""" _VALID_URL = r'http?://(?:www\.)?rtl2\.de/[^?#]*?/(?P<id>[^?#/]*?)(?:$|/(?:$|[?#]))'
_VALID_URL = r'http?://(?P<url>(?P<domain>(www\.)?rtl2\.de)/.*/(?P<video_id>.*))/'
_TESTS = [{ _TESTS = [{
'url': 'http://www.rtl2.de/sendung/grip-das-motormagazin/folge/folge-203-0', 'url': 'http://www.rtl2.de/sendung/grip-das-motormagazin/folge/folge-203-0',
'info_dict': { 'md5': 'bfcc179030535b08dc2b36b469b5adc7',
'id': 'folge-203-0', 'info_dict': {
'ext': 'f4v', 'id': 'folge-203-0',
'title': 'GRIP sucht den Sommerkönig', 'ext': 'f4v',
'description' : 'Matthias, Det und Helge treten gegeneinander an.' 'title': 'GRIP sucht den Sommerkönig',
}, 'description': 'Matthias, Det und Helge treten gegeneinander an.'
'params': {
# rtmp download
'skip_download': True,
},
}, },
{ }, {
'url': 'http://www.rtl2.de/sendung/koeln-50667/video/5512-anna/21040-anna-erwischt-alex/', 'url': 'http://www.rtl2.de/sendung/koeln-50667/video/5512-anna/21040-anna-erwischt-alex/',
'info_dict': { 'md5': 'ffcd517d2805b57ce11a58a2980c2b02',
'id': '21040-anna-erwischt-alex', 'info_dict': {
'ext': 'mp4', 'id': '21040-anna-erwischt-alex',
'title': 'Anna erwischt Alex!', 'ext': 'mp4',
'description' : 'Anna ist Alex\' Tochter bei Köln 50667.' 'title': 'Anna erwischt Alex!',
}, 'description': 'Anna ist Alex\' Tochter bei Köln 50667.'
'params': {
# rtmp download
'skip_download': True,
},
}, },
] }]
def _real_extract(self, url): def _real_extract(self, url):
# Some rtl2 urls have no slash at the end, so append it.
#Some rtl2 urls have no slash at the end, so append it. if not url.endswith('/'):
if not url.endswith("/"):
url += '/' url += '/'
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('video_id')
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
vico_id = self._html_search_regex(r'vico_id\s*:\s*([0-9]+)', webpage, 'vico_id not found'); vico_id = self._html_search_regex(
vivi_id = self._html_search_regex(r'vivi_id\s*:\s*([0-9]+)', webpage, 'vivi_id not found'); r'vico_id\s*:\s*([0-9]+)', webpage, 'vico_id')
vivi_id = self._html_search_regex(
r'vivi_id\s*:\s*([0-9]+)', webpage, 'vivi_id')
info_url = 'http://www.rtl2.de/video/php/get_video.php?vico_id=' + vico_id + '&vivi_id=' + vivi_id info_url = 'http://www.rtl2.de/video/php/get_video.php?vico_id=' + vico_id + '&vivi_id=' + vivi_id
webpage = self._download_webpage(info_url, '') webpage = self._download_webpage(info_url, '')
video_info = self._download_json(info_url, video_id) info = self._download_json(info_url, video_id)
video_info = info['video']
title = video_info['titel']
description = video_info.get('beschreibung')
thumbnail = video_info.get('image')
download_url = video_info["video"]["streamurl"] download_url = video_info['streamurl']
title = video_info["video"]["titel"] download_url = download_url.replace('\\', '')
description = video_info["video"]["beschreibung"] stream_url = 'mp4:' + self._html_search_regex(r'ondemand/(.*)', download_url, 'stream URL')
rtmp_conn = ["S:connect", "O:1", "NS:pageUrl:" + url, "NB:fpad:0", "NN:videoFunction:1", "O:0"]
thumbnail = video_info["video"]["image"]
download_url = download_url.replace("\\", "")
stream_url = 'mp4:' + self._html_search_regex(r'ondemand/(.*)', download_url, '%s')
#Debug output
#print('URL: ' + url)
#print('DL URL: ' + download_url)
#print('Stream URL: ' + stream_url)
#print('Title: ' + title)
#print('Description: '+ description)
#print('Video ID: ' + video_id)
formats = [{ formats = [{
'url' : download_url, 'url': download_url,
#'app': 'ondemand?_fcs_vhost=cp108781.edgefcs.net', 'play_path': stream_url,
'play_path': stream_url, 'player_url': 'http://www.rtl2.de/flashplayer/vipo_player.swf',
'player_url': 'http://www.rtl2.de/flashplayer/vipo_player.swf', 'page_url': url,
'page_url': url, 'flash_version': 'LNX 11,2,202,429',
'flash_version' : "LNX 11,2,202,429", 'rtmp_conn': rtmp_conn,
'rtmp_conn' : ["S:connect", "O:1", "NS:pageUrl:" + url, "NB:fpad:0", "NN:videoFunction:1", "O:0"], 'no_resume': True,
'no_resume' : True, }]
}] self._sort_formats(formats)
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'thumbnail' : thumbnail, 'thumbnail': thumbnail,
'description' : description, 'description': description,
'formats': formats, 'formats': formats,
} }