From 8e7d6019ff0d356b3f53a851065b9c41206a58de Mon Sep 17 00:00:00 2001 From: Robert Honz Date: Wed, 6 Nov 2024 09:41:39 +0100 Subject: [PATCH] FFmpeg PR fixes. --- tidal_dl_ng/download.py | 15 +++++++-------- tidal_dl_ng/model/cfg.py | 5 ++++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tidal_dl_ng/download.py b/tidal_dl_ng/download.py index 90e1d75..d6b9e15 100644 --- a/tidal_dl_ng/download.py +++ b/tidal_dl_ng/download.py @@ -75,15 +75,14 @@ class Download: if not self.settings.data.path_binary_ffmpeg and ( self.settings.data.video_convert_mp4 or self.settings.data.extract_flac ): - self.settings.data.path_binary_ffmpeg = shutil.which("ffmpeg") - if not self.settings.data.path_binary_ffmpeg: - self.settings.data.video_convert_mp4 = False - self.settings.data.extract_flac = False + self.settings.data.video_convert_mp4 = False + self.settings.data.extract_flac = False - self.fn_logger.error( - "FFmpeg is not set. Videos can be downloaded but will not be processed. FLAC cannot be extracted from MP4 containers. " - "Make sure FFmpeg is installed. The path to the binary can be specified (`path_binary_ffmpeg`)." - ) + self.fn_logger.error( + "FFmpeg path is not set. Videos can be downloaded but will not be processed. FLAC cannot be " + "extracted from MP4 containers. Make sure FFmpeg is installed. The path to the FFmpeg binary must " + "be set in (`path_binary_ffmpeg`)." + ) def _download( self, diff --git a/tidal_dl_ng/model/cfg.py b/tidal_dl_ng/model/cfg.py index 41364c1..bda0ae9 100644 --- a/tidal_dl_ng/model/cfg.py +++ b/tidal_dl_ng/model/cfg.py @@ -72,7 +72,10 @@ class HelpSettings: "Videos are downloaded as MPEG Transport Stream (TS) files. With this option each video " "will be converted to MP4. FFmpeg must be installed." ) - path_binary_ffmpeg: str = "Path to FFmpeg binary. Only necesarry if FFmpeg not present in path." + path_binary_ffmpeg: str = ( + "Path to FFmpeg binary file (executable). Only necessary if FFmpeg not set in $PATH. Mandatory for Windows: " + "The directory of `ffmpeg.exe`must be set in %PATH%." + ) metadata_cover_dimension: str = ( "The dimensions of the cover image embedded into the track. Possible values: 320x320, 640x640x 1280x1280." )