From d615316bb498b3a60dee4ad4ee3bd9247a82182e Mon Sep 17 00:00:00 2001 From: Alexander Schmidt Date: Sat, 17 Oct 2020 00:45:48 +0200 Subject: [PATCH 1/1] refactoring --- src/dirhandler.py | 63 +++++++++++++++++++++++++++++++++++++++++++++++ src/misc.py | 24 +++--------------- src/photosort.py | 42 +++---------------------------- 3 files changed, 71 insertions(+), 58 deletions(-) create mode 100644 src/dirhandler.py diff --git a/src/dirhandler.py b/src/dirhandler.py new file mode 100644 index 0000000..54d1ca9 --- /dev/null +++ b/src/dirhandler.py @@ -0,0 +1,63 @@ +import datetime +import logging +import os + +import misc + +class DirHandler: + def __init__(self, src_dir, dst_dir): + self._base_src_dir = src_dir + self._base_dst_dir = dst_dir + + def migrate(self, remove): + for src_file_name, src_file_path in misc.walk_media_files(self._base_src_dir): + logging.info('Migrating %s...', src_file_name) + try: + self._migrate_single(src_file_name, src_file_path, remove) + except Exception as e: + logging.error('Error migrating %s: %s', src_file_path, str(e)) + + def _migrate_single(self, src_file_name, src_file_path, remove): + meta_time = misc.extract_timestamp(src_file_path, use_meta=True) + + dst_dir = os.path.join(self._base_dst_dir, + datetime.datetime.fromtimestamp(meta_time).strftime("%Y/%m")) + dst_file_path = os.path.join(dst_dir, src_file_name) + + if not os.path.exists(dst_file_path): + alt_dst_dir = misc.find_file(self._base_dst_dir, + src_file_name, + os.path.getsize(src_file_path), + exclude_dir=self._base_src_dir) + if alt_dst_dir: + dst_dir = alt_dst_dir + dst_file_path = os.path.join(dst_dir, src_file_name) + + if not os.path.exists(dst_file_path): + if not os.path.exists(dst_dir): + os.makedirs(dst_dir) + misc.import_file(src_file_path, dst_file_path) + else: + src_time = misc.extract_timestamp(src_file_path) + dst_time = misc.extract_timestamp(dst_file_path) + if src_time > dst_time: + misc.import_file(src_file_path, dst_file_path) + + if remove: + os.remove(src_file_path) + + def cleanup(self): + for root, dirs, files in os.walk(self._base_src_dir, topdown=False): + for name in files: + full_path = os.path.join(root, name) + if not misc.is_media_file(full_path): + try: + os.remove(full_path) + except Exception as e: + logging.warn('Error cleaning file %s: %s', full_path, str(e)) + for name in dirs: + full_path = os.path.join(root, name) + try: + os.rmdir(full_path) + except Exception as e: + logging.warn('Error cleaning dir %s: %s', full_path, str(e)) diff --git a/src/misc.py b/src/misc.py index d805e0c..6ca4749 100644 --- a/src/misc.py +++ b/src/misc.py @@ -10,15 +10,15 @@ def walk_media_files(dir_path): for root, dirs, files in os.walk(dir_path): for f in files: file_path = os.path.join(root, f) - if _is_media_file(file_path): + if is_media_file(file_path): yield (f, file_path) def extract_timestamp(file_path, use_meta=False): time = None if use_meta: - if _is_media_file(file_path, types=['image']): + if is_media_file(file_path, types=['image']): time = _extract_image_timestamp(file_path) - elif _is_media_file(file_path, types=['video']): + elif is_media_file(file_path, types=['video']): time = _extract_video_timestamp(file_path) if time: return time @@ -42,23 +42,7 @@ def import_file(src_file_path, dst_file_path): dst_stat = os.stat(dst_file_path) os.utime( dst_file_path, ns=(dst_stat.st_atime_ns, src_stat.st_mtime_ns) ) -def cleanup_dir(dir_path): - for root, dirs, files in os.walk(dir_path, topdown=False): - for name in files: - full_path = os.path.join(root, name) - if not _is_media_file(full_path): - try: - os.remove(full_path) - except Exception as e: - logging.warn('Error cleaning file %s: %s', full_path, str(e)) - for name in dirs: - full_path = os.path.join(root, name) - try: - os.rmdir(full_path) - except Exception as e: - logging.warn('Error cleaning dir %s: %s', full_path, str(e)) - -def _is_media_file(file_path, types=['image', 'video']): +def is_media_file(file_path, types=['image', 'video']): if not os.path.isfile(file_path): return False mime_type = mimetypes.guess_type(file_path)[0] diff --git a/src/photosort.py b/src/photosort.py index a25b70b..8ed4ee7 100755 --- a/src/photosort.py +++ b/src/photosort.py @@ -3,9 +3,8 @@ import argparse import datetime import logging -import os -import misc +from dirhandler import DirHandler parser = argparse.ArgumentParser(description='Process some integers.') parser.add_argument('SOURCE_DIR', type=str, help='source directory') @@ -29,40 +28,7 @@ else: logging.basicConfig(format='[%(asctime)s] %(levelname)s: %(message)s', level=log_level, datefmt='%m/%d/%Y %H:%M:%S') -for src_file_name, src_file_path in misc.walk_media_files(args.SOURCE_DIR): - logging.info('Processing %s...', src_file_name) - - try: - meta_time = misc.extract_timestamp(src_file_path, use_meta=True) - - dst_dir = os.path.join(args.DEST_DIR, - datetime.datetime.fromtimestamp(meta_time).strftime("%Y/%m")) - dst_file_path = os.path.join(dst_dir, src_file_name) - - if not os.path.exists(dst_file_path): - alt_dst_dir = misc.find_file(args.DEST_DIR, - src_file_name, - os.path.getsize(src_file_path), - exclude_dir=args.SOURCE_DIR) - if alt_dst_dir: - dst_dir = alt_dst_dir - dst_file_path = os.path.join(dst_dir, src_file_name) - - if not os.path.exists(dst_file_path): - if not os.path.exists(dst_dir): - os.makedirs(dst_dir) - misc.import_file(src_file_path, dst_file_path) - else: - src_time = misc.extract_timestamp(src_file_path) - dst_time = misc.extract_timestamp(dst_file_path) - if src_time > dst_time: - misc.import_file(src_file_path, dst_file_path) - - if args.cleanup: - os.remove(src_file_path) - - except Exception as e: - logging.error('Error processing %s: %s', src_file_path, str(e)) - +handler = DirHandler(args.SOURCE_DIR, args.DEST_DIR) +handler.migrate(args.cleanup) if args.cleanup: - misc.cleanup_dir(args.SOURCE_DIR) + handler.cleanup() -- 2.39.5