Merge pull request #588 from WildernessLabs/2.0.55

2.0.55

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
                 {

Source/v2/Meadow.Cli/Commands/Current/File/FileDeleteCommand.cs

@@ -76,6 +76,15 @@ protected override async ValueTask ExecuteCommand()
     private async Task DeleteFileRecursive(IMeadowDevice device, string directoryname, MeadowFileInfo fileInfo, CancellationToken cancellationToken)
     {
         var meadowFile = AppTools.SanitizeMeadowFilename(Path.Combine(directoryname, fileInfo.Name));
+
+        foreach (var folder in AppManager.PersistantFolders)
+        {
+            if (meadowFile.StartsWith($"/{AppManager.MeadowRootFolder}/{folder}"))
+            {
+                return;
+            }
+        }
+
         if (fileInfo.IsDirectory)
         {
             // Add a backslash as we're a directory and not a file

Source/v2/Meadow.Cli/Commands/Current/File/FileListCommand.cs

@@ -35,7 +35,7 @@ protected override async ValueTask ExecuteCommand()
             Logger?.LogInformation($"Getting file list...");
         }
 
-        var files = await device.GetFileList(Folder ?? $"/{AppTools.MeadowRootFolder}/", Verbose, CancellationToken);
+        var files = await device.GetFileList(Folder ?? $"/{AppManager.MeadowRootFolder}/", Verbose, CancellationToken);
 
         if (files == null || files.Length == 0)
         {

Source/v2/Meadow.Cli/Commands/Current/Firmware/FirmwareWriteCommand.cs

@@ -223,7 +223,7 @@ protected override async ValueTask ExecuteCommand()
             }
             else
             {
-                await connection!.Device!.WriteFile(osFileWithoutBootloader, $"/{AppTools.MeadowRootFolder}/update/os/{package.OsWithoutBootloader}");
+                await connection!.Device!.WriteFile(osFileWithoutBootloader, $"/{AppManager.MeadowRootFolder}/update/os/{package.OsWithoutBootloader}");
             }
         }
 
@@ -361,7 +361,7 @@ private async Task<IMeadowConnection> FindMeadowConnection(IList<string> portsTo
         }
         else
         {
-            await connection.Device!.WriteFile(runtimePath, $"/{AppTools.MeadowRootFolder}/update/os/{destinationFilename}");
+            await connection.Device!.WriteFile(runtimePath, $"/{AppManager.MeadowRootFolder}/update/os/{destinationFilename}");
         }
 
         return connection;
@@ -403,7 +403,7 @@ private async Task WriteEspFiles(IMeadowConnection? connection, DeviceInfo? devi
         {
             foreach (var file in fileList)
             {
-                await connection!.Device!.WriteFile(file, $"/{AppTools.MeadowRootFolder}/update/os/{Path.GetFileName(file)}");
+                await connection!.Device!.WriteFile(file, $"/{AppManager.MeadowRootFolder}/update/os/{Path.GetFileName(file)}");
                 await Task.Delay(500);
             }
         }

Source/v2/Meadow.Cli/Meadow.CLI.csproj

@@ -10,7 +10,7 @@
     <Authors>Wilderness Labs, Inc</Authors>
     <Company>Wilderness Labs, Inc</Company>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageVersion>2.0.54.0</PackageVersion>
+    <PackageVersion>2.0.55.0</PackageVersion>
     <Platforms>AnyCPU</Platforms>
     <PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.CLI/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/WildernessLabs/Meadow.CLI</RepositoryUrl>

Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs

@@ -6,5 +6,5 @@ namespace Meadow.CLI;
 
 public static class Constants
 {
-    public const string CLI_VERSION = "2.0.54.0";
+    public const string CLI_VERSION = "2.0.55.0";
 }

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,8 +133,13 @@ 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}/" : $"{file.Path}";
+            var folder = string.IsNullOrEmpty(file.Path) ? $"/{MeadowRootFolder}/" : $"/{MeadowRootFolder}/{file.Path}/";
 
             await connection.DeleteFile($"{folder}{file.Name}", cancellationToken);
         }