From 94eb1f9229136e432246715498a19b85245ff3b1 Mon Sep 17 00:00:00 2001
From: Thomas Christlieb <thomaschristlieb@hotmail.com>
Date: Wed, 1 Feb 2017 10:06:10 +0100
Subject: [PATCH 1/9] Added new Regex for prosiebensat1 Extractor Description.
 Fixes #11810

---
 youtube_dl/extractor/prosiebensat1.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py
index 03e1b1f7f..9a7a07f52 100644
--- a/youtube_dl/extractor/prosiebensat1.py
+++ b/youtube_dl/extractor/prosiebensat1.py
@@ -349,6 +349,7 @@ class ProSiebenSat1IE(ProSiebenSat1BaseIE):
         r'<p class="att-description">\s*(.+?)\s*</p>',
         r'<p class="video-description" itemprop="description">\s*(.+?)</p>',
         r'<div[^>]+id="veeseoDescription"[^>]*>(.+?)</div>',
+        r'<meta property="og:description" content="(.*?)">',
     ]
     _UPLOAD_DATE_REGEXES = [
         r'<meta property="og:published_time" content="(.+?)">',

From b6449e98fe935ecaad06aef9de4db18134bdef68 Mon Sep 17 00:00:00 2001
From: Thomas Christlieb <thomaschristlieb@hotmail.com>
Date: Wed, 1 Feb 2017 10:54:29 +0100
Subject: [PATCH 2/9] Using _og_search_description() as a Fallback for
 Description-Regex

---
 youtube_dl/extractor/prosiebensat1.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py
index 9a7a07f52..2c25f61c9 100644
--- a/youtube_dl/extractor/prosiebensat1.py
+++ b/youtube_dl/extractor/prosiebensat1.py
@@ -342,15 +342,6 @@ class ProSiebenSat1IE(ProSiebenSat1BaseIE):
         r'<h2 class="video-title" itemprop="name">\s*(.+?)</h2>',
         r'<div[^>]+id="veeseoTitle"[^>]*>(.+?)</div>',
     ]
-    _DESCRIPTION_REGEXES = [
-        r'<p itemprop="description">\s*(.+?)</p>',
-        r'<div class="videoDecription">\s*<p><strong>Beschreibung</strong>: (.+?)</p>',
-        r'<div class="g-plusone" data-size="medium"></div>\s*</div>\s*</header>\s*(.+?)\s*<footer>',
-        r'<p class="att-description">\s*(.+?)\s*</p>',
-        r'<p class="video-description" itemprop="description">\s*(.+?)</p>',
-        r'<div[^>]+id="veeseoDescription"[^>]*>(.+?)</div>',
-        r'<meta property="og:description" content="(.*?)">',
-    ]
     _UPLOAD_DATE_REGEXES = [
         r'<meta property="og:published_time" content="(.+?)">',
         r'<span>\s*(\d{2}\.\d{2}\.\d{4} \d{2}:\d{2}) \|\s*<span itemprop="duration"',
@@ -375,8 +366,7 @@ 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._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))

From 3d8bd9b9197eba2a6fb91e2be65d083138567020 Mon Sep 17 00:00:00 2001
From: Thomas Christlieb <thomaschristlieb@hotmail.com>
Date: Wed, 1 Feb 2017 11:06:52 +0100
Subject: [PATCH 3/9] Using _og_search_description() as a Fallback for
 Description-Regex - Second try

---
 youtube_dl/extractor/prosiebensat1.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py
index 2c25f61c9..d248460cd 100644
--- a/youtube_dl/extractor/prosiebensat1.py
+++ b/youtube_dl/extractor/prosiebensat1.py
@@ -342,6 +342,14 @@ class ProSiebenSat1IE(ProSiebenSat1BaseIE):
         r'<h2 class="video-title" itemprop="name">\s*(.+?)</h2>',
         r'<div[^>]+id="veeseoTitle"[^>]*>(.+?)</div>',
     ]
+    _DESCRIPTION_REGEXES = [
+        r'<p itemprop="description">\s*(.+?)</p>',
+        r'<div class="videoDecription">\s*<p><strong>Beschreibung</strong>: (.+?)</p>',
+        r'<div class="g-plusone" data-size="medium"></div>\s*</div>\s*</header>\s*(.+?)\s*<footer>',
+        r'<p class="att-description">\s*(.+?)\s*</p>',
+        r'<p class="video-description" itemprop="description">\s*(.+?)</p>',
+        r'<div[^>]+id="veeseoDescription"[^>]*>(.+?)</div>',
+    ]
     _UPLOAD_DATE_REGEXES = [
         r'<meta property="og:published_time" content="(.+?)">',
         r'<span>\s*(\d{2}\.\d{2}\.\d{4} \d{2}:\d{2}) \|\s*<span itemprop="duration"',
@@ -367,6 +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._og_search_description(webpage, default=None)
+        if description is None: 
+            description = self._html_search_regex(
+                self._DESCRIPTION_REGEXES, webpage, 'description', fatal=False)
         thumbnail = self._og_search_thumbnail(webpage)
         upload_date = unified_strdate(self._html_search_regex(
             self._UPLOAD_DATE_REGEXES, webpage, 'upload date', default=None))

From 5037add13905806038faf2db6421cb30a29430cf Mon Sep 17 00:00:00 2001
From: Thomas Christlieb <thomaschristlieb@hotmail.com>
Date: Wed, 1 Feb 2017 11:08:36 +0100
Subject: [PATCH 4/9] Also added fallback regex

---
 youtube_dl/extractor/prosiebensat1.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py
index d248460cd..e9ceaae54 100644
--- a/youtube_dl/extractor/prosiebensat1.py
+++ b/youtube_dl/extractor/prosiebensat1.py
@@ -341,6 +341,7 @@ class ProSiebenSat1IE(ProSiebenSat1BaseIE):
         r'<header class="module_header">\s*<h2>([^<]+)</h2>\s*</header>',
         r'<h2 class="video-title" itemprop="name">\s*(.+?)</h2>',
         r'<div[^>]+id="veeseoTitle"[^>]*>(.+?)</div>',
+        r'<meta property="og:description" content="(.*?)">',
     ]
     _DESCRIPTION_REGEXES = [
         r'<p itemprop="description">\s*(.+?)</p>',

From 0042f61b07b6bc601b930adcdff7c081f0017b74 Mon Sep 17 00:00:00 2001
From: Thomas Christlieb <thomaschristlieb@hotmail.com>
Date: Wed, 1 Feb 2017 11:36:53 +0100
Subject: [PATCH 5/9] 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'<header class="module_header">\s*<h2>([^<]+)</h2>\s*</header>',
         r'<h2 class="video-title" itemprop="name">\s*(.+?)</h2>',
         r'<div[^>]+id="veeseoTitle"[^>]*>(.+?)</div>',
-        r'<meta property="og:description" content="(.*?)">',
     ]
     _DESCRIPTION_REGEXES = [
         r'<p itemprop="description">\s*(.+?)</p>',
@@ -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))

From ab98a3c0431bd94f5c57a19fd8491be915d25782 Mon Sep 17 00:00:00 2001
From: Thomas Christlieb <thomaschristlieb@hotmail.com>
Date: Wed, 1 Feb 2017 11:57:34 +0100
Subject: [PATCH 6/9] removed fatal=False from search for description regex.
 default=None should be preferred only

---
 youtube_dl/extractor/prosiebensat1.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py
index 90e46c41e..ed5b29133 100644
--- a/youtube_dl/extractor/prosiebensat1.py
+++ b/youtube_dl/extractor/prosiebensat1.py
@@ -375,7 +375,7 @@ 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', default=None, fatal=False)
+            self._DESCRIPTION_REGEXES, webpage, 'description', default=None)
         if description is None: 
             description = self._og_search_description(webpage, default=None)
         thumbnail = self._og_search_thumbnail(webpage)

From 2b7e123f9d0f2bd6ada54fa8e4e6035fece5dbf4 Mon Sep 17 00:00:00 2001
From: Thomas Christlieb <thomaschristlieb@hotmail.com>
Date: Wed, 1 Feb 2017 15:46:13 +0100
Subject: [PATCH 7/9] Using fatal=false for _og_search_description

---
 youtube_dl/extractor/prosiebensat1.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py
index ed5b29133..54e9d1cd6 100644
--- a/youtube_dl/extractor/prosiebensat1.py
+++ b/youtube_dl/extractor/prosiebensat1.py
@@ -377,7 +377,7 @@ class ProSiebenSat1IE(ProSiebenSat1BaseIE):
         description = self._html_search_regex(
             self._DESCRIPTION_REGEXES, webpage, 'description', default=None)
         if description is None: 
-            description = self._og_search_description(webpage, default=None)
+            description = self._og_search_description(webpage, fatal=False)
         thumbnail = self._og_search_thumbnail(webpage)
         upload_date = unified_strdate(self._html_search_regex(
             self._UPLOAD_DATE_REGEXES, webpage, 'upload date', default=None))

From ec41e59734514b661ce7c72c4ae9dedbda37c255 Mon Sep 17 00:00:00 2001
From: Thomas Christlieb <thomaschristlieb@hotmail.com>
Date: Wed, 1 Feb 2017 15:52:04 +0100
Subject: [PATCH 8/9] Revert "Using fatal=false for _og_search_description"

This reverts commit 2b7e123f9d0f2bd6ada54fa8e4e6035fece5dbf4.
---
 youtube_dl/extractor/prosiebensat1.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py
index 54e9d1cd6..ed5b29133 100644
--- a/youtube_dl/extractor/prosiebensat1.py
+++ b/youtube_dl/extractor/prosiebensat1.py
@@ -377,7 +377,7 @@ class ProSiebenSat1IE(ProSiebenSat1BaseIE):
         description = self._html_search_regex(
             self._DESCRIPTION_REGEXES, webpage, 'description', default=None)
         if description is None: 
-            description = self._og_search_description(webpage, 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))

From f36b7fa3a42a09823155e5ccf88cfccec0ed68c7 Mon Sep 17 00:00:00 2001
From: Thomas Christlieb <thomaschristlieb@hotmail.com>
Date: Wed, 1 Feb 2017 15:53:33 +0100
Subject: [PATCH 9/9] Deleted default=None Parameter for _og_search_property

---
 youtube_dl/extractor/prosiebensat1.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py
index ed5b29133..6856bacaf 100644
--- a/youtube_dl/extractor/prosiebensat1.py
+++ b/youtube_dl/extractor/prosiebensat1.py
@@ -377,7 +377,7 @@ class ProSiebenSat1IE(ProSiebenSat1BaseIE):
         description = self._html_search_regex(
             self._DESCRIPTION_REGEXES, webpage, 'description', default=None)
         if description is None: 
-            description = self._og_search_description(webpage, default=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))