X-Git-Url: http://git.treefish.org/~alex/photosort.git/blobdiff_plain/e97415dff8bbc02a90428374c37d4d105d2a38ce..0c3d67ff5da26de2b8b531caaaf4b65ec8dc135c:/src/migrator.py?ds=sidebyside

diff --git a/src/migrator.py b/src/migrator.py
index 73650ce..b406689 100644
--- a/src/migrator.py
+++ b/src/migrator.py
@@ -5,15 +5,20 @@ import os
 import misc
 
 class Migrator:
-    def __init__(self, src_dir, dst_dir):
+    def __init__(self, src_dir, dst_dir, reg_db=None):
         self._base_src_dir = src_dir
         self._base_dst_dir = dst_dir
+        self._reg = Registry(reg_db)
 
     def migrate(self, remove):
         for src_file_name, src_file_path in misc.walk_media_files(self._base_src_dir):
             logging.debug('Migrating %s...', src_file_name)
             try:
-                self._migrate_single(src_file_name, src_file_path, remove)
+                if not self._reg.is_registered(src_file_path):
+                    self._migrate_single(src_file_name, src_file_path, remove)
+                    self._reg.register(src_file_path)
+                else:
+                    self._reg.refresh(src_file_path)
             except Exception as e:
                 logging.error('Error migrating %s: %s', src_file_path, str(e))
 
@@ -29,10 +34,11 @@ 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_file(self._base_dst_dir,
-                                         src_file_name,
-                                         os.path.getsize(src_file_path),
-                                         exclude_dir=self._base_src_dir)
+            alt_dst_dir = misc.find_alt_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)