From 2ea824b52fa39261ec3752eca82058191e66a26d Mon Sep 17 00:00:00 2001 From: Joakim Holm Date: Thu, 30 Dec 2021 12:15:23 +0100 Subject: [PATCH] Made option for verbose ffmpeg --- audiobookdl/__main__.py | 2 +- audiobookdl/utils/args.py | 6 ++++++ audiobookdl/utils/output.py | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/audiobookdl/__main__.py b/audiobookdl/__main__.py index 2b62147..591aec3 100644 --- a/audiobookdl/__main__.py +++ b/audiobookdl/__main__.py @@ -23,6 +23,7 @@ def run(): logging.set_loglevel(options.loglevel) if options.print_output: logging.set_loglevel("error") + output.ffmpeg_output = options.ffmpeg_output logging.log("Checking for missing dependencies", "debug") missing = dependencies.check_dependencies(options) if missing is not True: @@ -60,7 +61,6 @@ def run(): def print_output(source: Source, template: str): """Prints output location""" source.before() - title = source.get_title() meta = source.get_metadata() location = output.gen_output_location(template, meta) print(location) diff --git a/audiobookdl/utils/args.py b/audiobookdl/utils/args.py index 472f7eb..ef4a8ee 100644 --- a/audiobookdl/utils/args.py +++ b/audiobookdl/utils/args.py @@ -45,4 +45,10 @@ def parse_arguments(): help="Download only cover", action='store_true', ) + parser.add_argument( + '--verbose-ffmpeg', + dest="ffmpeg_output", + help="Show ffmpeg output in terminal", + action="store_true", + ) return parser.parse_args() diff --git a/audiobookdl/utils/output.py b/audiobookdl/utils/output.py index ba6c159..d35b251 100644 --- a/audiobookdl/utils/output.py +++ b/audiobookdl/utils/output.py @@ -9,6 +9,8 @@ 'artist': 'NA', } +ffmpeg_output = False + def gen_output_filename(booktitle: str, file: Dict[str, str], template: str) -> str: """Generates an output filename based on different attributes of the @@ -30,7 +32,7 @@ def combine_audiofiles(filenames: List[str], tmp_dir: str, output_path: str): subprocess.run( ["ffmpeg", "-f", "concat", "-safe", "0", "-i", combine_file, "-c", "copy", output_path], - capture_output=True) + capture_output=not ffmpeg_output) def convert_output(filenames: List[str], output_dir: str, output_format: str): @@ -44,7 +46,7 @@ def convert_output(filenames: List[str], output_dir: str, output_format: str): if not output_format == split_path[1][1:]: subprocess.run( ["ffmpeg", "-i", full_path, new_path], - capture_output=True) + capture_output=not ffmpeg_output) os.remove(full_path) new_paths.append(f"{os.path.splitext(name)[0]}.{output_format}") return new_paths