Revert "pull changes from remote master (#190)" (#193)

[yt-dlp.git] / youtube_dl / extractor / telecinco.py

diff --git a/youtube_dl/extractor/telecinco.py b/youtube_dl/extractor/telecinco.py
index 9ba3da341dac65d18a599a790bff9c95b0e52eb8..d37e1b0557cf3ba241a25e7e56d28c8dc679b1d0 100644 (file)
--- a/youtube_dl/extractor/telecinco.py
+++ b/youtube_dl/extractor/telecinco.py
@@ -11,7 +11,6 @@
     determine_ext,
     int_or_none,
     str_or_none,
-    try_get,
     urljoin,
 )
 
@@ -25,7 +24,7 @@ class TelecincoIE(InfoExtractor):
         'info_dict': {
             'id': '1876350223',
             'title': 'Bacalao con kokotxas al pil-pil',
-            'description': 'md5:716caf5601e25c3c5ab6605b1ae71529',
+            'description': 'md5:1382dacd32dd4592d478cbdca458e5bb',
         },
         'playlist': [{
             'md5': 'adb28c37238b675dad0f042292f209a7',
@@ -56,26 +55,6 @@ class TelecincoIE(InfoExtractor):
             'description': 'md5:2771356ff7bfad9179c5f5cd954f1477',
             'duration': 50,
         },
-    }, {
-        # video in opening's content
-        'url': 'https://www.telecinco.es/vivalavida/fiorella-sobrina-edmundo-arrocet-entrevista_18_2907195140.html',
-        'info_dict': {
-            'id': '2907195140',
-            'title': 'La surrealista entrevista a la sobrina de Edmundo Arrocet: "No puedes venir aquí y tomarnos por tontos"',
-            'description': 'md5:73f340a7320143d37ab895375b2bf13a',
-        },
-        'playlist': [{
-            'md5': 'adb28c37238b675dad0f042292f209a7',
-            'info_dict': {
-                'id': 'TpI2EttSDAReWpJ1o0NVh2',
-                'ext': 'mp4',
-                'title': 'La surrealista entrevista a la sobrina de Edmundo Arrocet: "No puedes venir aquí y tomarnos por tontos"',
-                'duration': 1015,
-            },
-        }],
-        'params': {
-            'skip_download': True,
-        },
     }, {
         'url': 'http://www.telecinco.es/informativos/nacional/Pablo_Iglesias-Informativos_Telecinco-entrevista-Pedro_Piqueras_2_1945155182.html',
         'only_matching': True,
@@ -156,28 +135,17 @@ def _real_extract(self, url):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
         article = self._parse_json(self._search_regex(
-            r'window\.\$REACTBASE_STATE\.article(?:_multisite)?\s*=\s*({.+})',
+            r'window\.\$REACTBASE_STATE\.article\s*=\s*({.+})',
             webpage, 'article'), display_id)['article']
         title = article.get('title')
-        description = clean_html(article.get('leadParagraph')) or ''
+        description = clean_html(article.get('leadParagraph'))
         if article.get('editorialType') != 'VID':
             entries = []
-            body = [article.get('opening')]
-            body.extend(try_get(article, lambda x: x['body'], list) or [])
-            for p in body:
-                if not isinstance(p, dict):
-                    continue
+            for p in article.get('body', []):
                 content = p.get('content')
-                if not content:
-                    continue
-                type_ = p.get('type')
-                if type_ == 'paragraph':
-                    content_str = str_or_none(content)
-                    if content_str:
-                        description += content_str
+                if p.get('type') != 'video' or not content:
                     continue
-                if type_ == 'video' and isinstance(content, dict):
-                    entries.append(self._parse_content(content, url))
+                entries.append(self._parse_content(content, url))
             return self.playlist_result(
                 entries, str_or_none(article.get('id')), title, description)
         content = article['opening']['content']