From df8cf35c7590f51e0c665614b88ddf4f13ae0050 Mon Sep 17 00:00:00 2001 From: Colombo Date: Fri, 27 Dec 2019 11:09:15 +0400 Subject: [PATCH] FacesetEnhancer now asks to merge aligned_enhanced/ to aligned/ --- mainscripts/FacesetEnhancer.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/mainscripts/FacesetEnhancer.py b/mainscripts/FacesetEnhancer.py index fb8558c..903fa3a 100644 --- a/mainscripts/FacesetEnhancer.py +++ b/mainscripts/FacesetEnhancer.py @@ -143,8 +143,8 @@ def process_folder ( dirpath, multi_gpu=False, cpu_only=False ): dirpath_parts = '/'.join( dirpath.parts[-2:]) output_dirpath_parts = '/'.join( output_dirpath.parts[-2:] ) - io.log_info (f"Enhancing faceset in {dirpath_parts}.") - io.log_info ( f"Processing to {output_dirpath_parts}.") + io.log_info (f"Enhancing faceset in {dirpath_parts}") + io.log_info ( f"Processing to {output_dirpath_parts}") output_images_paths = Path_utils.get_image_paths(output_dirpath) if len(output_images_paths) > 0: @@ -154,10 +154,12 @@ def process_folder ( dirpath, multi_gpu=False, cpu_only=False ): image_paths = [Path(x) for x in Path_utils.get_image_paths( dirpath )] result = FacesetEnhancerSubprocessor ( image_paths, output_dirpath, multi_gpu=multi_gpu, cpu_only=cpu_only).run() - io.log_info (f"Copying processed files to {dirpath_parts}.") - - for (filepath, output_filepath) in result: - shutil.copy (output_filepath, filepath) + is_merge = io.input_bool (f"\r\nMerge {output_dirpath_parts} to {dirpath_parts} ? (y/n skip:y) : ", True) + if is_merge: + io.log_info (f"Copying processed files to {dirpath_parts}") - io.log_info (f"Removing {output_dirpath_parts}.") - shutil.rmtree(output_dirpath) + for (filepath, output_filepath) in result: + shutil.copy (output_filepath, filepath) + + io.log_info (f"Removing {output_dirpath_parts}") + shutil.rmtree(output_dirpath)