From 1e5a50b71d8f0eae6007bedc329eecb24bb5aba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs?= <heckyel@hyperbola.info>
Date: Wed, 6 Apr 2022 03:37:17 +0800
Subject: update from upstream

---
 hypervideo_dl/extractor/dvtv.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'hypervideo_dl/extractor/dvtv.py')

diff --git a/hypervideo_dl/extractor/dvtv.py b/hypervideo_dl/extractor/dvtv.py
index de7f6d6..08663cf 100644
--- a/hypervideo_dl/extractor/dvtv.py
+++ b/hypervideo_dl/extractor/dvtv.py
@@ -8,6 +8,7 @@ from ..utils import (
     determine_ext,
     ExtractorError,
     int_or_none,
+    join_nonempty,
     js_to_json,
     mimetype2ext,
     try_get,
@@ -139,13 +140,9 @@ class DVTVIE(InfoExtractor):
                     label = video.get('label')
                     height = self._search_regex(
                         r'^(\d+)[pP]', label or '', 'height', default=None)
-                    format_id = ['http']
-                    for f in (ext, label):
-                        if f:
-                            format_id.append(f)
                     formats.append({
                         'url': video_url,
-                        'format_id': '-'.join(format_id),
+                        'format_id': join_nonempty('http', ext, label),
                         'height': int_or_none(height),
                     })
         self._sort_formats(formats)
-- 
cgit v1.2.3