X-Git-Url: http://git.treefish.org/~alex/photosort.git/blobdiff_plain/1847e0c3dd26952c7d4c2d19bac91fef43664d8e..d15281357553c1fe81f4408d44ade249fa1dcdd9:/src/misc.py

diff --git a/src/misc.py b/src/misc.py
index 7ef46f3..4d39b33 100644
--- a/src/misc.py
+++ b/src/misc.py
@@ -1,5 +1,7 @@
+import datetime
 import mimetypes
 import os
+import PIL.Image
 import shutil
 
 def walk_media_files(dir_path):
@@ -9,7 +11,17 @@ def walk_media_files(dir_path):
             if _is_media_file(file_path):
                 yield (f, file_path)
 
-def extract_timestamp(file_path):
+def extract_timestamp(file_path, use_exif=False):
+    if use_exif:
+        try:
+            with PIL.Image.open(file_path) as image:
+                exif = image._getexif()
+                if exif and 36867 in exif:
+                    return int( datetime.datetime
+                                .strptime(exif[36867], '%Y:%m:%d %H:%M:%S')
+                                .timestamp() )
+        except PIL.UnidentifiedImageError:
+            pass
     return os.path.getmtime(file_path)
 
 def find_file(dir_path, file_name, file_size, exclude_dir):
@@ -25,7 +37,9 @@ def find_file(dir_path, file_name, file_size, exclude_dir):
 
 def import_file(src_file_path, dst_file_path, move=False):
     shutil.copyfile(src_file_path, dst_file_path)
-    shutil.copystat(src_file_path, dst_file_path)
+    src_stat = os.stat(src_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 delete_dir_contents(dir_path):
     for file_name in os.listdir(dir_path):