From 382d655eac2eb88fb71f5aae27f71051c7079af9 Mon Sep 17 00:00:00 2001 From: Arbaaz Shafiq <62838200+s1as3r@users.noreply.github.com> Date: Mon, 13 Dec 2021 20:21:42 +0530 Subject: [PATCH 1/2] Fix #1433 --- spotdl/console/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/spotdl/console/__init__.py b/spotdl/console/__init__.py index 1d0b3b792..8c34e2ec3 100644 --- a/spotdl/console/__init__.py +++ b/spotdl/console/__init__.py @@ -1,5 +1,6 @@ import os import sys +from pathlib import Path import signal from spotdl.download import ffmpeg, DownloadManager @@ -19,10 +20,15 @@ def console_entry_point(): # Convert arguments to dict args_dict = vars(arguments) + if arguments.ffmpeg: + args_dict['ffmpeg'] = str(Path(arguments.ffmpeg).absolute()) + else: + args_dict['ffmpeg'] = "ffmpeg" + # Check if ffmpeg has correct version, if not exit if ( ffmpeg.has_correct_version( - arguments.ignore_ffmpeg_version, arguments.ffmpeg or "ffmpeg" + arguments.ignore_ffmpeg_version, args_dict['ffmpeg'] ) is False ): From 921d1c3f5c0313860e029fb72dc87338fa03b011 Mon Sep 17 00:00:00 2001 From: Arbaaz Shafiq <62838200+s1as3r@users.noreply.github.com> Date: Mon, 13 Dec 2021 20:53:51 +0530 Subject: [PATCH 2/2] fix flake8-W291 *sigh* effin whitespace again --- spotdl/console/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spotdl/console/__init__.py b/spotdl/console/__init__.py index 8c34e2ec3..699205abb 100644 --- a/spotdl/console/__init__.py +++ b/spotdl/console/__init__.py @@ -23,7 +23,7 @@ def console_entry_point(): if arguments.ffmpeg: args_dict['ffmpeg'] = str(Path(arguments.ffmpeg).absolute()) else: - args_dict['ffmpeg'] = "ffmpeg" + args_dict['ffmpeg'] = "ffmpeg" # Check if ffmpeg has correct version, if not exit if (