]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Added new Regex for prosiebensat1 Extractor Description. Fixes #11810 (#11929)
authorThomas Christlieb <thomaschristlieb@hotmail.com>
Wed, 1 Feb 2017 15:00:41 +0000 (16:00 +0100)
committerYen Chi Hsuan <yan12125@gmail.com>
Wed, 1 Feb 2017 15:00:41 +0000 (23:00 +0800)
* Added new Regex for prosiebensat1 Extractor Description. Fixes #11810

* Using _og_search_description() as a Fallback for Description-Regex

* Using _og_search_description() as a Fallback for Description-Regex - Second try

* Also added fallback regex

* Using _og_search_description() as a Fallback for Description-Regex - Third try

* removed fatal=False from search for description regex. default=None should be preferred only

* Using fatal=false for _og_search_description

* Revert "Using fatal=false for _og_search_description"

This reverts commit 2b7e123f9d0f2bd6ada54fa8e4e6035fece5dbf4.

* Deleted default=None Parameter for _og_search_property

youtube_dl/extractor/prosiebensat1.py

index 03e1b1f7f3a8ee2668516c4a70ffcde070ae3716..6856bacaf98b6b845db60c8b8c64cb01ba6d8507 100644 (file)
@@ -375,7 +375,9 @@ class ProSiebenSat1IE(ProSiebenSat1BaseIE):
         title = self._html_search_regex(self._TITLE_REGEXES, webpage, 'title')
         info = self._extract_video_info(url, clip_id)
         description = self._html_search_regex(
-            self._DESCRIPTION_REGEXES, webpage, 'description', fatal=False)
+            self._DESCRIPTION_REGEXES, webpage, 'description', default=None)
+        if description is None: 
+            description = self._og_search_description(webpage)
         thumbnail = self._og_search_thumbnail(webpage)
         upload_date = unified_strdate(self._html_search_regex(
             self._UPLOAD_DATE_REGEXES, webpage, 'upload date', default=None))