X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fprosiebensat1.py;h=baa54a3afd10244ef2cda281c0785b24fe19e9cb;hb=a3372437bfe57f5b450bfdd60105bb6120595928;hp=0739234c6a0aa0eaffbd96ef3b4401d9200918bd;hpb=61be92e26a16e24a702c9c65b46f15c375726345;p=youtube-dl diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py index 0739234c6..baa54a3af 100644 --- a/youtube_dl/extractor/prosiebensat1.py +++ b/youtube_dl/extractor/prosiebensat1.py @@ -11,6 +11,7 @@ from ..compat import ( from ..utils import ( ExtractorError, determine_ext, + float_or_none, int_or_none, unified_strdate, ) @@ -19,7 +20,7 @@ from ..utils import ( class ProSiebenSat1IE(InfoExtractor): IE_NAME = 'prosiebensat1' IE_DESC = 'ProSiebenSat.1 Digital' - _VALID_URL = r'https?://(?:www\.)?(?:(?:prosieben|prosiebenmaxx|sixx|sat1|kabeleins|the-voice-of-germany)\.(?:de|at)|ran\.de|fem\.com)/(?P.+)' + _VALID_URL = r'https?://(?:www\.)?(?:(?:prosieben|prosiebenmaxx|sixx|sat1|kabeleins|the-voice-of-germany)\.(?:de|at|ch)|ran\.de|fem\.com)/(?P.+)' _TESTS = [ { @@ -230,7 +231,7 @@ class ProSiebenSat1IE(InfoExtractor): if video.get('is_protected') is True: raise ExtractorError('This video is DRM protected.', expected=True) - duration = float(video['duration']) + duration = float_or_none(video.get('duration')) source_ids = [source['id'] for source in video['sources']] source_ids_str = ','.join(map(str, source_ids))