clean registry only once after migration

[photosort.git] / src / misc.py

diff --git a/src/misc.py b/src/misc.py
index 08baabb3113b4c1d08583f17f5ad1d0f24db6849..5b331b5404b5c24453b88dd22ea1ac54f30f48b4 100644 (file)
--- a/src/misc.py
+++ b/src/misc.py
@@ -1,4 +1,5 @@
 import datetime
+import logging
 import mimetypes
 import os
 import PIL.Image
@@ -19,15 +20,17 @@ def extract_meta_time(file_path):
     elif is_media_file(file_path, types=['video']):
         return _extract_video_timestamp(file_path)
 
-def find_file(dir_path, file_name, file_size, exclude_dir):
-    for root, dirs, files in os.walk(dir_path):
+def find_alt_file(base_dir, name, size, meta_time, exclude_dir):
+    for root, dirs, files in os.walk(base_dir):
         if root.startswith(exclude_dir):
             continue
-        for f in files:
-            if f == file_name:
-                full_path = os.path.join(root, f)
-                if os.path.getsize(full_path) == file_size:
-                    return root
+        for alt_name in files:
+            if alt_name == name:
+                full_path = os.path.join(root, alt_name)
+                if os.path.getsize(full_path) == size:
+                    alt_meta_time = extract_meta_time(full_path)
+                    if meta_time == alt_meta_time:
+                        return root
     return None
 
 def import_file(src_file_path, dst_file_path):