[utils] Add `join_nonempty`

[yt-dlp.git] / yt_dlp / extractor / orf.py

diff --git a/yt_dlp/extractor/orf.py b/yt_dlp/extractor/orf.py
index 8d537d7ae714965783e06f3addf70e46c195ec32..e2b7038805e232d1c4a08c6077af1524b41d6690 100644 (file)
--- a/yt_dlp/extractor/orf.py
+++ b/yt_dlp/extractor/orf.py
@@ -11,6 +11,7 @@
     float_or_none,
     HEADRequest,
     int_or_none,
+    join_nonempty,
     orderedSet,
     remove_end,
     str_or_none,
@@ -82,12 +83,7 @@ def _real_extract(self, url):
                 src = url_or_none(fd.get('src'))
                 if not src:
                     continue
-                format_id_list = []
-                for key in ('delivery', 'quality', 'quality_string'):
-                    value = fd.get(key)
-                    if value:
-                        format_id_list.append(value)
-                format_id = '-'.join(format_id_list)
+                format_id = join_nonempty('delivery', 'quality', 'quality_string', from_dict=fd)
                 ext = determine_ext(src)
                 if ext == 'm3u8':
                     m3u8_formats = self._extract_m3u8_formats(
@@ -183,7 +179,7 @@ def _real_extract(self, url):
 
 class ORFRadioIE(InfoExtractor):
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
+        mobj = self._match_valid_url(url)
         show_date = mobj.group('date')
         show_id = mobj.group('show')