Merge a4759ae8ea into c5098961b0

Based on yt-dlp/yt-dlp 051d6b4 merging [extractor/arte] yt-dlp/yt-dlp#3302: Move to v2 API

Authored by: fstirlitz, pukkandan

youtube_dl/extractor/arte.py

@@ -4,208 +4,272 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
-from ..compat import (
+from ..compat import compat_str
-    compat_str,
-    compat_urlparse,
-)
 from ..utils import (
     ExtractorError,
+    GeoRestrictedError,
     int_or_none,
-    qualities,
+    merge_dicts,
+    parse_iso8601,
+    parse_qs,
     strip_or_none,
-    try_get,
+    traverse_obj,
-    unified_strdate,
     url_or_none,
+    urljoin,
 )
 
 
 class ArteTVBaseIE(InfoExtractor):
     _ARTE_LANGUAGES = 'fr|de|en|es|it|pl'
-    _API_BASE = 'https://api.arte.tv/api/player/v1'
+    _API_BASE = 'https://api.arte.tv/api/player/v2'
+
+    # yt-dlp shims
+
+    @classmethod
+    def _match_valid_url(cls, url):
+        return re.match(cls._VALID_URL, url)
+
+    def _extract_m3u8_formats_and_subtitles(self, *args, **kwargs):
+        return self._extract_m3u8_formats(*args, **kwargs), {}
 
 
 class ArteTVIE(ArteTVBaseIE):
     _VALID_URL = r'''(?x)
-                    https?://
+                    (?:https?://
                         (?:
                             (?:www\.)?arte\.tv/(?P<lang>%(langs)s)/videos|
                             api\.arte\.tv/api/player/v\d+/config/(?P<lang_2>%(langs)s)
                         )
-                        /(?P<id>\d{6}-\d{3}-[AF])
+                    |arte://program)
+                        /(?P<id>\d{6}-\d{3}-[AF]|LIVE)
                     ''' % {'langs': ArteTVBaseIE._ARTE_LANGUAGES}
     _TESTS = [{
         'url': 'https://www.arte.tv/en/videos/088501-000-A/mexico-stealing-petrol-to-survive/',
-        'info_dict': {
+        'only_matching': True,
-            'id': '088501-000-A',
-            'ext': 'mp4',
-            'title': 'Mexico: Stealing Petrol to Survive',
-            'upload_date': '20190628',
-        },
     }, {
         'url': 'https://www.arte.tv/pl/videos/100103-000-A/usa-dyskryminacja-na-porodowce/',
-        'only_matching': True,
+        'info_dict': {
+            'id': '100103-000-A',
+            'title': 'USA: Dyskryminacja na porodówce',
+            'description': 'md5:242017b7cce59ffae340a54baefcafb1',
+            'alt_title': 'ARTE Reportage',
+            'timestamp': 1604417980,
+            'upload_date': '20201103',
+            'duration': 554,
+            # test format sort
+            'height': 720,
+            'thumbnail': r're:https://api-cdn\.arte\.tv/.+940x530',
+            'ext': 'mp4',
+        },
+        'params': {
+            'format': 'bestvideo',
+            'skip_download': 'm3u8',
+        },
+    }, {
+        'note': 'No alt_title',
+        'url': 'https://www.arte.tv/fr/videos/110371-000-A/la-chaleur-supplice-des-arbres-de-rue/',
+        'info_dict': {
+            'id': '110371-000-A',
+            'ext': 'mp4',
+            'upload_date': '20220718',
+            'duration': 154,
+            'timestamp': 1658162460,
+            'description': 'md5:5890f36fe7dccfadb8b7c0891de54786',
+            'title': 'La chaleur, supplice des arbres de rue',
+            'thumbnail': 'https://api-cdn.arte.tv/img/v2/image/CPE2sQDtD8GLQgt8DuYHLf/940x530',
+        },
+        'params': {
+            'format': 'bestvideo',
+            'skip_download': 'm3u8',
+        },
     }, {
         'url': 'https://api.arte.tv/api/player/v2/config/de/100605-013-A',
         'only_matching': True,
+    }, {
+        'url': 'https://api.arte.tv/api/player/v2/config/de/LIVE',
+        'only_matching': True,
     }]
 
+    _GEO_BYPASS = True
+
+    _LANG_MAP = {  # ISO639 -> French abbreviations
+        'r': 'F',
+        'de': 'A',
+        'en': 'E[ANG]',
+        'es': 'E[ESP]',
+        'it': 'E[ITA]',
+        'pl': 'E[POL]',
+        # XXX: probably means mixed; <https://www.arte.tv/en/videos/107710-029-A/dispatches-from-ukraine-local-journalists-report/>
+        # uses this code for audio that happens to be in Ukrainian, but the manifest uses the ISO code 'mul' (mixed)
+        'mul': 'EU',
+    }
+
+    _VERSION_CODE_RE = re.compile(r'''(?x)
+        V
+        (?P<original_voice>O?)
+        (?P<vlang>[FA]|E\[[A-Z]+\]|EU)?
+        (?P<audio_desc>AUD|)
+        (?:
+            (?P<has_sub>-ST)
+            (?P<sdh_sub>M?)
+            (?P<sub_lang>[FA]|E\[[A-Z]+\]|EU)
+        )?
+    ''')
+
+    # all obtained by exhaustive testing
+    _COUNTRIES_MAP = {
+        'DE_FR': (
+            'BL', 'DE', 'FR', 'GF', 'GP', 'MF', 'MQ', 'NC',
+            'PF', 'PM', 'RE', 'WF', 'YT',
+        ),
+        # with both of the below 'BE' sometimes works, sometimes doesn't
+        'EUR_DE_FR': (
+            'AT', 'BL', 'CH', 'DE', 'FR', 'GF', 'GP', 'LI',
+            'MC', 'MF', 'MQ', 'NC', 'PF', 'PM', 'RE', 'WF',
+            'YT',
+        ),
+        'SAT': (
+            'AD', 'AT', 'AX', 'BG', 'BL', 'CH', 'CY', 'CZ',
+            'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GB', 'GF',
+            'GR', 'HR', 'HU', 'IE', 'IS', 'IT', 'KN', 'LI',
+            'LT', 'LU', 'LV', 'MC', 'MF', 'MQ', 'MT', 'NC',
+            'NL', 'NO', 'PF', 'PL', 'PM', 'PT', 'RE', 'RO',
+            'SE', 'SI', 'SK', 'SM', 'VA', 'WF', 'YT',
+        ),
+    }
+
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
+        mobj = self._match_valid_url(url)
         video_id = mobj.group('id')
         lang = mobj.group('lang') or mobj.group('lang_2')
+        language_code = self._LANG_MAP.get(lang)
 
-        info = self._download_json(
+        config = self._download_json('{0}/config/{1}/{2}'.format(self._API_BASE, lang, video_id), video_id)
-            '%s/config/%s/%s' % (self._API_BASE, lang, video_id), video_id)
-        player_info = info['videoJsonPlayer']
 
-        vsr = try_get(player_info, lambda x: x['VSR'], dict)
+        geoblocking = traverse_obj(config, ('data', 'attributes', 'restriction', 'geoblocking')) or {}
-        if not vsr:
+        if geoblocking.get('restrictedArea'):
-            error = None
+            raise GeoRestrictedError('Video restricted to {0!r}'.format(geoblocking['code']),
-            if try_get(player_info, lambda x: x['custom_msg']['type']) == 'error':
+                                     countries=self._COUNTRIES_MAP.get(geoblocking['code'], ('DE', 'FR')))
-                error = try_get(
-                    player_info, lambda x: x['custom_msg']['msg'], compat_str)
-            if not error:
-                error = 'Video %s is not available' % player_info.get('VID') or video_id
-            raise ExtractorError(error, expected=True)
 
-        upload_date_str = player_info.get('shootingDate')
+        if not traverse_obj(config, ('data', 'attributes', 'rights')):
-        if not upload_date_str:
+            # Eg: https://www.arte.tv/de/videos/097407-215-A/28-minuten
-            upload_date_str = (player_info.get('VRA') or player_info.get('VDA') or '').split(' ')[0]
+            # Eg: https://www.arte.tv/es/videos/104351-002-A/serviteur-du-peuple-1-23
+            raise ExtractorError(
+                'Video is not available in this language edition of Arte or broadcast rights expired', expected=True)
 
-        title = (player_info.get('VTI') or player_info['VID']).strip()
+        formats, subtitles = [], {}
-        subtitle = player_info.get('VSU', '').strip()
+        secondary_formats = []
-        if subtitle:
+        for stream in config['data']['attributes']['streams']:
-            title += ' - %s' % subtitle
+            # official player contains code like `e.get("versions")[0].eStat.ml5`
+            stream_version = stream['versions'][0]
+            stream_version_code = stream_version['eStat']['ml5']
 
-        qfunc = qualities(['MQ', 'HQ', 'EQ', 'SQ'])
+            lang_pref = -1
+            m = self._VERSION_CODE_RE.match(stream_version_code)
+            if m:
+                lang_pref = int(''.join('01'[x] for x in (
+                    m.group('vlang') == language_code,      # we prefer voice in the requested language
+                    not m.group('audio_desc'),              # and not the audio description version
+                    bool(m.group('original_voice')),        # but if voice is not in the requested language, at least choose the original voice
+                    m.group('sub_lang') == language_code,   # if subtitles are present, we prefer them in the requested language
+                    not m.group('has_sub'),                 # but we prefer no subtitles otherwise
+                    not m.group('sdh_sub'),                 # and we prefer not the hard-of-hearing subtitles if there are subtitles
+                )))
 
-        LANGS = {
+            short_label = traverse_obj(stream_version, 'shortLabel', expected_type=compat_str, default='?')
-            'fr': 'F',
+            if stream['protocol'].startswith('HLS'):
-            'de': 'A',
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
-            'en': 'E[ANG]',
+                    stream['url'], video_id=video_id, ext='mp4', m3u8_id=stream_version_code, fatal=False)
-            'es': 'E[ESP]',
+                for fmt in fmts:
-            'it': 'E[ITA]',
+                    fmt.update({
-            'pl': 'E[POL]',
+                        'format_note': '{0} [{1}]'.format(stream_version.get("label", "unknown"), short_label),
-        }
+                        'language_preference': lang_pref,
+                    })
+                if any(map(short_label.startswith, ('cc', 'OGsub'))):
+                    secondary_formats.extend(fmts)
+                else:
+                    formats.extend(fmts)
+                for sub in subs:
+                    subtitles = self._merge_subtitles(subtitles, sub)
 
-        langcode = LANGS.get(lang, lang)
+            elif stream['protocol'] in ('HTTPS', 'RTMP'):
+                formats.append({
+                    'format_id': '{0}-{1}'.format(stream["protocol"], stream_version_code),
+                    'url': stream['url'],
+                    'format_note': '{0} [{1}]'.format(stream_version.get("label", "unknown"), short_label),
+                    'language_preference': lang_pref,
+                    # 'ext': 'mp4',  # XXX: may or may not be necessary, at least for HTTPS
+                })
 
-        formats = []
-        for format_id, format_dict in vsr.items():
-            f = dict(format_dict)
-            format_url = url_or_none(f.get('url'))
-            streamer = f.get('streamer')
-            if not format_url and not streamer:
-                continue
-            versionCode = f.get('versionCode')
-            l = re.escape(langcode)
-
-            # Language preference from most to least priority
-            # Reference: section 6.8 of
-            # https://www.arte.tv/sites/en/corporate/files/complete-technical-guidelines-arte-geie-v1-07-1.pdf
-            PREFERENCES = (
-                # original version in requested language, without subtitles
-                r'VO{0}$'.format(l),
-                # original version in requested language, with partial subtitles in requested language
-                r'VO{0}-ST{0}$'.format(l),
-                # original version in requested language, with subtitles for the deaf and hard-of-hearing in requested language
-                r'VO{0}-STM{0}$'.format(l),
-                # non-original (dubbed) version in requested language, without subtitles
-                r'V{0}$'.format(l),
-                # non-original (dubbed) version in requested language, with subtitles partial subtitles in requested language
-                r'V{0}-ST{0}$'.format(l),
-                # non-original (dubbed) version in requested language, with subtitles for the deaf and hard-of-hearing in requested language
-                r'V{0}-STM{0}$'.format(l),
-                # original version in requested language, with partial subtitles in different language
-                r'VO{0}-ST(?!{0}).+?$'.format(l),
-                # original version in requested language, with subtitles for the deaf and hard-of-hearing in different language
-                r'VO{0}-STM(?!{0}).+?$'.format(l),
-                # original version in different language, with partial subtitles in requested language
-                r'VO(?:(?!{0}).+?)?-ST{0}$'.format(l),
-                # original version in different language, with subtitles for the deaf and hard-of-hearing in requested language
-                r'VO(?:(?!{0}).+?)?-STM{0}$'.format(l),
-                # original version in different language, without subtitles
-                r'VO(?:(?!{0}))?$'.format(l),
-                # original version in different language, with partial subtitles in different language
-                r'VO(?:(?!{0}).+?)?-ST(?!{0}).+?$'.format(l),
-                # original version in different language, with subtitles for the deaf and hard-of-hearing in different language
-                r'VO(?:(?!{0}).+?)?-STM(?!{0}).+?$'.format(l),
-            )
-
-            for pref, p in enumerate(PREFERENCES):
-                if re.match(p, versionCode):
-                    lang_pref = len(PREFERENCES) - pref
-                    break
             else:
-                lang_pref = -1
+                self.report_warning('Skipping stream with unknown protocol {0}'.format(stream["protocol"]))
 
-            media_type = f.get('mediaType')
+            # TODO: chapters from stream['segments']?
-            if media_type == 'hls':
+            # The JS also looks for chapters in config['data']['attributes']['chapters'],
-                m3u8_formats = self._extract_m3u8_formats(
+            # but I am yet to find a video having those
-                    format_url, video_id, 'mp4', entry_protocol='m3u8_native',
-                    m3u8_id=format_id, fatal=False)
-                for m3u8_format in m3u8_formats:
-                    m3u8_format['language_preference'] = lang_pref
-                formats.extend(m3u8_formats)
-                continue
-
-            format = {
-                'format_id': format_id,
-                'preference': -10 if f.get('videoFormat') == 'M3U8' else None,
-                'language_preference': lang_pref,
-                'format_note': '%s, %s' % (f.get('versionCode'), f.get('versionLibelle')),
-                'width': int_or_none(f.get('width')),
-                'height': int_or_none(f.get('height')),
-                'tbr': int_or_none(f.get('bitrate')),
-                'quality': qfunc(f.get('quality')),
-            }
-
-            if media_type == 'rtmp':
-                format['url'] = f['streamer']
-                format['play_path'] = 'mp4:' + f['url']
-                format['ext'] = 'flv'
-            else:
-                format['url'] = f['url']
-
-            formats.append(format)
 
+        formats.extend(secondary_formats)
+        self._remove_duplicate_formats(formats)
         self._sort_formats(formats)
 
+        metadata = config['data']['attributes']['metadata']
+
         return {
-            'id': player_info.get('VID') or video_id,
+            'id': metadata['providerId'],
-            'title': title,
+            'webpage_url': traverse_obj(metadata, ('link', 'url')),
-            'description': player_info.get('VDE'),
+            'title': traverse_obj(metadata, 'subtitle', 'title'),
-            'upload_date': unified_strdate(upload_date_str),
+            'alt_title': metadata.get('subtitle') and metadata.get('title'),
-            'thumbnail': player_info.get('programImage') or player_info.get('VTU', {}).get('IUR'),
+            'description': metadata.get('description'),
+            'duration': traverse_obj(metadata, ('duration', 'seconds')),
+            'language': metadata.get('language'),
+            'timestamp': traverse_obj(config, ('data', 'attributes', 'rights', 'begin'), expected_type=parse_iso8601),
+            'is_live': config['data']['attributes'].get('live', False),
             'formats': formats,
+            'subtitles': subtitles,
+            'thumbnails': [
+                {'url': image['url'], 'id': image.get('caption')}
+                for image in metadata.get('images') or [] if url_or_none(image.get('url'))
+            ],
         }
 
 
 class ArteTVEmbedIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?arte\.tv/player/v\d+/index\.php\?.*?\bjson_url=.+'
+    _EMBED_REGEX = [r'<(?:iframe|script)[^>]+src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?arte\.tv/player/v\d+/index\.php\?.*?\bjson_url=.+?)\1']
     _TESTS = [{
         'url': 'https://www.arte.tv/player/v5/index.php?json_url=https%3A%2F%2Fapi.arte.tv%2Fapi%2Fplayer%2Fv2%2Fconfig%2Fde%2F100605-013-A&lang=de&autoplay=true&mute=0100605-013-A',
+        'only_matching': True,
+        'skip': 'Video is not available in this language edition of Arte or broadcast rights expired'
+    }, {
+        'url': 'https://www.arte.tv/player/v5/index.php?json_url=https%3A%2F%2Fapi.arte.tv%2Fapi%2Fplayer%2Fv2%2Fconfig%2Fpl%2F100103-000-A&lang=pl&autoplay=true&mute=100103-000-A',
         'info_dict': {
-            'id': '100605-013-A',
+            'id': '100103-000-A',
             'ext': 'mp4',
-            'title': 'United we Stream November Lockdown Edition #13',
+            'title': 'USA: Dyskryminacja na porodówce',
-            'description': 'md5:be40b667f45189632b78c1425c7c2ce1',
+            'timestamp': 1604417980,
-            'upload_date': '20201116',
+            'upload_date': '20201103',
+            'description': 'md5:242017b7cce59ffae340a54baefcafb1',
+            'duration': 554,
+        },
+        'params': {
+            'format': 'bestvideo',
+            'skip_download': 'm3u8',
         },
     }, {
         'url': 'https://www.arte.tv/player/v3/index.php?json_url=https://api.arte.tv/api/player/v2/config/de/100605-013-A',
         'only_matching': True,
     }]
 
-    @staticmethod
+    @classmethod
-    def _extract_urls(webpage):
+    def _extract_urls(cls, webpage):
-        return [url for _, url in re.findall(
+        import itertools    # just until this is lifted into IE
-            r'<(?:iframe|script)[^>]+src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?arte\.tv/player/v\d+/index\.php\?.*?\bjson_url=.+?)\1',
+        return list(itertools.chain(*(
-            webpage)]
+            (url for _, url in re.findall(erx, webpage)) for erx in cls._EMBED_REGEX)
+        ))
 
     def _real_extract(self, url):
-        qs = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query)
+        qs = parse_qs(url)
-        json_url = qs['json_url'][0]
+        json_url = qs['json_url'][-1]
         video_id = ArteTVIE._match_id(json_url)
         return self.url_result(
             json_url, ie=ArteTVIE.ie_key(), video_id=video_id)
@@ -215,44 +279,45 @@ class ArteTVPlaylistIE(ArteTVBaseIE):
     _VALID_URL = r'https?://(?:www\.)?arte\.tv/(?P<lang>%s)/videos/(?P<id>RC-\d{6})' % ArteTVBaseIE._ARTE_LANGUAGES
     _TESTS = [{
         'url': 'https://www.arte.tv/en/videos/RC-016954/earn-a-living/',
-        'info_dict': {
+        'only_matching': True,
-            'id': 'RC-016954',
-            'title': 'Earn a Living',
-            'description': 'md5:d322c55011514b3a7241f7fb80d494c2',
-        },
-        'playlist_mincount': 6,
     }, {
         'url': 'https://www.arte.tv/pl/videos/RC-014123/arte-reportage/',
-        'only_matching': True,
+        'playlist_mincount': 100,
+        'info_dict': {
+            'description': 'md5:84e7bf1feda248bc325ebfac818c476e',
+            'id': 'RC-014123',
+            'title': 'ARTE Reportage - najlepsze reportaże',
+        },
+        'skip': '404 Not Found',
+    }, {
+        'url': 'https://www.arte.tv/en/videos/RC-016979/war-in-ukraine/',
+        'playlist_mincount': 79,
+        'info_dict': {
+            'id': 'RC-016979',
+            'title': 'War in Ukraine',
+            'description': 'On 24 February, Russian armed forces invaded Ukraine. We follow the war day by day and provide background information with special insights, reports and documentaries.',
+        },
     }]
 
     def _real_extract(self, url):
-        lang, playlist_id = re.match(self._VALID_URL, url).groups()
+        lang, playlist_id = self._match_valid_url(url).group('lang', 'id')
-        collection = self._download_json(
+        playlist = self._download_json(
-            '%s/collectionData/%s/%s?source=videos'
+            '{0}/playlist/{1}/{2}'.format(self._API_BASE, lang, playlist_id), playlist_id)['data']['attributes']
-            % (self._API_BASE, lang, playlist_id), playlist_id)
+
-        entries = []
+        entries = [{
-        for video in collection['videos']:
+            '_type': 'url_transparent',
-            if not isinstance(video, dict):
+            'url': video['config']['url'],
-                continue
+            'ie_key': ArteTVIE.ie_key(),
-            video_url = url_or_none(video.get('url')) or url_or_none(video.get('jsonUrl'))
+            'id': video.get('providerId'),
-            if not video_url:
+            'title': video.get('title'),
-                continue
+            'alt_title': video.get('subtitle'),
-            video_id = video.get('programId')
+            'thumbnail': url_or_none(traverse_obj(video, ('mainImage', 'url'))),
-            entries.append({
+            'duration': int_or_none(traverse_obj(video, ('duration', 'seconds'))),
-                '_type': 'url_transparent',
+        } for video in traverse_obj(playlist, ('items', lambda _, v: v['config']['url']))]
-                'url': video_url,
+
-                'id': video_id,
+        return self.playlist_result(entries, playlist_id,
-                'title': video.get('title'),
+                                    traverse_obj(playlist, ('metadata', 'title')),
-                'alt_title': video.get('subtitle'),
+                                    traverse_obj(playlist, ('metadata', 'description')))
-                'thumbnail': url_or_none(try_get(video, lambda x: x['mainImage']['url'], compat_str)),
-                'duration': int_or_none(video.get('durationSeconds')),
-                'view_count': int_or_none(video.get('views')),
-                'ie_key': ArteTVIE.ie_key(),
-            })
-        title = collection.get('title')
-        description = collection.get('shortDescription') or collection.get('teaserText')
-        return self.playlist_result(entries, playlist_id, title, description)
 
 
 class ArteTVCategoryIE(ArteTVBaseIE):
@@ -262,11 +327,10 @@ class ArteTVCategoryIE(ArteTVBaseIE):
         'info_dict': {
             'id': 'politics-and-society',
             'title': 'Politics and society',
-            'description': 'Investigative documentary series, geopolitical analysis, and international commentary',
+            'description': 'Watch documentaries and reportage about politics, society and current affairs.',
         },
         'playlist_mincount': 13,
-    },
+    }]
-    ]
 
     @classmethod
     def suitable(cls, url):
@@ -275,27 +339,23 @@ class ArteTVCategoryIE(ArteTVBaseIE):
             and super(ArteTVCategoryIE, cls).suitable(url))
 
     def _real_extract(self, url):
-        lang, playlist_id = re.match(self._VALID_URL, url).groups()
+        lang, playlist_id = self._match_valid_url(url).groups()
         webpage = self._download_webpage(url, playlist_id)
 
         items = []
         for video in re.finditer(
-                r'<a\b[^>]*?href\s*=\s*(?P<q>"|\'|\b)(?P<url>https?://www\.arte\.tv/%s/videos/[\w/-]+)(?P=q)' % lang,
+                r'<a\b[^>]+\bhref\s*=\s*(?P<q>"|\'|\b)(?P<url>(?:https?://www\.arte\.tv)?/%s/videos/[\w/-]+)(?P=q)' % lang,
                 webpage):
-            video = video.group('url')
+            video = urljoin(url, video.group('url'))
             if video == url:
                 continue
             if any(ie.suitable(video) for ie in (ArteTVIE, ArteTVPlaylistIE, )):
                 items.append(video)
 
-        if items:
+        title = (self._og_search_title(webpage, default=None)
-            title = (self._og_search_title(webpage, default=None)
+                 or self._html_search_regex(r'<title\b[^>]*>([^<]+)</title>', default=None))
-                     or self._html_search_regex(r'<title\b[^>]*>([^<]+)</title>', default=None))
+        title = strip_or_none(title.rsplit('|', 1)[0]) or self._generic_title(url)
-            title = strip_or_none(title.rsplit('|', 1)[0]) or self._generic_title(url)
 
-            result = self.playlist_from_matches(items, playlist_id=playlist_id, playlist_title=title)
+        return merge_dicts(
-            if result:
+            self.playlist_from_matches(items, playlist_id=playlist_id, playlist_title=title),
-                description = self._og_search_description(webpage, default=None)
+            {'description': self._og_search_description(webpage, default=None)})
-                if description:
-                    result['description'] = description
-                return result