X-Git-Url: http://git.treefish.org/~alex/photosort.git/blobdiff_plain/1c6a4e0d2562f8faa5f933d69192f29479a50751..224556236ecd0f48f461738bc8157a82f5009618:/src/photosort.py?ds=inline

diff --git a/src/photosort.py b/src/photosort.py
index a25b70b..2829337 100755
--- a/src/photosort.py
+++ b/src/photosort.py
@@ -3,9 +3,8 @@
 import argparse
 import datetime
 import logging
-import os
 
-import misc
+from migrator import Migrator
 
 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))
-
+migrator = Migrator(args.SOURCE_DIR, args.DEST_DIR)
+migrator.migrate(args.cleanup)
 if args.cleanup:
-    misc.cleanup_dir(args.SOURCE_DIR)
+    migrator.cleanup()