X-Git-Url: http://git.treefish.org/~alex/photosort.git/blobdiff_plain/224556236ecd0f48f461738bc8157a82f5009618..e97415dff8bbc02a90428374c37d4d105d2a38ce:/src/migrator.py

diff --git a/src/migrator.py b/src/migrator.py
index b3703e0..73650ce 100644
--- a/src/migrator.py
+++ b/src/migrator.py
@@ -11,17 +11,21 @@ class Migrator:
 
     def migrate(self, remove):
         for src_file_name, src_file_path in misc.walk_media_files(self._base_src_dir):
-            logging.info('Migrating %s...', src_file_name)
+            logging.debug('Migrating %s...', src_file_name)
             try:
                 self._migrate_single(src_file_name, src_file_path, remove)
             except Exception as e:
                 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):
@@ -38,8 +42,8 @@ class Migrator:
                 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)