Delete empty directory, but only current one

Author: ivandokov

phockup.py

@@ -250,6 +250,7 @@ def handle_file(source_file, outputdir, dir_format, move_files, date_regex=None)
         else:
             if move_files:
                 shutil.move(source_file, target_file)
+                delete_empty_dir(os.path.dirname(source_file))
             else:
                 shutil.copy2(source_file, target_file)
 
@@ -284,10 +285,17 @@ def handle_file_xmp(source_file, photo_name, suffix, exif_output_dir, move_files
 
         if move_files:
             shutil.move(xmp_original, xmp_path)
+            delete_empty_dir(os.path.dirname(xmp_original))
         else:
             shutil.copy2(xmp_original, xmp_path)
 
 
+def delete_empty_dir(dir):
+    files = os.listdir(dir)
+    if len(files) == 0:
+        os.rmdir(dir)
+
+
 def sha256_checksum(filename, block_size=65536):
     sha256 = hashlib.sha256()
     with open(filename, 'rb') as f:

tests.py

@@ -192,6 +192,24 @@ def test_handle_move():
         assert os.path.isfile(os.path.join(dir_name, "unknown/in_move.txt.xmp"))
 
 
+def test_handle_move_removes_empty_dirs():
+    tempdir = tempfile.mkdtemp(suffix='first')
+    firstnesteddir = os.path.join(tempdir, 'one')
+    nesteddir = os.path.join(firstnesteddir, 'two', 'three')
+    os.makedirs(nesteddir, exist_ok=True)
+
+    open(os.path.join(nesteddir, "move.txt"), "w").close()
+
+    handle_file(os.path.join(nesteddir, "move.txt"), tempdir, "%Y/%m/%d", True)
+
+    assert not os.path.isfile(os.path.join(nesteddir, "move.txt"))
+
+    assert os.path.isfile(os.path.join(tempdir, "unknown/move.txt"))
+
+    # shutil.rmtree(tempdir)
+    assert not os.path.isdir(firstnesteddir)
+
+
 def test_handle_exists_same(capsys):
     with tempfile.TemporaryDirectory("phockup") as dir_name:
         output_dir = os.path.join(dir_name, "unknown")