yt_dlp/extractor/facebook.py

@@ -16,10 +16,10 @@ from ..utils import (
     determine_ext,
     error_to_compat_str,
     float_or_none,
-    format_field,
     get_element_by_id,
     get_first,
     int_or_none,
+    join_nonempty,
     js_to_json,
     merge_dicts,
     parse_count,
@@ -421,29 +421,26 @@ class FacebookIE(InfoExtractor):
                 r'data-sjs>({.*?ScheduledServerJS.*?})</script>', webpage)]
             post = traverse_obj(post_data, (
                 ..., 'require', ..., ..., ..., '__bbox', 'require', ..., ..., ..., '__bbox', 'result', 'data'), expected_type=dict) or []
-
-            automatic_captions, subtitles = {}, {}
-            subs_data = traverse_obj(post, (..., 'video', ..., 'attachments', ..., lambda k, v: (
+            snippet = traverse_obj(post, (..., 'video', ..., 'attachments', ..., lambda k, v: (
                 k == 'media' and str(v['id']) == video_id and v['__typename'] == 'Video')))
-            is_video_broadcast = get_first(subs_data, 'is_video_broadcast', expected_type=bool)
-            captions = get_first(subs_data, 'video_available_captions_locales', 'captions_url')
-            if url_or_none(captions):  # if subs_data only had a 'captions_url'
-                locale = self._html_search_meta(['og:locale', 'twitter:locale'], webpage, 'locale', default='en_US')
+            locale = self._html_search_meta(['og:locale', 'twitter:locale'], webpage, 'locale', default='en_US')
+            captions = get_first(snippet, 'video_available_captions_locales', 'captions_url')
+            is_video_broadcast = get_first(snippet, 'is_video_broadcast', expected_type=bool)
+            automatic_captions = {}
+            subtitles = {}
+            if url_or_none(captions):  # snippet only had 'captions_url'
                 subtitles[locale] = [{'url': captions}]
-            # or else subs_data had 'video_available_captions_locales', a list of dicts
             for caption in traverse_obj(captions, (
                 {lambda x: sorted(x, key=lambda c: c['locale'])}, lambda _, v: v['captions_url'])
             ):
-                lang = caption.get('localized_language') or ''
                 subs = {
                     'url': caption['captions_url'],
-                    'name': format_field(caption, 'localized_country', f'{lang} (%s)', default=lang),
+                    'name': join_nonempty('localized_language', 'localized_country', from_dict=caption),
                 }
                 if caption.get('localized_creation_method') or is_video_broadcast:
                     automatic_captions.setdefault(caption['locale'], []).append(subs)
                 else:
                     subtitles.setdefault(caption['locale'], []).append(subs)
-
             media = traverse_obj(post, (..., 'attachments', ..., lambda k, v: (
                 k == 'media' and str(v['id']) == video_id and v['__typename'] == 'Video')), expected_type=dict)
             title = get_first(media, ('title', 'text'))