fixing bunch cache dir passing

[photosort.git] / src / migrator.py

diff --git a/src/migrator.py b/src/migrator.py
index 26b7889a200db3148b0a8040f39b3a654c5f44ad..6438342f609b6440b7044cff6e89d2e69f4396ee 100644 (file)
--- a/src/migrator.py
+++ b/src/migrator.py
@@ -5,9 +5,11 @@ import os
 import misc
 
 class Migrator:
-    def __init__(self, src_dir, dst_dir):
+    def __init__(self, src_dir, dst_dir, db_file=None):
         self._base_src_dir = src_dir
         self._base_dst_dir = dst_dir
+        if db_file:
+            self._locator = Locator(dst_dir, src_dir, db_file)
 
     def migrate(self, remove):
         for src_file_name, src_file_path in misc.walk_media_files(self._base_src_dir):
@@ -17,18 +19,32 @@ class Migrator:
             except Exception as e:
                 logging.error('Error migrating %s: %s', src_file_path, str(e))
 
+    def close(self):
+        if self._locator:
+            self._locator.close()
+
     def _migrate_single(self, src_file_name, src_file_path, remove):
-        meta_time = misc.extract_timestamp(src_file_path, use_meta=True)
+        meta_time = misc.extract_meta_time(src_file_path)
+
+        if meta_time:
+            dst_sub_dir = datetime.datetime.fromtimestamp(meta_time).strftime("%Y/%m")
+        else:
+            dst_sub_dir = "na"
 
-        dst_dir = os.path.join(self._base_dst_dir,
-                               datetime.datetime.fromtimestamp(meta_time).strftime("%Y/%m"))
+        dst_dir = os.path.join(self._base_dst_dir, dst_sub_dir)
         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 self._locator:
+                alt_dst_dir = self._locator.locate_file(src_file_name,
+                                                        os.path.getsize(src_file_path),
+                                                        meta_time)
+            else:
+                alt_dst_dir = misc.find_file(self._base_dst_dir,
+                                             src_file_name,
+                                             os.path.getsize(src_file_path),
+                                             meta_time,
+                                             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)
@@ -38,8 +54,8 @@ class Migrator:
                 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)
+            src_time = os.path.getmtime(src_file_path)
+            dst_time = os.path.getmtime(dst_file_path)
             if src_time > dst_time:
                 misc.import_file(src_file_path, dst_file_path)