Merge pull request #521 from WildernessLabs/more_cleanup

More cleanup and version bump
WildernessLabs · Mar 7, 2024 · 0389c6b · 0389c6b
2 parents 2e75512 + a38f3cf
commit 0389c6b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 157 deletions.
diff --git a/Source/v2/Meadow.CLI/Commands/Current/Uart/UartProfilerEnableCommand.cs b/Source/v2/Meadow.CLI/Commands/Current/Uart/UartProfilerEnableCommand.cs
@@ -18,17 +18,19 @@ public UartProfilerEnableCommand(MeadowConnectionManager connectionManager, ILog
         : base(connectionManager, loggerFactory)
     { }
 
-    private void StartNewFile(string outputPath, ref FileStream outputFile, byte[] header, ref int headerIndex, ref int totalBytesWritten, ref int headerFileCount)
+    private void StartNewFile(string outputPath, FileStream? outputFile, byte[] header, ref int headerIndex, ref int totalBytesWritten, ref int headerFileCount)
     {
         if (outputFile != null)
         {
             outputFile.Close();
             outputFile.Dispose();
         }
+
         outputFile = new FileStream(outputPath, FileMode.Create);
         totalBytesWritten = 0;
         headerIndex = 0;
         headerFileCount++;
+
         foreach (var headerByte in header)
         {
             outputFile.WriteByte(headerByte);
@@ -50,7 +52,7 @@ private void ReadAndSaveSerialData()
         var outputPath = Path.Combine(outputDirectory, "output.mlpd");
 
         SerialPort port = new SerialPort(SerialInterface, SerialConnection.DefaultBaudRate);
-        FileStream outputFile = null;
+        FileStream? outputFile = null;
 
         try
         {
@@ -72,7 +74,7 @@ private void ReadAndSaveSerialData()
                             if (headerIndex == header.Length)
                             {
                                 Logger?.LogInformation($"Profiling data header found! Writing to {outputPath}...");
-                                StartNewFile(outputPath, ref outputFile, header, ref headerIndex, ref totalBytesWritten, ref headerFileCount);
+                                StartNewFile(outputPath, outputFile, header, ref headerIndex, ref totalBytesWritten, ref headerFileCount);
                             }
                         }
                         else
@@ -84,7 +86,7 @@ private void ReadAndSaveSerialData()
                     else
                     {
                         // Writing to file after a header is found
-                        outputFile.WriteByte((byte)data);
+                        outputFile?.WriteByte((byte)data);
                         totalBytesWritten++;
 
                         // Check for a new header while writing to a file
@@ -97,7 +99,7 @@ private void ReadAndSaveSerialData()
                                 //  to avoid corrupted profiling data (e.g. device reset while profiling)
                                 var newOutputPath = outputDirectory + "output_" + headerFileCount + ".mlpd";
                                 Logger?.LogInformation($"New profiling data header found! Writing to {newOutputPath}...");
-                                StartNewFile(newOutputPath, ref outputFile, header, ref headerIndex, ref totalBytesWritten, ref headerFileCount);
+                                StartNewFile(newOutputPath, outputFile, header, ref headerIndex, ref totalBytesWritten, ref headerFileCount);
                             }
                         }
                         else

diff --git a/Source/v2/Meadow.Cli/AppManager.cs b/Source/v2/Meadow.Cli/AppManager.cs
diff --git a/Source/v2/Meadow.Cli/Commands/Current/App/AppBuildCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/App/AppBuildCommand.cs
@@ -21,7 +21,7 @@ public AppBuildCommand(IPackageManager packageManager, ILoggerFactory loggerFact
         _packageManager = packageManager;
     }
 
-    protected override async ValueTask ExecuteCommand()
+    protected override ValueTask ExecuteCommand()
     {
         var path = AppTools.ValidateAndSanitizeAppPath(Path);
 
@@ -39,5 +39,7 @@ protected override async ValueTask ExecuteCommand()
         {
             Logger?.LogInformation($"Build successful");
         }
+
+        return default;
     }
 }
diff --git a/Source/v2/Meadow.Cli/Commands/Current/Config/ConfigCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/Config/ConfigCommand.cs
@@ -12,7 +12,7 @@ public class ConfigCommand : BaseSettingsCommand<ConfigCommand>
     [CommandParameter(0, Name = "Settings", IsRequired = false)]
     public string[]? Settings { get; init; }
 
-    public ConfigCommand(ISettingsManager settingsManager, ILoggerFactory? loggerFactory)
+    public ConfigCommand(ISettingsManager settingsManager, ILoggerFactory loggerFactory)
         : base(settingsManager, loggerFactory)
     { }
 

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.21.0</PackageVersion>
+	  <PackageVersion>2.0.22.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,6 +6,6 @@ namespace Meadow.CLI
 {
     public static class Constants
     {
-        public const string CLI_VERSION = "2.0.21.0";
+        public const string CLI_VERSION = "2.0.22.0";
     }
 }
diff --git a/Source/v2/Meadow.Tooling.Core/Connection/MeadowConnectionManager.cs b/Source/v2/Meadow.Tooling.Core/Connection/MeadowConnectionManager.cs
@@ -209,6 +209,11 @@ public static async Task<IList<string>> GetMeadowSerialPortsForLinux()
             _ = proc?.WaitForExit(1000);
             var output = proc?.StandardOutput.ReadToEnd();
 
+            if (output == null)
+            {
+                return Array.Empty<string>();
+            }
+
             return output.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries)
                   .Where(x => x.Contains("Wilderness_Labs"))
                   .Select(