refactoring

diff --git a/src/dirhandler.py b/src/dirhandler.py
deleted file mode 100644 (file)
index 54d1ca9..0000000
--- a/src/dirhandler.py
+++ /dev/null
@@ -1,63 +0,0 @@
-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/migrator.py b/src/migrator.py
new file mode 100644 (file)
index 0000000..b3703e0
--- /dev/null
+++ b/src/migrator.py
@@ -0,0 +1,63 @@
+import datetime
+import logging
+import os
+
+import misc
+
+class Migrator:
+    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/photosort.py b/src/photosort.py
index 8ed4ee7120fe77e49b46de4829b198fa9823aa13..2829337d7d1e02583ababdbb8b63a82d3a85d726 100755 (executable)
--- a/src/photosort.py
+++ b/src/photosort.py
@@ -4,7 +4,7 @@ import argparse
 import datetime
 import logging
 
-from dirhandler import DirHandler
+from migrator import Migrator
 
 parser = argparse.ArgumentParser(description='Process some integers.')
 parser.add_argument('SOURCE_DIR', type=str, help='source directory')
@@ -28,7 +28,7 @@ else:
 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)
+migrator = Migrator(args.SOURCE_DIR, args.DEST_DIR)
+migrator.migrate(args.cleanup)
 if args.cleanup:
-    handler.cleanup()
+    migrator.cleanup()