refactoring

[photosort.git] / src / misc.py

diff --git a/src/misc.py b/src/misc.py
index 4d39b3382cfcfac732dcbb8a28fbac5bc201b3d2..9f5d677ff8abce6a477a1973dc174f68ad7ebe9c 100644 (file)
--- a/src/misc.py
+++ b/src/misc.py
@@ -12,16 +12,13 @@ def walk_media_files(dir_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
+    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):
@@ -35,7 +32,7 @@ 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)
@@ -49,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