From 0042f61b07b6bc601b930adcdff7c081f0017b74 Mon Sep 17 00:00:00 2001 From: Thomas Christlieb Date: Wed, 1 Feb 2017 11:36:53 +0100 Subject: [PATCH] Using _og_search_description() as a Fallback for Description-Regex - Third try --- youtube_dl/extractor/prosiebensat1.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py index e9ceaae54..90e46c41e 100644 --- a/youtube_dl/extractor/prosiebensat1.py +++ b/youtube_dl/extractor/prosiebensat1.py @@ -341,7 +341,6 @@ class ProSiebenSat1IE(ProSiebenSat1BaseIE): r'
\s*

([^<]+)

\s*
', r'

\s*(.+?)

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

\s*(.+?)

', @@ -375,10 +374,10 @@ class ProSiebenSat1IE(ProSiebenSat1BaseIE): self._CLIPID_REGEXES, webpage, 'clip id') title = self._html_search_regex(self._TITLE_REGEXES, webpage, 'title') info = self._extract_video_info(url, clip_id) - description = self._og_search_description(webpage, default=None) + description = self._html_search_regex( + self._DESCRIPTION_REGEXES, webpage, 'description', default=None, fatal=False) if description is None: - description = self._html_search_regex( - self._DESCRIPTION_REGEXES, webpage, 'description', fatal=False) + description = self._og_search_description(webpage, default=None) thumbnail = self._og_search_thumbnail(webpage) upload_date = unified_strdate(self._html_search_regex( self._UPLOAD_DATE_REGEXES, webpage, 'upload date', default=None))