From d0096f2d7c8786501dd38f0e727f7dbc4b0cce4c Mon Sep 17 00:00:00 2001 From: Alexander Schmidt Date: Fri, 16 Oct 2020 13:02:38 +0200 Subject: [PATCH] implemented cleanup --- src/misc.py | 13 +++++++++---- src/photosort.py | 3 +++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/misc.py b/src/misc.py index 9a78f4e..4cbbf74 100644 --- a/src/misc.py +++ b/src/misc.py @@ -22,12 +22,17 @@ def find_file(dir_path, file_name, file_size): return None def import_file(src_file_path, dst_file_path, move=False): - if move: - shutil.move(src_file_path, dst_file_path) - else: - shutil.copyfile(src_file_path, dst_file_path) + shutil.copyfile(src_file_path, dst_file_path) shutil.copystat(src_file_path, dst_file_path) +def delete_dir_contents(dir_path): + for file_name in os.listdir(dir_path): + file_path = os.path.join(dir_path, file_name) + if os.path.isfile(file_path) or os.path.islink(file_path): + os.unlink(file_path) + elif os.path.isdir(file_path): + shutil.rmtree(file_path) + def _is_media_file(file_path): if not os.path.isfile(file_path): return False diff --git a/src/photosort.py b/src/photosort.py index 38bea1b..4c4149e 100755 --- a/src/photosort.py +++ b/src/photosort.py @@ -46,3 +46,6 @@ for src_file_name, src_file_path in misc.walk_media_files(args.SOURCE_DIR): dst_time = misc.extract_timestamp(dst_file_path) if src_time > dst_time: misc.import_file(src_file_path, dst_file_path, move=args.cleanup) + +if args.cleanup: + misc.delete_dir_contents(args.SOURCE_DIR) -- 2.39.5