refactoring

[photosort.git] / src / misc.py

diff --git a/src/misc.py b/src/misc.py
index 4cbbf74e9f2787af3a40d09cd41593bfe8900080..9f5d677ff8abce6a477a1973dc174f68ad7ebe9c 100644 (file)
--- 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,11 +11,20 @@ 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):
+def find_file(dir_path, file_name, file_size, exclude_dir):
     for root, dirs, files in os.walk(dir_path):
+        if root == exclude_dir:
+            continue
         for f in files:
             if f == file_name:
                 full_path = os.path.join(root, f)
@@ -21,9 +32,11 @@ def find_file(dir_path, file_name, file_size):
                     return root
     return None
 
-def import_file(src_file_path, dst_file_path, move=False):
+def import_file(src_file_path, dst_file_path):
     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):
@@ -33,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