From: Sergey M․ Date: Thu, 14 Jan 2016 16:45:09 +0000 (+0600) Subject: [prosiebensat1] Fix some extraction and update tests X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=81549898c00a6f12eff4786f3e42e1a53e70c97c;p=youtube-dl [prosiebensat1] Fix some extraction and update tests --- diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py index 953df3efc..670e6950f 100644 --- a/youtube_dl/extractor/prosiebensat1.py +++ b/youtube_dl/extractor/prosiebensat1.py @@ -32,7 +32,7 @@ class ProSiebenSat1IE(InfoExtractor): 'url': 'http://www.prosieben.de/tv/circus-halligalli/videos/218-staffel-2-episode-18-jahresrueckblick-ganze-folge', 'info_dict': { 'id': '2104602', - 'ext': 'mp4', + 'ext': 'flv', 'title': 'Episode 18 - Staffel 2', 'description': 'md5:8733c81b702ea472e069bc48bb658fc1', 'upload_date': '20131231', @@ -138,14 +138,13 @@ class ProSiebenSat1IE(InfoExtractor): 'url': 'http://www.the-voice-of-germany.de/video/31-andreas-kuemmert-rocket-man-clip', 'info_dict': { 'id': '2572814', - 'ext': 'mp4', + 'ext': 'flv', 'title': 'Andreas Kümmert: Rocket Man', 'description': 'md5:6ddb02b0781c6adf778afea606652e38', 'upload_date': '20131017', 'duration': 469.88, }, 'params': { - # rtmp download 'skip_download': True, }, }, @@ -153,13 +152,12 @@ class ProSiebenSat1IE(InfoExtractor): 'url': 'http://www.fem.com/wellness/videos/wellness-video-clip-kurztripps-zum-valentinstag.html', 'info_dict': { 'id': '2156342', - 'ext': 'mp4', + 'ext': 'flv', 'title': 'Kurztrips zum Valentinstag', - 'description': 'Romantischer Kurztrip zum Valentinstag? Wir verraten, was sich hier wirklich lohnt.', + 'description': 'Romantischer Kurztrip zum Valentinstag? Nina Heinemann verrät, was sich hier wirklich lohnt.', 'duration': 307.24, }, 'params': { - # rtmp download 'skip_download': True, }, }, @@ -182,7 +180,6 @@ class ProSiebenSat1IE(InfoExtractor): 'upload_date': '20151229', }, 'params': { - # rtmp download 'skip_download': True, }, }, @@ -192,6 +189,7 @@ class ProSiebenSat1IE(InfoExtractor): r'"clip_id"\s*:\s+"(\d+)"', r'clipid: "(\d+)"', r'clip[iI]d=(\d+)', + r'clip[iI]d\s*=\s*["\'](\d+)', r"'itemImageUrl'\s*:\s*'/dynamic/thumbnails/full/\d+/(\d+)", ] _TITLE_REGEXES = [ @@ -201,6 +199,7 @@ class ProSiebenSat1IE(InfoExtractor): r'

\s*(.+?)

', r'
\s*

([^<]+)

\s*
', r'

\s*(.+?)

', + r']+id="veeseoTitle"[^>]*>(.+?)', ] _DESCRIPTION_REGEXES = [ r'

\s*(.+?)

', @@ -208,6 +207,7 @@ class ProSiebenSat1IE(InfoExtractor): r'
\s*\s*\s*(.+?)\s*