Rationalize filesystem constants

WildernessLabs · Aug 6, 2024 · 08a6f91 · 08a6f91
1 parent 1683ff6
commit 08a6f91
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Source/v2/Meadow.CLI/Commands/Current/App/AppTools.cs b/Source/v2/Meadow.CLI/Commands/Current/App/AppTools.cs
@@ -7,8 +7,6 @@ namespace Meadow.CLI.Commands.DeviceManagement;
 
 internal static class AppTools
 {
-    internal const string MeadowRootFolder = "meadow0";
-
     internal static string ValidateAndSanitizeAppPath(string? path)
     {
         path ??= Directory.GetCurrentDirectory();
@@ -124,15 +122,15 @@ internal static string SanitizeMeadowFilename(string fileName)
 
         if (string.IsNullOrWhiteSpace(folder))
         {
-            folder = Path.DirectorySeparatorChar + MeadowRootFolder;
+            folder = Path.DirectorySeparatorChar + AppManager.MeadowRootFolder;
         }
         else
         {
             if (!folder.StartsWith(Path.DirectorySeparatorChar))
             {
-                if (!folder.StartsWith($"{MeadowRootFolder}"))
+                if (!folder.StartsWith($"{AppManager.MeadowRootFolder}"))
                 {
-                    folder = $"{Path.DirectorySeparatorChar}{MeadowRootFolder}{Path.DirectorySeparatorChar}{folder}";
+                    folder = $"{Path.DirectorySeparatorChar}{AppManager.MeadowRootFolder}{Path.DirectorySeparatorChar}{folder}";
                 }
                 else
                 {

diff --git a/Source/v2/Meadow.Tooling.Core/App/AppManager.cs b/Source/v2/Meadow.Tooling.Core/App/AppManager.cs
@@ -14,13 +14,14 @@ namespace Meadow.CLI;
 
 public static class AppManager
 {
-    static readonly string MeadowRootFolder = "meadow0";
+    public static readonly string MeadowRootFolder = "meadow0";
 
-    static readonly string[] PersistantFolders = new string[]
+    public static readonly string[] PersistantFolders = new string[]
     {
         "Data",
         "Documents",
         "update-store",
+        "system",
     };
 
     private static bool MatchingDllExists(string file)
@@ -132,6 +133,11 @@ public static async Task DeployApplication(
         // delete those files
         foreach (var file in removeFiles)
         {
+            if (PersistantFolders.Contains(file.Path))
+            {
+                continue;
+            }
+
             logger?.LogInformation($"Deleting '{file}'");
             var folder = string.IsNullOrEmpty(file.Path) ? $"/{MeadowRootFolder}/" : $"/{MeadowRootFolder}/{file.Path}/";