From a53f63fbe9c8bbd6b46b9a631792a2a48d0d78e4 Mon Sep 17 00:00:00 2001 From: Robert Honz Date: Fri, 29 Mar 2024 11:16:46 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20`ffmpeg`=20will=20be=20che?= =?UTF-8?q?cked=20against=20the=20path=20in=20config.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tidal_dl_ng/download.py | 8 ++++---- tidal_dl_ng/helper/path.py | 8 -------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tidal_dl_ng/download.py b/tidal_dl_ng/download.py index a65e5f0..8b16cd4 100644 --- a/tidal_dl_ng/download.py +++ b/tidal_dl_ng/download.py @@ -29,7 +29,7 @@ from tidal_dl_ng.constants import ( ) from tidal_dl_ng.helper.decryption import decrypt_file, decrypt_security_token from tidal_dl_ng.helper.exceptions import MediaMissing, UnknownManifestFormat -from tidal_dl_ng.helper.path import check_file_exists, format_path_media, is_installed_ffmpeg, path_file_sanitize +from tidal_dl_ng.helper.path import check_file_exists, format_path_media, path_file_sanitize from tidal_dl_ng.helper.tidal import ( instantiate_media, items_results_all, @@ -82,11 +82,11 @@ class Download: self.progress = progress self.path_base = path_base - if not is_installed_ffmpeg() and self.settings.data.video_convert_mp4: + if not self.settings.data.path_binary_ffmpeg and self.settings.data.video_convert_mp4: self.settings.data.video_convert_mp4 = False self.fn_logger.error( - "Cannot find FFmpeg in PATH. Videos can be downloaded but will not be processed. " - "Make sure FFmpeg is installed correctly and present within your environmental PATH variable." + "FFmpeg in path is not set. Videos can be downloaded but will not be processed. " + "Make sure FFmpeg is installed and the path to the binary is configured ('path_binary_ffmpeg')." ) def _download( diff --git a/tidal_dl_ng/helper/path.py b/tidal_dl_ng/helper/path.py index e3ea837..64e2d68 100644 --- a/tidal_dl_ng/helper/path.py +++ b/tidal_dl_ng/helper/path.py @@ -2,7 +2,6 @@ import glob import math import os import re -import shutil from pathlib import Path, PosixPath from pathvalidate import sanitize_filename, sanitize_filepath @@ -244,10 +243,3 @@ def check_file_exists(path_file: str, extension_ignore: bool = False) -> bool: result = bool(sum([glob.glob(_file) for _file in path_files], [])) return result - - -def is_installed_ffmpeg() -> bool: - # Checks if ffmpeg is found in PATH. - result: bool = bool(shutil.which("ffmpeg")) - - return result