re-implemented cleanup

[photosort.git] / src / misc.py

diff --git a/src/misc.py b/src/misc.py
index e02b8179d58e79ef90938914c9d630557b0ccb2e..d805e0c48a9200652d9f9c2bc6e876e1c1d33499 100644 (file)
--- a/src/misc.py
+++ b/src/misc.py
@@ -1,6 +1,10 @@
+import datetime
 import mimetypes
 import os
+import PIL.Image
+import re
 import shutil
+import subprocess
 
 def walk_media_files(dir_path):
     for root, dirs, files in os.walk(dir_path):
@@ -9,12 +13,21 @@ def walk_media_files(dir_path):
             if _is_media_file(file_path):
                 yield (f, file_path)
 
-def extract_timestamp(file_path):
-    return os.path.getmtime(file_path)
+def extract_timestamp(file_path, use_meta=False):
+    time = None
+    if use_meta:
+        if _is_media_file(file_path, types=['image']):
+            time = _extract_image_timestamp(file_path)
+        elif _is_media_file(file_path, types=['video']):
+            time = _extract_video_timestamp(file_path)
+    if time:
+        return time
+    else:
+        return os.path.getmtime(file_path)
 
 def find_file(dir_path, file_name, file_size, exclude_dir):
     for root, dirs, files in os.walk(dir_path):
-        if root == exclude_dir:
+        if root.startswith(exclude_dir):
             continue
         for f in files:
             if f == file_name:
@@ -23,26 +36,54 @@ def find_file(dir_path, file_name, file_size, exclude_dir):
                     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)
     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):
-        file_path = os.path.join(dir_path, file_name)
-        if os.path.isfile(file_path) or os.path.islink(file_path):
-            os.unlink(file_path)
-        elif os.path.isdir(file_path):
-            shutil.rmtree(file_path)
+def cleanup_dir(dir_path):
+    for root, dirs, files in os.walk(dir_path, topdown=False):
+        for name in files:
+            full_path = os.path.join(root, name)
+            if not _is_media_file(full_path):
+                try:
+                    os.remove(full_path)
+                except Exception as e:
+                    logging.warn('Error cleaning file %s: %s', full_path, str(e))
+        for name in dirs:
+            full_path = os.path.join(root, name)
+            try:
+                os.rmdir(full_path)
+            except Exception as e:
+                logging.warn('Error cleaning dir %s: %s', full_path, str(e))
 
-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
+
+def _extract_image_timestamp(file_path):
+    with PIL.Image.open(file_path) as image:
+        exif = image._getexif()
+        if exif and 36867 in exif:
+            return datetime.datetime\
+                           .strptime(exif[36867], '%Y:%m:%d %H:%M:%S')\
+                           .timestamp()
+    return None
+
+def _extract_video_timestamp(file_path):
+    p = subprocess.run(['ffmpeg', '-i', file_path],
+                       capture_output=True, encoding='UTF-8')
+    for line in p.stderr.splitlines():
+        m = re.search('^.*creation_time.*: ([^ ]+)$', line)
+        if m:
+            return datetime.datetime\
+                           .strptime(m.group(1), '%Y-%m-%dT%H:%M:%S.%fZ')\
+                           .timestamp()
+    return None