]> jfr.im git - yt-dlp.git/blobdiff - yt_dlp/extractor/dvtv.py
[ie/floatplane] Add extractors (#8639)
[yt-dlp.git] / yt_dlp / extractor / dvtv.py
index de7f6d67018f8d1e58622d7781c8c33f22aa207f..e67143370ba451d6f1f19d25d0dab5f2bb215dbd 100644 (file)
@@ -1,6 +1,3 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
 import re
 
 from .common import InfoExtractor
@@ -8,6 +5,7 @@
     determine_ext,
     ExtractorError,
     int_or_none,
+    join_nonempty,
     js_to_json,
     mimetype2ext,
     try_get,
@@ -139,16 +137,11 @@ def _parse_video_metadata(self, js, video_id, timestamp):
                     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)
 
         return {
             'id': data.get('mediaid') or video_id,