use exif time for subfolder

diff --git a/src/misc.py b/src/misc.py
index e02b8179d58e79ef90938914c9d630557b0ccb2e..4d39b3382cfcfac732dcbb8a28fbac5bc201b3d2 100644 (file)
--- a/src/misc.py
+++ b/src/misc.py
@@ -1,5 +1,7 @@
+import datetime

 import mimetypes
 import os
 import mimetypes
 import os

+import PIL.Image

 import shutil
 
 def walk_media_files(dir_path):
 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)
 
             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):
     return os.path.getmtime(file_path)
 
 def find_file(dir_path, file_name, file_size, exclude_dir):

diff --git a/src/photosort.py b/src/photosort.py
index 3124eaec4e76f347a376ac78d5408f8239986b46..09f55d727515ffd58d105b7ceab2038df541bb80 100755 (executable)
--- a/src/photosort.py
+++ b/src/photosort.py
@@ -24,10 +24,10 @@ logging.basicConfig(format='[%(asctime)s] %(levelname)s: %(message)s',
 for src_file_name, src_file_path in misc.walk_media_files(args.SOURCE_DIR):
     logging.info('Processing %s...', src_file_name)
 
 for src_file_name, src_file_path in misc.walk_media_files(args.SOURCE_DIR):
     logging.info('Processing %s...', src_file_name)
 

-    src_time = misc.extract_timestamp(src_file_path)
+    exif_time = misc.extract_timestamp(src_file_path, use_exif=True)

 
     dst_dir = os.path.join(args.DEST_DIR,
 
     dst_dir = os.path.join(args.DEST_DIR,

-                           datetime.datetime.fromtimestamp(src_time).strftime("%Y/%m"))
+                           datetime.datetime.fromtimestamp(exif_time).strftime("%Y/%m"))

     dst_file_path = os.path.join(dst_dir, src_file_name)
 
     if not os.path.exists(dst_file_path):
     dst_file_path = os.path.join(dst_dir, src_file_name)
 
     if not os.path.exists(dst_file_path):


@@ -44,6 +44,7 @@ for src_file_name, src_file_path in misc.walk_media_files(args.SOURCE_DIR):
             os.makedirs(dst_dir)
         misc.import_file(src_file_path, dst_file_path, move=args.cleanup)
     else:
             os.makedirs(dst_dir)
         misc.import_file(src_file_path, dst_file_path, move=args.cleanup)
     else:

+        src_time = misc.extract_timestamp(src_file_path)

         dst_time = misc.extract_timestamp(dst_file_path)
         if src_time > dst_time:
             misc.import_file(src_file_path, dst_file_path, move=args.cleanup)
         dst_time = misc.extract_timestamp(dst_file_path)
         if src_time > dst_time:
             misc.import_file(src_file_path, dst_file_path, move=args.cleanup)