빈 폴더 제거하는 옵션 동작 안 하는 문제 수정

daramkun · Jul 5, 2024 · 6660984 · 6660984
1 parent 7e341a9
commit 6660984
Showing 1 changed file with 23 additions and 15 deletions.
diff --git a/DaramRenamer.Windows/ApplyWindow.xaml.cs b/DaramRenamer.Windows/ApplyWindow.xaml.cs
@@ -50,6 +50,8 @@ private async void OnShown(EventArgs e)
             ProceedTextBlock.Text = "0";
             TotalTextBlock.Text = FileInfo.Files.Count.ToString();
 
+            var oldPaths = FileInfo.Files.Select(fileInfo => fileInfo.ChangedPath).ToArray();
+
             await Task.Run(() =>
             {
                 FileInfo.Apply(Preferences.Instance.AutomaticFixingFilename, Preferences.Instance.RenameMode,
@@ -69,23 +71,29 @@ await Dispatcher.BeginInvoke((Action) (() =>
 
                         if (errorCode != ErrorCode.NoError)
                             failed = true;
-                        else
-                        {
-                            if (Preferences.Instance.RemoveEmptyDirectory &&
-                                GetTotalFileCount(fileInfo.OriginalPath) == 0)
-                            {
-                                try
-                                {
-                                    Directory.Delete(fileInfo.OriginalPath, recursive: true);
-                                }
-                                catch
-                                {
-                                    // Ignore
-                                }
-                            }
-                        }
                     });
             });
+
+            if (Preferences.Instance.RemoveEmptyDirectory)
+            {
+                await Task.Run(() =>
+                {
+                    foreach (var oldPath in oldPaths)
+                    {
+                        if (GetTotalFileCount(oldPath) != 0)
+                            continue;
+                        
+                        try
+                        {
+                            Directory.Delete(oldPath, recursive: true);
+                        }
+                        catch
+                        {
+                            // Ignore
+                        }
+                    }
+                });
+            }
 
             switch (failed)
             {