Merge 34556cd67d into e0727e4ab6

Fixes 21792b88b7 (commitcomment-140705274), thx: vonProteus

youtube_dl/extractor/extractors.py

@@ -568,6 +568,7 @@ from .khanacademy import (
     KhanAcademyIE,
     KhanAcademyUnitIE,
 )
+from .kick import KickIE
 from .kickstarter import KickStarterIE
 from .kinja import KinjaEmbedIE
 from .kinopoisk import KinoPoiskIE

youtube_dl/extractor/kick.py

@@ -0,0 +1,60 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+from .common import InfoExtractor
+from ..utils import (
+    float_or_none,
+    int_or_none,
+    parse_iso8601,
+    strip_or_none,
+    traverse_obj,
+    url_or_none,
+)
+
+
+class KickIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?kick\.com/video/(?P<id>[0-9a-zA-Z-]+)'
+    _TESTS = [{
+        'url': 'https://kick.com/video/82a3c11d-7a17-4747-aecb-2e61413eb11f',
+        'md5': 'f052bc1046cd9ca6751925dd12420010',
+        'info_dict': {
+            'id': '82a3c11d-7a17-4747-aecb-2e61413eb11f',
+            'ext': 'mp4',
+            'title': 'Weekly Stake Stream',
+            'uploader': 'Eddie',
+            'thumbnail': r're:^https?://.*\.jpg.*$',
+            'timestamp': 1676890314,
+            'upload_date': '20230220',
+        }
+    }]
+
+    def _real_extract(self, url):
+        id = self._match_id(url)
+
+        headers = {
+            'Accept': 'application/json',
+        }
+
+        data = self._download_json('https://kick.com/api/v1/video/%s' % id, id, headers=headers)
+
+        formats = self._extract_m3u8_formats(
+            data['source'], id, 'mp4')
+        self._sort_formats(formats)
+        livestream = data['livestream']
+        strip_lambda = lambda x: strip_or_none(x) or None
+
+        return {
+            'id': id,
+            'formats': formats,
+            'title': livestream.get('session_title'),
+            'uploader': traverse_obj(livestream, ('channel', 'user', 'username'), expected_type=strip_lambda),
+            'thumbnail': url_or_none(livestream.get('thumbnail')),
+            'duration': float_or_none(livestream.get('duration'), scale=1000),
+            'timestamp': traverse_obj(data, 'updated_at', 'created_at', expected_type=parse_iso8601),
+            'release_timestamp': parse_iso8601(data.get('created_at')),
+            'view_count': int_or_none(data.get('views')),
+            'is_live': livestream.get('is_live'),
+            'channel': traverse_obj(livestream, ('channel', 'slug'), expected_type=strip_lambda),
+            'categories': traverse_obj(data, ('categories', Ellipsis, 'name'), expected_type=strip_lambda) or None,
+            'tags': traverse_obj(data, ('categories', Ellipsis, 'tags', Ellipsis), expected_type=strip_lambda) or None,
+        }

youtube_dl/postprocessor/ffmpeg.py

@@ -74,8 +74,11 @@ class FFmpegPostProcessor(PostProcessor):
         return FFmpegPostProcessor(downloader)._versions
 
     def _determine_executables(self):
-        programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe']
+        # ordered to match prefer_ffmpeg!
+        convs = ['ffmpeg', 'avconv']
+        probes = ['ffprobe', 'avprobe']
         prefer_ffmpeg = True
+        programs = convs + probes
 
         def get_ffmpeg_version(path):
             ver = get_exe_version(path, args=['-version'])
@@ -127,10 +130,13 @@ class FFmpegPostProcessor(PostProcessor):
                 (p, get_ffmpeg_version(self._paths[p])) for p in programs)
             if x[1] is not None)
 
-        for p in ('ffmpeg', 'avconv')[::-1 if prefer_ffmpeg is False else 1]:
-            if self._versions.get(p):
-                self.basename = self.probe_basename = p
-                break
+        basenames = [None, None]
+        for i, progs in enumerate((convs, probes)):
+            for p in progs[::-1 if prefer_ffmpeg is False else 1]:
+                if self._versions.get(p):
+                    basenames[i] = p
+                    break
+        self.basename, self.probe_basename = basenames
 
     @property
     def available(self):

youtube_dl/utils.py

@@ -2371,15 +2371,24 @@ def make_HTTPS_handler(params, **kwargs):
         return YoutubeDLHTTPSHandler(params, context=context, **kwargs)
 
 
-def bug_reports_message():
+def bug_reports_message(before=';'):
     if ytdl_is_updateable():
         update_cmd = 'type  youtube-dl -U  to update'
     else:
-        update_cmd = 'see  https://yt-dl.org/update  on how to update'
-    msg = '; please report this issue on https://yt-dl.org/bug .'
-    msg += ' Make sure you are using the latest version; %s.' % update_cmd
-    msg += ' Be sure to call youtube-dl with the --verbose flag and include its complete output.'
-    return msg
+        update_cmd = 'see  https://github.com/ytdl-org/youtube-dl/#user-content-installation  on how to update'
+
+    msg = (
+        'please report this issue on https://github.com/ytdl-org/youtube-dl/issues ,'
+        ' using the appropriate issue template.'
+        ' Make sure you are using the latest version; %s.'
+        ' Be sure to call youtube-dl with the --verbose option and include the complete output.'
+    ) % update_cmd
+
+    before = (before or '').rstrip()
+    if not before or before.endswith(('.', '!', '?')):
+        msg = msg[0].title() + msg[1:]
+
+    return (before + ' ' if before else '') + msg
 
 
 class YoutubeDLError(Exception):