move dateless files to na subdir

diff --git a/src/migrator.py b/src/migrator.py
index 26b7889a200db3148b0a8040f39b3a654c5f44ad..73650ce215d18841ed681a941218d74f75aca391 100644 (file)
--- a/src/migrator.py
+++ b/src/migrator.py
@@ -18,10 +18,14 @@ class Migrator:
                 logging.error('Error migrating %s: %s', src_file_path, str(e))
 
     def _migrate_single(self, src_file_name, src_file_path, remove):
                 logging.error('Error migrating %s: %s', src_file_path, str(e))
 
     def _migrate_single(self, src_file_name, src_file_path, remove):

-        meta_time = misc.extract_timestamp(src_file_path, use_meta=True)
+        meta_time = misc.extract_meta_time(src_file_path)

 
 

-        dst_dir = os.path.join(self._base_dst_dir,
-                               datetime.datetime.fromtimestamp(meta_time).strftime("%Y/%m"))
+        if meta_time:
+            dst_sub_dir = datetime.datetime.fromtimestamp(meta_time).strftime("%Y/%m")
+        else:
+            dst_sub_dir = "na"
+
+        dst_dir = os.path.join(self._base_dst_dir, dst_sub_dir)

         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):


@@ -38,8 +42,8 @@ class Migrator:
                 os.makedirs(dst_dir)
             misc.import_file(src_file_path, dst_file_path)
         else:
                 os.makedirs(dst_dir)
             misc.import_file(src_file_path, dst_file_path)
         else:

-            src_time = misc.extract_timestamp(src_file_path)
-            dst_time = misc.extract_timestamp(dst_file_path)
+            src_time = os.path.getmtime(src_file_path)
+            dst_time = os.path.getmtime(dst_file_path)

             if src_time > dst_time:
                 misc.import_file(src_file_path, dst_file_path)
 
             if src_time > dst_time:
                 misc.import_file(src_file_path, dst_file_path)
 

diff --git a/src/misc.py b/src/misc.py
index 6ca474932d7ba2955262032a5d7cbae7f45d2f9a..08baabb3113b4c1d08583f17f5ad1d0f24db6849 100644 (file)
--- a/src/misc.py
+++ b/src/misc.py
@@ -13,17 +13,11 @@ 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, 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 extract_meta_time(file_path):
+    if is_media_file(file_path, types=['image']):
+        return _extract_image_timestamp(file_path)
+    elif is_media_file(file_path, types=['video']):
+        return _extract_video_timestamp(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):


@@ -53,13 +47,17 @@ def is_media_file(file_path, types=['image', 'video']):
     return True
 
 def _extract_image_timestamp(file_path):
     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
+    time = None
+    try:
+        with PIL.Image.open(file_path) as image:
+            exif = image._getexif()
+            if exif and 36867 in exif:
+                time = datetime.datetime\
+                               .strptime(exif[36867], '%Y:%m:%d %H:%M:%S')\
+                               .timestamp()
+    except Exception as e:
+        logging.warn("Error extracting exif for %s: %s", file_path, str(e))
+    return time

 
 def _extract_video_timestamp(file_path):
     p = subprocess.run(['ffmpeg', '-i', file_path],
 
 def _extract_video_timestamp(file_path):
     p = subprocess.run(['ffmpeg', '-i', file_path],