added missing import

[photosort.git] / src / migrator.py

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)