print observer error

[photosort.git] / src / misc.py

diff --git a/src/misc.py b/src/misc.py
index 4d39b3382cfcfac732dcbb8a28fbac5bc201b3d2..6ca474932d7ba2955262032a5d7cbae7f45d2f9a 100644 (file)
--- a/src/misc.py
+++ b/src/misc.py
@@ -2,31 +2,32 @@ import datetime
 import mimetypes
 import os
 import PIL.Image
 import mimetypes
 import os
 import PIL.Image

+import re

 import shutil
 import shutil

+import subprocess

 
 def walk_media_files(dir_path):
     for root, dirs, files in os.walk(dir_path):
         for f in files:
             file_path = os.path.join(root, f)
 
 def walk_media_files(dir_path):
     for root, dirs, files in os.walk(dir_path):
         for f in files:
             file_path = os.path.join(root, f)

-            if _is_media_file(file_path):
+            if is_media_file(file_path):

                 yield (f, file_path)
 
                 yield (f, 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 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):
 
 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:
             continue
         for f in files:
             if f == file_name:


@@ -35,26 +36,38 @@ def find_file(dir_path, file_name, file_size, exclude_dir):
                     return root
     return None
 
                     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) )
 
     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 _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 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
         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