refactoring

[photosort.git] / src / photosort.py

diff --git a/src/photosort.py b/src/photosort.py
index 3124eaec4e76f347a376ac78d5408f8239986b46..8ed4ee7120fe77e49b46de4829b198fa9823aa13 100755 (executable)
--- a/src/photosort.py
+++ b/src/photosort.py
@@ -3,50 +3,32 @@
 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')
 parser.add_argument('DEST_DIR', type=str, help='target directory')
 parser.add_argument('-c', '--cleanup', action='store_true', dest='cleanup',
                     default=False, help='clean-up source dir')
-parser.add_argument('-l', '--log-level', type=str, default='INFO', dest='log_lvl',
-                    choices=['DEBUG', 'INFO', 'WARNING'], help='select log level')
+parser.add_argument('-v', '--verbose', action='store_true', dest='verbose',
+                    default=False, help='enable verbose output')
+parser.add_argument('-q', '--quiet', action='store_true', dest='quiet',
+                    default=False, help='suppress non-error output')
 
 args = parser.parse_args()
 
-logging.basicConfig(format='[%(asctime)s] %(levelname)s: %(message)s',
-                    level=logging.getLevelName(args.log_lvl),
-                    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)
-
-    src_time = misc.extract_timestamp(src_file_path)
+if args.verbose:
+    log_level = logging.INFO
+elif args.quiet:
+    log_level = logging.ERROR
+else:
+    log_level = logging.WARNING
 
-    dst_dir = os.path.join(args.DEST_DIR,
-                           datetime.datetime.fromtimestamp(src_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, move=args.cleanup)
-    else:
-        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)
+logging.basicConfig(format='[%(asctime)s] %(levelname)s: %(message)s',
+                    level=log_level, datefmt='%m/%d/%Y %H:%M:%S')
 
+handler = DirHandler(args.SOURCE_DIR, args.DEST_DIR)
+handler.migrate(args.cleanup)
 if args.cleanup:
-    misc.delete_dir_contents(args.SOURCE_DIR)
+    handler.cleanup()