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

diff --git a/src/misc.py b/src/misc.py
index d805e0c..5b331b5 100644
--- a/src/misc.py
+++ b/src/misc.py
@@ -1,4 +1,5 @@
 import datetime
+import logging
 import mimetypes
 import os
 import PIL.Image
@@ -10,30 +11,26 @@ def walk_media_files(dir_path):
     for root, dirs, files in os.walk(dir_path):
         for f in files:
             file_path = os.path.join(root, f)
-            if _is_media_file(file_path):
+            if is_media_file(file_path):
                 yield (f, file_path)
 
-def extract_timestamp(file_path, use_meta=False):
-    time = None
-    if use_meta:
-        if _is_media_file(file_path, types=['image']):
-            time = _extract_image_timestamp(file_path)
-        elif _is_media_file(file_path, types=['video']):
-            time = _extract_video_timestamp(file_path)
-    if time:
-        return time
-    else:
-        return os.path.getmtime(file_path)
+def extract_meta_time(file_path):
+    if is_media_file(file_path, types=['image']):
+        return _extract_image_timestamp(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):
@@ -42,23 +39,7 @@ def import_file(src_file_path, dst_file_path):
     dst_stat = os.stat(dst_file_path)
     os.utime( dst_file_path, ns=(dst_stat.st_atime_ns, src_stat.st_mtime_ns) )
 
-def cleanup_dir(dir_path):
-    for root, dirs, files in os.walk(dir_path, topdown=False):
-        for name in files:
-            full_path = os.path.join(root, name)
-            if not _is_media_file(full_path):
-                try:
-                    os.remove(full_path)
-                except Exception as e:
-                    logging.warn('Error cleaning file %s: %s', full_path, str(e))
-        for name in dirs:
-            full_path = os.path.join(root, name)
-            try:
-                os.rmdir(full_path)
-            except Exception as e:
-                logging.warn('Error cleaning dir %s: %s', full_path, str(e))
-
-def _is_media_file(file_path, types=['image', 'video']):
+def is_media_file(file_path, types=['image', 'video']):
     if not os.path.isfile(file_path):
         return False
     mime_type = mimetypes.guess_type(file_path)[0]
@@ -69,13 +50,17 @@ def _is_media_file(file_path, types=['image', 'video']):
     return True
 
 def _extract_image_timestamp(file_path):
-    with PIL.Image.open(file_path) as image:
-        exif = image._getexif()
-        if exif and 36867 in exif:
-            return datetime.datetime\
-                           .strptime(exif[36867], '%Y:%m:%d %H:%M:%S')\
-                           .timestamp()
-    return None
+    time = None
+    try:
+        with PIL.Image.open(file_path) as image:
+            exif = image._getexif()
+            if exif and 36867 in exif:
+                time = datetime.datetime\
+                               .strptime(exif[36867], '%Y:%m:%d %H:%M:%S')\
+                               .timestamp()
+    except Exception as e:
+        logging.warn("Error extracting exif for %s: %s", file_path, str(e))
+    return time
 
 def _extract_video_timestamp(file_path):
     p = subprocess.run(['ffmpeg', '-i', file_path],