do not look for alternative file in source dir

[photosort.git] / src / misc.py

diff --git a/src/misc.py b/src/misc.py
index 9a78f4ee9ab31c1d4f7cc26fc2bd504c922bac77..7ef46f36ffd5313ed1451c1add276e2024c7f7b6 100644 (file)
--- a/src/misc.py
+++ b/src/misc.py
@@ -12,8 +12,10 @@ def walk_media_files(dir_path):
 def extract_timestamp(file_path):
     return os.path.getmtime(file_path)
 
-def find_file(dir_path, file_name, file_size):
+def find_file(dir_path, file_name, file_size, exclude_dir):
     for root, dirs, files in os.walk(dir_path):
+        if root == exclude_dir:
+            continue
         for f in files:
             if f == file_name:
                 full_path = os.path.join(root, f)
@@ -22,12 +24,17 @@ def find_file(dir_path, file_name, file_size):
     return None
 
 def import_file(src_file_path, dst_file_path, move=False):
-    if move:
-        shutil.move(src_file_path, dst_file_path)
-    else:
-        shutil.copyfile(src_file_path, dst_file_path)
+    shutil.copyfile(src_file_path, dst_file_path)
     shutil.copystat(src_file_path, dst_file_path)
 
+def delete_dir_contents(dir_path):
+    for file_name in os.listdir(dir_path):
+        file_path = os.path.join(dir_path, file_name)
+        if os.path.isfile(file_path) or os.path.islink(file_path):
+            os.unlink(file_path)
+        elif os.path.isdir(file_path):
+            shutil.rmtree(file_path)
+
 def _is_media_file(file_path):
     if not os.path.isfile(file_path):
         return False