]> jfr.im git - yt-dlp.git/blobdiff - yt_dlp/extractor/storyfire.py
[cleanup, utils] Don't use kwargs for `format_field`
[yt-dlp.git] / yt_dlp / extractor / storyfire.py
index 9c698626fc68ddd24e6295e8a6c0fded011d40e1..035747c31c69d47be4912e2af2d07ba39294cb29 100644 (file)
@@ -1,11 +1,8 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
 import functools
 
 from .common import InfoExtractor
 from ..utils import (
-    # HEADRequest,
+    format_field,
     int_or_none,
     OnDemandPagedList,
     smuggle_url,
@@ -26,18 +23,6 @@ def _parse_video(self, video):
             r'https?://player\.vimeo\.com/external/(\d+)',
             video['vimeoVideoURL'], 'vimeo id')
 
-        # video_url = self._request_webpage(
-        #    HEADRequest(video['vimeoVideoURL']), video_id).geturl()
-        # formats = []
-        # for v_url, suffix in [(video_url, '_sep'), (video_url.replace('/sep/video/', '/video/'), '')]:
-        #    formats.extend(self._extract_m3u8_formats(
-        #        v_url, video_id, 'mp4', 'm3u8_native',
-        #        m3u8_id='hls' + suffix, fatal=False))
-        #    formats.extend(self._extract_mpd_formats(
-        #        v_url.replace('.m3u8', '.mpd'), video_id,
-        #        mpd_id='dash' + suffix, fatal=False))
-        # self._sort_formats(formats)
-
         uploader_id = video.get('hostID')
 
         return {
@@ -51,7 +36,6 @@ def _parse_video(self, video):
                         'Referer': 'https://storyfire.com/',
                     }
                 }),
-            # 'formats': formats,
             'thumbnail': video.get('storyImage'),
             'view_count': int_or_none(video.get('views')),
             'like_count': int_or_none(video.get('likesCount')),
@@ -60,7 +44,7 @@ def _parse_video(self, video):
             'timestamp': int_or_none(video.get('publishDate')),
             'uploader': video.get('username'),
             'uploader_id': uploader_id,
-            'uploader_url': 'https://storyfire.com/user/%s/video' % uploader_id if uploader_id else None,
+            'uploader_url': format_field(uploader_id, None, 'https://storyfire.com/user/%s/video'),
             'episode_number': int_or_none(video.get('episodeNumber') or video.get('episode_number')),
         }