Merge 20691a11e6 into e0727e4ab6

[postprocessor/ffmpeg] Fix finding ffprobe (bug in 21792b8)
Fixes 21792b88b7 (commitcomment-140705274), thx: vonProteus
2024-04-14 21:43:28 +02:00 · 2024-04-07 15:33:30 +01:00 · 2024-04-05 15:25:29 +01:00
2 changed files with 26 additions and 11 deletions
--- a/youtube_dl/postprocessor/ffmpeg.py
+++ b/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):
--- a/youtube_dl/utils.py
+++ b/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):
Author	SHA1	Message	Date
Alba Mendez	9a40cd1ef6	Merge `20691a11e6` into `e0727e4ab6`	2024-04-14 21:43:28 +02:00
dirkf	e0727e4ab6	[postprocessor/ffmpeg] Fix finding ffprobe (bug in `21792b8`) Fixes `21792b88b7 (commitcomment-140705274)`, thx: vonProteus	2024-04-07 15:33:30 +01:00
Ori Avtalion	4ea59c6107	[utils] Fix crash in _report_ignoring_subs from `c58b655` (#32762 ) Align `utils.bug_reports_message()` with yt-dlp https://github.com/yt-dlp/yt-dlp/commit/5873d4ccdd, thanks fstirlitz --------- Co-authored-by: dirkf <fieldhouse@gmx.net>	2024-04-05 15:25:29 +01:00