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

diff --git a/src/misc.py b/src/misc.py
index 7ef46f3..adb94b1 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,14 @@ 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 and _is_media_file(file_path, types=['image']):
+        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() )
     return os.path.getmtime(file_path)
 
 def find_file(dir_path, file_name, file_size, exclude_dir):
@@ -25,7 +34,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):
@@ -35,12 +46,12 @@ def delete_dir_contents(dir_path):
         elif os.path.isdir(file_path):
             shutil.rmtree(file_path)
 
-def _is_media_file(file_path):
+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]
     if not mime_type:
         return False
-    if not mime_type.split('/')[0] in ['image', 'video']:
+    if not mime_type.split('/')[0] in types:
         return False
     return True