X-Git-Url: http://git.treefish.org/~alex/photosort.git/blobdiff_plain/5ad2c3b2ac3baf7b9e64d07a7f0b37d3493a03d4..6d44902ddae12804578e256a93b593430ec75cb9:/src/migrator.py?ds=sidebyside

diff --git a/src/migrator.py b/src/migrator.py
index 7bd32e6..6438342 100644
--- 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,6 +19,10 @@ 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_meta_time(src_file_path)
 
@@ -29,7 +35,12 @@ class Migrator:
         dst_file_path = os.path.join(dst_dir, src_file_name)
 
         if not os.path.exists(dst_file_path):
-            alt_dst_dir = misc.find_alt_file(self._base_dst_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,