X-Git-Url: http://git.treefish.org/~alex/photosort.git/blobdiff_plain/d6f845cd6a693e5a062cfd39d8b187af03be1314..814a257da1e8aafa15f94f122d10c8f01bf2ad51:/src/misc.py?ds=inline

diff --git a/src/misc.py b/src/misc.py
index e02b817..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):
@@ -37,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