Added the base for persisting folders

Derroylo · Dec 3, 2023 · 9184273 · 9184273
1 parent f861960
commit 9184273
Show file tree

Hide file tree

Showing 4 changed files with 151 additions and 2 deletions.
diff --git a/classes/configuration/EnvConfiguration.cs b/classes/configuration/EnvConfiguration.cs
@@ -12,5 +12,9 @@ class EnvConfiguration
         private Dictionary<string, Dictionary<string, string>> files = new();
 
         public Dictionary<string, Dictionary<string, string>> Files { get { return files; } set { files = value; }}
+
+        private Dictionary<string, Dictionary<string, Dictionary<string, string>>> folders = new();
+
+        public Dictionary<string, Dictionary<string, Dictionary<string, string>>> Folders { get { return folders; } set { folders = value; }}
     }
 }
diff --git a/commands/environment/AddEnvCommand.cs b/commands/environment/AddEnvCommand.cs
@@ -20,7 +20,7 @@ public class Settings : CommandSettings
 
         public override int Execute(CommandContext context, Settings settings)
         {
-            var envTypes = new string[] {"Variable", "File"};
+            var envTypes = new string[] {"Variable", "File", "Folder"};
 
             var envType = AnsiConsole.Prompt(
                 new SelectionPrompt<string>()
@@ -33,6 +33,8 @@ public override int Execute(CommandContext context, Settings settings)
                 AddVariable();
             } else if (envType == "File") {
                 AddFile();
+            } else if (envType == "Folder") {
+                AddFolder();
             }
 
             return 0;
@@ -41,6 +43,136 @@ public override int Execute(CommandContext context, Settings settings)
         [GeneratedRegex(@"^([a-z0-9-_]+)$")]
         private static partial Regex EnvNameMatchRegex();
 
+        private void AddFolder()
+        {
+            bool finished = false;
+
+            do {
+                var envFileShortname = string.Empty;
+                bool inputInvalid = false;
+
+                do {
+                    inputInvalid = false;
+
+                    envFileShortname = AnsiConsole.Ask<string>("Shortname for the folder? (Will only be used as entry name in .gpt.yml.): ");
+
+                    if (!EnvNameMatchRegex().Match(envFileShortname).Success) {
+                        AnsiConsole.MarkupLine("[red]The name should only consist of the following characters: a-z 0-9 - _[/]");
+                        inputInvalid = true;
+                    }
+
+                    if (EnvironmentConfig.Folders.Keys.Contains(envFileShortname, StringComparer.OrdinalIgnoreCase)) {
+                        if (!AnsiConsole.Confirm("An entry with that name already exists. Do you want to replace it?", false)) {
+                            inputInvalid = true;
+                        }
+                    }
+                } while (inputInvalid);
+
+                var envFolderPath = string.Empty;
+                string[] files = null;
+
+                do {
+                    inputInvalid = false;
+
+                    envFolderPath = AnsiConsole.Ask<string>("Enter the full path to the folder:");
+
+                    if (!Directory.Exists(envFolderPath)) {
+                        AnsiConsole.MarkupLine("[red]The folder could not be found![/]");
+                        inputInvalid = true;
+                    }
+
+                    files = Directory.GetFiles(envFolderPath, "*", SearchOption.AllDirectories);
+
+                    if (files.Length == 0) {
+                        AnsiConsole.MarkupLine("[red]No files found in the folder.[/]");
+                        inputInvalid = true;
+                    }
+                } while (inputInvalid);
+
+                var saveLocations = new string[] {".gpt.yml", "gitpod"};
+
+                var saveLocation = AnsiConsole.Prompt(
+                    new SelectionPrompt<string>()
+                        .Title("Where should the content of the file being saved?")
+                        .PageSize(10)
+                        .AddChoices(saveLocations)
+                );
+
+                var gpVariable = string.Empty;
+
+                if (saveLocation == "gitpod") {
+                    do {
+                        inputInvalid = false;
+
+                        gpVariable = AnsiConsole.Ask<string>("What is the name of the variable?");
+
+                        if (!EnvNameMatchRegex().Match(gpVariable).Success) {
+                            AnsiConsole.MarkupLine("[red]The variable name should only consist of the following characters: a-z 0-9 - _[/]");
+                            inputInvalid = true;
+                        }
+                    } while (inputInvalid);
+                }
+
+                EnvironmentConfig.Folders.TryGetValue(envFileShortname, out Dictionary<string, Dictionary<string, string>> existingEntry);
+
+                foreach (string file in files) {
+                    string encodedFileContent = string.Empty;
+
+                    try {
+                        var fileContent = File.ReadAllText(file);
+                        encodedFileContent = Convert.ToBase64String(Encoding.UTF8.GetBytes(fileContent));
+                    } catch (Exception e) {
+                        AnsiConsole.WriteException(e);
+                    }
+
+                    /*if (existingEntry != null) {
+                        if (existingEntry.ContainsKey("file")) {
+                            existingEntry["file"] = envFilePath;
+                        } else {
+                            existingEntry.Add("file", envFilePath);
+                        }
+
+                        if (existingEntry.ContainsKey("content") && saveLocation == ".gpt.yml") {
+                            existingEntry["content"] = encodedFileContent;
+                        } else if (!existingEntry.ContainsKey("content") && saveLocation == ".gpt.yml") {
+                            existingEntry.Add("content", encodedFileContent);
+                        } else if (existingEntry.ContainsKey("content") && saveLocation != ".gpt.yml") {
+                            existingEntry.Remove("content");
+                        }
+
+                        if (existingEntry.ContainsKey("var") && saveLocation != ".gpt.yml") {
+                            existingEntry.Remove("var");
+                        }
+                    } else {
+                        var newEntry = new Dictionary<string, string>() {
+                            {"file", envFilePath}
+                        };
+
+                        if (saveLocation == ".gpt.yml") {
+                            newEntry.Add("content", encodedFileContent);
+                        } else {
+                            newEntry.Add("var", gpVariable);
+                        }
+
+                        EnvironmentConfig.Files.Add(envFileShortname, newEntry);
+                    }
+
+                    if (saveLocation != ".gpt.yml") {
+                        ExecCommand.Exec("gp env " + gpVariable + "=" + encodedFileContent, 10);
+                    }*/
+                }
+
+                // Mark the config as updated, so it will be saved on exiting the application
+                EnvironmentConfig.ConfigUpdated = true;
+
+                if (!AnsiConsole.Confirm("Do you want to add more files?", false)) {
+                    finished = true;
+                }
+            } while (!finished);
+
+            AnsiConsole.MarkupLine("[green]The changes have been saved.[/]");
+        }
+
         private void AddFile()
         {
             bool finished = false;

diff --git a/helper/env/EnvRestoreHelper.cs b/helper/env/EnvRestoreHelper.cs
@@ -48,7 +48,7 @@ public static void RestoreEnvironmentFiles(bool debug = false)
                 entry.Value.TryGetValue("gpVariable", out string gpVariable);
 
                 if (encodedFileContent == null && gpVariable != null) {
-
+                    encodedFileContent = Environment.GetEnvironmentVariable(gpVariable);
                 }
 
                 if (encodedFileContent != null && encodedFileContent != string.Empty) {

diff --git a/helper/internal/config/sections/EnvironmentConfig.cs b/helper/internal/config/sections/EnvironmentConfig.cs
@@ -29,5 +29,18 @@ public static Dictionary<string, Dictionary<string, string>> Files
                 appConfig.Env.Files = value;
             }
         }
+
+        public static Dictionary<string, Dictionary<string, Dictionary<string, string>>> Folders 
+        { 
+            get { 
+                return appConfig.Env.Folders; 
+            } 
+
+            set { 
+                ConfigUpdated = true;
+
+                appConfig.Env.Folders = value; 
+            }
+        }
     }
 }