DisplayWorkingDirectoryInPrompt ConfigItem added with a default value…

… of false;
sLill · Nov 28, 2023 · 5b0c787 · 5b0c787
1 parent 304364e
commit 5b0c787
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 17 deletions.
diff --git a/WindowsGrep/WindowsGrep.Common/Utils/WindowsUtils.cs b/WindowsGrep/WindowsGrep.Common/Utils/WindowsUtils.cs
@@ -20,6 +20,12 @@ public static class WindowsUtils
         #endregion Fields..
 
         #region Methods..
+        public static string GetCompressedPath(string fullPath)
+        {
+            var directories = fullPath.Split(Path.DirectorySeparatorChar);
+            return directories.Length > 1 ? @"..\" + directories[directories.Length - 1] : fullPath;
+        }
+
         public static async Task<List<string>> GetFilesAsync(string path, bool recursive, CancellationToken cancellationToken, FileAttributes fileAttributesToSkip = default)
         {
             var enumerationOptions = new EnumerationOptions() { ReturnSpecialDirectories = true, AttributesToSkip = fileAttributesToSkip };

diff --git a/WindowsGrep/WindowsGrep.Configuration/ConfigurationManager.cs b/WindowsGrep/WindowsGrep.Configuration/ConfigurationManager.cs
@@ -69,12 +69,14 @@ private void LoadConfiguration()
                 else
                     LoadDefaultConfiguration();
 
-                SaveConfiguration();
             }
             catch (Exception ex)
             {
                 Console.WriteLine($"Could not load configuration - {ex.Message}");
+                LoadDefaultConfiguration();
             }
+
+            SaveConfiguration();
         }
 
         public void SaveConfiguration()

diff --git a/WindowsGrep/WindowsGrep.Configuration/Enums/ConfigItem.cs b/WindowsGrep/WindowsGrep.Configuration/Enums/ConfigItem.cs
@@ -10,7 +10,7 @@ public enum ConfigItem
         [DefaultValue(true)]
         IncludeHiddenFiles,
 
-        [DefaultValue(true)]
-        CompressPath
+        [DefaultValue(false)]
+        DisplayWorkingDirectoryInPrompt,
     }
 }
diff --git a/WindowsGrep/WindowsGrep.Core/Utils/ConsoleUtils.cs b/WindowsGrep/WindowsGrep.Core/Utils/ConsoleUtils.cs
@@ -2,6 +2,7 @@
 using System.Data;
 using System.Text.RegularExpressions;
 using WindowsGrep.Common;
+using WindowsGrep.Configuration;
 
 namespace WindowsGrep.Core
 {
@@ -113,6 +114,23 @@ public static void PublishReadMe()
             Console.WriteLine(readMe + Environment.NewLine);
         }
 
+        public static void PublishPrompt()
+        {
+            string prompt = string.Empty;
+
+            bool displayWorkingDirectoryInPrompt = (bool)ConfigurationManager.Instance.ConfigItemCollection[ConfigItem.DisplayWorkingDirectoryInPrompt];
+            if (displayWorkingDirectoryInPrompt)
+            {
+                string currentDirectory = Directory.GetCurrentDirectory();
+                currentDirectory = WindowsUtils.GetCompressedPath(currentDirectory);
+                prompt = $"{currentDirectory}> ";
+            }
+            else
+                prompt = "$ ";
+
+            Console.Write(prompt);
+        }
+
         public static void WriteConsoleItem(ConsoleItem consoleItem)
         {
             Console.BackgroundColor = consoleItem.BackgroundColor;

diff --git a/WindowsGrep/WindowsGrep/Program.cs b/WindowsGrep/WindowsGrep/Program.cs
@@ -25,13 +25,7 @@ private static async Task Main(string[] args)
                 string command = string.Empty;
                 if (args.Length == 0)
                 {
-                    // Prompt
-                    bool compressPath = (bool)ConfigurationManager.Instance.ConfigItemCollection[ConfigItem.CompressPath];
-                    string currentDirectory = Directory.GetCurrentDirectory();
-                    currentDirectory = compressPath ? GetCompressedPath(currentDirectory) : currentDirectory;
-
-                    Console.Write($"{currentDirectory}> ");
-
+                    ConsoleUtils.PublishPrompt();
                     command = Console.ReadLine();
                 }
                 else
@@ -93,13 +87,7 @@ private static void Initialize(string[] args)
             // Override the default behavior for the Ctrl+C shortcut if the application was not ran from the command line
             if (Environment.UserInteractive)
                 Console.CancelKeyPress += new ConsoleCancelEventHandler(Console_OnCancelKeyPress);
-        }
-
-        private static string GetCompressedPath(string fullPath)
-        {
-            var directories = fullPath.Split(Path.DirectorySeparatorChar);
-            return directories.Length > 1 ? @"..\" + directories[directories.Length - 1] : fullPath;
-        }
+        }     
         #endregion Methods..
     }
 }