X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=youtube_dl%2Fextractor%2Fprosiebensat1.py;h=e4c4ad7145395c1805fa97c6f8e83024fa28fde8;hb=ad3bc6acd5d6724875b9fa59f9b5cdb9b904ec91;hp=564fa5d04cf821d9ff5d169b2a2f55f26240c675;hpb=aba3231de18dbb8cdfcc653cbba137844637e65e;p=youtube-dl diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py index 564fa5d04..e4c4ad714 100644 --- a/youtube_dl/extractor/prosiebensat1.py +++ b/youtube_dl/extractor/prosiebensat1.py @@ -8,8 +8,6 @@ from .common import InfoExtractor from ..utils import ( compat_urllib_parse, unified_strdate, - clean_html, - RegexNotFoundError, ) @@ -51,14 +49,14 @@ class ProSiebenSat1IE(InfoExtractor): 'skip': 'Seems to be broken', }, { - 'url': 'http://www.prosiebenmaxx.de/yep/one-piece/video/148-folge-48-gold-rogers-heimat-ganze-folge', + 'url': 'http://www.prosiebenmaxx.de/tv/experience/video/144-countdown-fuer-die-autowerkstatt-ganze-folge', 'info_dict': { - 'id': '2437108', + 'id': '2429369', 'ext': 'mp4', - 'title': 'Folge 48: Gold Rogers Heimat', - 'description': 'Ruffy erreicht die Insel, auf der der berühmte Gold Roger lebte und hingerichtet wurde.', - 'upload_date': '20140226', - 'duration': 1401.48, + 'title': 'Countdown für die Autowerkstatt', + 'description': 'md5:809fc051a457b5d8666013bc40698817', + 'upload_date': '20140223', + 'duration': 2595.04, }, 'params': { # rtmp download @@ -160,6 +158,7 @@ class ProSiebenSat1IE(InfoExtractor): _CLIPID_REGEXES = [ r'"clip_id"\s*:\s+"(\d+)"', r'clipid: "(\d+)"', + r'clipId=(\d+)', ] _TITLE_REGEXES = [ r'