X-Git-Url: http://git.treefish.org/~alex/photosort.git/blobdiff_plain/3fb5c5590d4fd533843feb9544c1e45ab8aa6f7f..1befba228a239882adefcb7b92eb5f8f83178d62:/src/misc.py?ds=sidebyside

diff --git a/src/misc.py b/src/misc.py
index 93690d1..5b331b5 100644
--- a/src/misc.py
+++ b/src/misc.py
@@ -20,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):