X-Git-Url: http://git.treefish.org/~alex/photosort.git/blobdiff_plain/33289bef2b08748db1c8061ecf453b291d2dc337..1847e0c3dd26952c7d4c2d19bac91fef43664d8e:/src/photosort.py

diff --git a/src/photosort.py b/src/photosort.py
index 38bea1b..3124eae 100755
--- a/src/photosort.py
+++ b/src/photosort.py
@@ -33,7 +33,8 @@ for src_file_name, src_file_path in misc.walk_media_files(args.SOURCE_DIR):
     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)
@@ -46,3 +47,6 @@ for src_file_name, src_file_path in misc.walk_media_files(args.SOURCE_DIR):
         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)
+
+if args.cleanup:
+    misc.delete_dir_contents(args.SOURCE_DIR)