extract meta time for video files

[photosort.git] / src / photosort.py

diff --git a/src/photosort.py b/src/photosort.py
index 38bea1b3bdf29f795b620a0b3d445a9fc049b600..efe1790f106c9035e88f90d3b741553b6f403e01 100755 (executable)
--- a/src/photosort.py
+++ b/src/photosort.py
@@ -24,16 +24,17 @@ logging.basicConfig(format='[%(asctime)s] %(levelname)s: %(message)s',
 for src_file_name, src_file_path in misc.walk_media_files(args.SOURCE_DIR):
     logging.info('Processing %s...', src_file_name)
 
 for src_file_name, src_file_path in misc.walk_media_files(args.SOURCE_DIR):
     logging.info('Processing %s...', src_file_name)
 

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

 
     dst_dir = os.path.join(args.DEST_DIR,
 
     dst_dir = os.path.join(args.DEST_DIR,

-                           datetime.datetime.fromtimestamp(src_time).strftime("%Y/%m"))
+                           datetime.datetime.fromtimestamp(meta_time).strftime("%Y/%m"))

     dst_file_path = os.path.join(dst_dir, src_file_name)
 
     if not os.path.exists(dst_file_path):
         alt_dst_dir = misc.find_file(args.DEST_DIR,
                                      src_file_name,
     dst_file_path = os.path.join(dst_dir, src_file_name)
 
     if not os.path.exists(dst_file_path):
         alt_dst_dir = misc.find_file(args.DEST_DIR,
                                      src_file_name,

-                                     os.path.getsize(src_file_path))
+                                     os.path.getsize(src_file_path),
+                                     exclude_dir=args.SOURCE_DIR)

         if alt_dst_dir:
             dst_dir = alt_dst_dir
             dst_file_path = os.path.join(dst_dir, src_file_name)
         if alt_dst_dir:
             dst_dir = alt_dst_dir
             dst_file_path = os.path.join(dst_dir, src_file_name)


@@ -41,8 +42,12 @@ for src_file_name, src_file_path in misc.walk_media_files(args.SOURCE_DIR):
     if not os.path.exists(dst_file_path):
         if not os.path.exists(dst_dir):
             os.makedirs(dst_dir)
     if not os.path.exists(dst_file_path):
         if not os.path.exists(dst_dir):
             os.makedirs(dst_dir)

-        misc.import_file(src_file_path, dst_file_path, move=args.cleanup)
+        misc.import_file(src_file_path, dst_file_path)

     else:
     else:

+        src_time = misc.extract_timestamp(src_file_path)

         dst_time = misc.extract_timestamp(dst_file_path)
         if src_time > dst_time:
         dst_time = misc.extract_timestamp(dst_file_path)
         if src_time > dst_time:

-            misc.import_file(src_file_path, dst_file_path, move=args.cleanup)
+            misc.import_file(src_file_path, dst_file_path)
+
+if args.cleanup:
+    misc.delete_dir_contents(args.SOURCE_DIR)