aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--youtube_dl/downloader/rtmp.py8
-rw-r--r--youtube_dl/extractor/rtl2.py114
2 files changed, 64 insertions, 58 deletions
diff --git a/youtube_dl/downloader/rtmp.py b/youtube_dl/downloader/rtmp.py
index 6dbbc053c..6f7ad588e 100644
--- a/youtube_dl/downloader/rtmp.py
+++ b/youtube_dl/downloader/rtmp.py
@@ -104,7 +104,8 @@ class RtmpFD(FileDownloader):
live = info_dict.get('rtmp_live', False)
conn = info_dict.get('rtmp_conn', None)
protocol = info_dict.get('rtmp_protocol', None)
-
+ no_resume = info_dict.get('no_resume', False)
+
self.report_destination(filename)
tmpfilename = self.temp_name(filename)
test = self.params.get('test', False)
@@ -141,7 +142,10 @@ class RtmpFD(FileDownloader):
basic_args += ['--conn', conn]
if protocol is not None:
basic_args += ['--protocol', protocol]
- args = basic_args + [[], ['--resume', '--skip', '1']][not live and self.params.get('continuedl', False)]
+ if not no_resume:
+ basic_args += ['--resume']
+
+ args = basic_args + [[], ['--skip', '1']][not live and self.params.get('continuedl', False)]
if sys.platform == 'win32' and sys.version_info < (3, 0):
# Windows subprocess module does not actually support Unicode
diff --git a/youtube_dl/extractor/rtl2.py b/youtube_dl/extractor/rtl2.py
index 2bdbf2ec2..14b45e86e 100644
--- a/youtube_dl/extractor/rtl2.py
+++ b/youtube_dl/extractor/rtl2.py
@@ -16,83 +16,85 @@ from ..utils import (
class RTL2IE(InfoExtractor):
"""Information Extractor for RTL NOW, RTL2 NOW, RTL NITRO, SUPER RTL NOW, VOX NOW and n-tv NOW"""
_VALID_URL = r'http?://(?P<url>(?P<domain>(www\.)?rtl2\.de)/.*/(?P<video_id>.*))'
- _TEST = {
- 'url': 'http://www.rtl2.de/sendung/grip-das-motormagazin/folge/folge-203-0',
- 'md5': 'dsadasdada',
- 'info_dict': {
- 'id': 'folge-203-0',
- 'ext': 'f4v',
- 'title': 'GRIP sucht den Sommerk\xf6nig',
- 'description' : 'Matthias, Det und Helge treten gegeneinander an.'
- # TODO more properties, either as:
- # * A value
- # * MD5 checksum; start the string with md5:
- # * A regular expression; start the string with re:
- # * Any Python type (for example int or float)
+ _TESTS = [{
+ 'url': 'http://www.rtl2.de/sendung/grip-das-motormagazin/folge/folge-203-0',
+ 'info_dict': {
+ 'id': 'folge-203-0',
+ 'ext': 'f4v',
+ 'title': 'GRIP sucht den Sommerk\xf6nig',
+ 'description' : 'Matthias, Det und Helge treten gegeneinander an.'
+ },
+ 'params': {
+ # rtmp download
+ #'skip_download': True,
+ },
},
- #'params': {
+ {
+ 'url': 'http://www.rtl2.de/sendung/koeln-50667/video/5512-anna/21040-anna-erwischt-alex/',
+ 'info_dict': {
+ 'id': '21040-anna-erwischt-alex',
+ 'ext': 'f4v',
+ 'title': 'GRIP sucht den Sommerk\xf6nig',
+ 'description' : 'Matthias, Det und Helge treten gegeneinander an.'
+ },
+ 'params': {
# rtmp download
- # 'skip_download': True,
- #},
- }
+ #'skip_download': 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)
- vico_id = self._html_search_regex(r'vico_id: ([0-9]+)', webpage, '%s');
- vivi_id = self._html_search_regex(r'vivi_id: ([0-9]+)', webpage, '%s');
-
- 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, '')
+ vico_id = self._html_search_regex(r'vico_id\s*:\s*([0-9]+)', webpage, '%s');
+ vivi_id = self._html_search_regex(r'vivi_id\s*:\s*([0-9]+)', webpage, '%s');
- video_info = json.loads(webpage.decode("latin1"))
- print video_info
+ 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, '')
+ video_info = json.loads(webpage)
- #self._download_webpage('http://cp108781.edgefcs.net/crossdomain.xml', '')
+ download_url = video_info["video"]["streamurl"] # self._html_search_regex(r'streamurl\":\"(.*?)\"', webpage, '%s');
+ title = video_info["video"]["titel"] # self._html_search_regex(r'titel\":\"(.*?)\"', webpage, '%s');
+ description = video_info["video"]["beschreibung"] # self._html_search_regex(r'beschreibung\":\"(.*?)\"', webpage, '%s');
+ #ext = self._html_search_regex(r'streamurl\":\".*?(\..{2,4})\"', webpage, '%s');
- download_url = video_info["video"]["streamurl"] # self._html_search_regex(r'streamurl\":\"(.*?)\"', webpage, '%s');
- title = video_info["video"]["titel"] # self._html_search_regex(r'titel\":\"(.*?)\"', webpage, '%s');
- description = video_info["video"]["beschreibung"] # self._html_search_regex(r'beschreibung\":\"(.*?)\"', webpage, '%s');
- #ext = self._html_search_regex(r'streamurl\":\".*?(\..{2,4})\"', webpage, '%s');
+ thumbnail = video_info["video"]["image"]
- thumbnail = video_info["video"]["image"]
+ download_url = download_url.replace("\\", "")
- download_url = download_url.replace("\\", "")
+ stream_url = 'mp4:' + self._html_search_regex(r'ondemand/(.*)', download_url, '%s')
- stream_url = 'mp4:' + self._html_search_regex(r'ondemand/(.*)', download_url, '%s');
+ #print(download_url)
+ #print(stream_url)
+ #print(title)
+ #print(description)
+ #print(video_id)
+
+ formats = []
- #upload_date = self._html_search_regex(r'property=\"dc:date\".*?datatype=\"xsd:dateTime\".*?content=\"(.*?)\"', webpage, 'title')
- #download_url += " -y " + stream_url
-
- #print stream_url
- #print download_url
- #print description
- #print title
- #print ext
-
- formats = []
-
- fmt = {
- 'url' : download_url,
- #'app': 'ondemand?_fcs_vhost=cp108781.edgefcs.net',
- 'play_path': stream_url,
- #'player_url': 'http://www.cbsnews.com/[[IMPORT]]/vidtech.cbsinteractive.com/player/3_3_0/CBSI_PLAYER_HD.swf',
- #'page_url': 'http://www.cbsnews.com',
- #'ext': ext,
+ fmt = {
+ 'url' : download_url,
+ #'app': 'ondemand?_fcs_vhost=cp108781.edgefcs.net',
+ 'play_path': stream_url,
+ 'player_url': 'http://www.rtl2.de/flashplayer/vipo_player.swf',
+ 'page_url': url,
+ 'flash_version' : "LNX 11,2,202,429",
+ 'rtmp_conn' : ["S:connect", "O:1", "NS:pageUrl:" + url, "NB:fpad:0", "NN:videoFunction:1", "O:0"],
+ 'no_resume' : 1,
}
- formats.append(fmt)
-
+ formats.append(fmt)
return {
- 'id': video_id,
+ 'id': video_id,
'title': title,
- 'thumbnail' : thumbnail,
- 'description' : description,
+ 'thumbnail' : thumbnail,
+ 'description' : description,
'formats': formats,
}
generated by cgit v1.2.3 (git 2.26.2) at 2024-10-01 15:02:13 +0000