diff options
| author | exislow <exislow@users.noreply.github.com> | 2024-11-06 09:19:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-06 09:19:37 +0100 |
| commit | 5ff5167983b8cfd96fcd163f17d75a8f1517d1ff (patch) | |
| tree | ad46a8c9117dc6d3254bf776c76e272d32e0f4ba | |
| parent | 17390cba7c8276bef5b91f93eca0957ba7e9cbee (diff) | |
| parent | cce5886e5ca594bea811ec0e852fd0844ae93f72 (diff) | |
| download | tidal-dl-ng-5ff5167983b8cfd96fcd163f17d75a8f1517d1ff.tar.gz | |
Merge pull request #143 from maya-doshi/autodetect-ffmpeg
Autodetect ffmpeg path if not present in configuration
| -rw-r--r-- | tidal_dl_ng/download.py | 14 | ||||
| -rw-r--r-- | tidal_dl_ng/model/cfg.py | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/tidal_dl_ng/download.py b/tidal_dl_ng/download.py index c4b786f..90e1d75 100644 --- a/tidal_dl_ng/download.py +++ b/tidal_dl_ng/download.py @@ -75,13 +75,15 @@ 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.video_convert_mp4 = False - self.settings.data.extract_flac = False + 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.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 and the path to the binary is configured (`path_binary_ffmpeg`)." - ) + 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`)." + ) def _download( self, diff --git a/tidal_dl_ng/model/cfg.py b/tidal_dl_ng/model/cfg.py index 0b24854..41364c1 100644 --- a/tidal_dl_ng/model/cfg.py +++ b/tidal_dl_ng/model/cfg.py @@ -70,9 +70,9 @@ class HelpSettings: format_video: str = "Where to download videos and how to name the items." video_convert_mp4: str = ( "Videos are downloaded as MPEG Transport Stream (TS) files. With this option each video " - "will be converted to MP4. FFmpeg must be installed and the binary path must be configured." + "will be converted to MP4. FFmpeg must be installed." ) - path_binary_ffmpeg: str = "If you like to convert videos, this must point to your installed ffmpeg binary." + path_binary_ffmpeg: str = "Path to FFmpeg binary. Only necesarry if FFmpeg not present in path." metadata_cover_dimension: str = ( "The dimensions of the cover image embedded into the track. Possible values: 320x320, 640x640x 1280x1280." ) |