From 1961999e8b56486c4d57bd5f70f64e09a21a2f71 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Sun, 25 Dec 2022 20:43:19 -0700 Subject: [PATCH] Added DeleteEmptyDirectories to Drag Drop --- Drag-Drop/Form.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Drag-Drop/Form.cs b/Drag-Drop/Form.cs index bf3b6d1..4b49858 100644 --- a/Drag-Drop/Form.cs +++ b/Drag-Drop/Form.cs @@ -53,7 +53,7 @@ public partial class Form : System.Windows.Forms.Form configurationRoot = configurationBuilder.Build(); appSettings = Models.Binder.AppSettings.Get(configurationRoot); if (string.IsNullOrEmpty(appSettings.WorkingDirectoryName)) - throw new Exception("Working directory name must have a value!"); + throw new Exception("Working directory name must have parentDirectory value!"); workingDirectory = IWorkingDirectory.GetWorkingDirectory(assembly.GetName().Name, appSettings.WorkingDirectoryName); Environment.SetEnvironmentVariable(nameof(workingDirectory), workingDirectory); _ = ConfigurationLoggerConfigurationExtensions.Configuration(loggerConfiguration.ReadFrom, configurationRoot); @@ -188,6 +188,11 @@ public partial class Form : System.Windows.Forms.Form bool isValidImageFormatExtension; string? extraLargeBitmapThumbnail; string[] files = Directory.GetFiles(directory, searchPattern, SearchOption.TopDirectoryOnly); + if (files.All(l => l.EndsWith(".id"))) + { + foreach (string file in files) + File.Delete(file); + } _ProgressBar.Maximum = files.Length; foreach (string file in files) { @@ -445,7 +450,12 @@ public partial class Form : System.Windows.Forms.Form { List directories = GetDirectoriesOrDoDragDrop(paths); if (directories.Any()) + { RenameFilesInDirectories(directories); + string? parentDirectory = Path.GetDirectoryName(directories[0]); + if (parentDirectory is not null) + _ = IPath.DeleteEmptyDirectories(parentDirectory); + } } } catch (Exception)