Merge pull request #579 from WildernessLabs/output_cleanup

Output cleanup
WildernessLabs · Jun 16, 2024 · 5bd23cc · 5bd23cc
2 parents aaac4f6 + c5d0622
commit 5bd23cc
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 11 deletions.
diff --git a/Source/v2/Meadow.Cli/Commands/Current/App/AppDeployCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/App/AppDeployCommand.cs
@@ -119,7 +119,7 @@ private void OnFileWriteProgress(object? sender, (string fileName, long complete
         if (!double.IsNaN(p))
         {
             // Console instead of Logger due to line breaking for progress bar
-            Console?.Output.Write($"Writing {e.fileName}: {p:0}%         \r");
+            Console?.Output.Write($"Writing  '{e.fileName}': {p:0}%         \r");
         }
     }
 }
diff --git a/Source/v2/Meadow.Cli/Commands/Current/App/AppRunCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/App/AppRunCommand.cs
@@ -130,7 +130,7 @@ private void OnFileWriteProgress(object? sender, (string fileName, long complete
 
         if (!double.IsNaN(p))
         {   // Console instead of Logger due to line breaking for progress bar
-            Console?.Output.Write($"Writing {e.fileName}: {p:0}%         \r");
+            Console?.Output.Write($"Writing  '{e.fileName}': {p:0}%         \r");
         }
     }
 

diff --git a/Source/v2/Meadow.Cli/Commands/Current/File/FileDeleteCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/File/FileDeleteCommand.cs
@@ -27,7 +27,14 @@ protected override async ValueTask ExecuteCommand()
             await device.RuntimeDisable(CancellationToken);
         }
 
-        Logger?.LogInformation($"Looking for file {MeadowFile}...");
+        if (MeadowFile == "all")
+        {
+            Logger?.LogInformation($"Looking for files...");
+        }
+        else
+        {
+            Logger?.LogInformation($"Looking for file {MeadowFile}...");
+        }
 
         var folder = AppTools.SanitizeMeadowFolderName(Path.GetDirectoryName(MeadowFile)!);
 
@@ -60,7 +67,7 @@ protected override async ValueTask ExecuteCommand()
             }
             else
             {
-                Logger?.LogInformation($"Deleting file '{file}' from device...");
+                Logger?.LogInformation($"Deleting '{file}'");
                 await device.DeleteFile(file, CancellationToken);
             }
         }

diff --git a/Source/v2/Meadow.Cli/Commands/Current/File/FileWriteCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/File/FileWriteCommand.cs
@@ -51,7 +51,7 @@ protected override async ValueTask ExecuteCommand()
             if (!double.IsNaN(p))
             {
                 // Console instead of Logger due to line breaking for progress bar
-                Console?.Output.Write($"Writing {e.fileName}: {p:0}%     \r");
+                Console?.Output.Write($"Writing  '{e.fileName}': {p:0}%     \r");
             }
         };
 

diff --git a/Source/v2/Meadow.Cli/Meadow.CLI.csproj b/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.48.0</PackageVersion>
+    <PackageVersion>2.0.49.0</PackageVersion>
     <Platforms>AnyCPU</Platforms>
     <PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.CLI/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/WildernessLabs/Meadow.CLI</RepositoryUrl>

diff --git a/Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs b/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.48.0";
+    public const string CLI_VERSION = "2.0.49.0";
 }
diff --git a/Source/v2/Meadow.Dfu/DfuUtils.cs b/Source/v2/Meadow.Dfu/DfuUtils.cs
@@ -86,7 +86,7 @@ public static async Task<bool> FlashFile(string fileName, string? dfuSerialNumbe
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                logger.LogError("dfu-util not found - to install, run: `meadow install dfu-util` (may require administrator mode)");
+                logger.LogError("dfu-util not found - to install, run: `meadow dfu install` (may require administrator mode)");
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {

diff --git a/Source/v2/Meadow.Hcom/Connections/SerialConnection.cs b/Source/v2/Meadow.Hcom/Connections/SerialConnection.cs
@@ -1036,8 +1036,6 @@ void OnFileRetry(object? sender, EventArgs e)
         FileException += OnFileError;
         FileWriteFailed += OnFileRetry;
 
-        Debug.WriteLine($"Sending '{localFileName}'");
-
         EnqueueRequest(command);
 
         // this will wait for a "file write accepted" from the target

diff --git a/Source/v2/Meadow.Tooling.Core/App/AppManager.cs b/Source/v2/Meadow.Tooling.Core/App/AppManager.cs
@@ -168,7 +168,7 @@ public static async Task DeployApplication(
                 }
             }
 
-            logger?.LogInformation($"Sending  '{Path.GetFileName(localFile.Key)}'");
+            logger?.LogInformation($"Sending  '{Path.GetFileName(localFile.Key)}'".PadRight(80));
         send_file:
 
             if (!await connection.WriteFile(localFile.Key, meadowFilename, cancellationToken))