More improvements in progress output (#226)

Author: josesimoes

nanoFirmwareFlasher.Library/Esp32Operations.cs

@@ -399,7 +399,7 @@ public static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync(
                 if (verbosity >= VerbosityLevel.Normal)
                 {
                     Console.ForegroundColor = ConsoleColor.White;
-                    Console.WriteLine($"Erasing flash...");
+                    Console.Write($"Erasing flash...");
                 }
 
                 // erase flash
@@ -425,7 +425,7 @@ public static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync(
 
                 if (verbosity >= VerbosityLevel.Normal)
                 {
-                    Console.WriteLine($"Flashing firmware...");
+                    Console.Write($"Flashing firmware...");
                 }
 
                 // write to flash
@@ -435,8 +435,10 @@ public static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync(
                 {
                     if (verbosity >= VerbosityLevel.Normal)
                     {
+                        Console.Write($"Flashing firmware...");
+
                         Console.ForegroundColor = ConsoleColor.Green;
-                        Console.WriteLine("OK                            ");
+                        Console.WriteLine("OK".PadRight(110));
 
                         // warn user if reboot is not possible
                         if (espTool.CouldntResetTarget)

nanoFirmwareFlasher.Library/EspTool.cs

@@ -487,20 +487,6 @@ internal ExitCodes WriteFlash(
                 throw new WriteEsp32FlashException(messages);
             }
 
-            var match = Regex.Match(messages, regexPattern.ToString());
-            if (!match.Success)
-            {
-                throw new WriteEsp32FlashException(messages);
-            }
-
-            if (Verbosity >= VerbosityLevel.Detailed)
-            {
-                foreach (string groupName in regexGroupNames)
-                {
-                    Console.WriteLine(match.Groups[groupName].ToString().Trim());
-                }
-            }
-
             // check if there is any mention of not being able to run the app
             CouldntResetTarget = messages.Contains("To run the app, reset the chip manually");
 
@@ -621,6 +607,7 @@ private bool RunEspTool(
             connectPromptShown = false;
             connectPatternFound = false;
             connectTimeStamp = DateTime.UtcNow;
+            var progressStarted = false;
 
             // showing progress is a little bit tricky
             if (Verbosity > VerbosityLevel.Quiet)
@@ -643,9 +630,17 @@ private bool RunEspTool(
 
                                 // try to find a progress message
                                 string progress = FindProgress(messageBuilder, progressTestChar.Value);
-                                if (progress != null && Verbosity > VerbosityLevel.Quiet)
+                                if (progress != null && Verbosity >= VerbosityLevel.Detailed)
                                 {
-                                    // print progress and set the cursor to the beginning of the line (\r)
+                                    if (!progressStarted)
+                                    {
+                                        // need to print the first line of the progress message
+                                        Console.Write("\r");
+
+                                        progressStarted = true;
+                                    }
+
+                                    // print progress... and set the cursor to the beginning of the line (\r)
                                     Console.Write(progress);
                                     Console.Write("\r");
                                 }
@@ -654,6 +649,15 @@ private bool RunEspTool(
                             }
                             else
                             {
+                                if (Verbosity >= VerbosityLevel.Detailed)
+                                {
+                                    // need to clear all progress lines
+                                    for (int i = 0; i < messageBuilder.Length; i++)
+                                    {
+                                        Console.Write("\b");
+                                    }
+                                }
+
                                 break;
                             }
                         }
@@ -788,10 +792,17 @@ private string FindProgress(
             {
                 // trim the test char and convert \r\n into \r
                 string progress = messageBuilder.ToString().Trim(progressTestChar).Replace("\r\n", "\r");
+
+                // trim initial message with device features
+                int startIndex = progress.LastIndexOf("MAC:");
+
                 // another test char in the message?
-                int delimiter = progress.LastIndexOf(progressTestChar);
-                if (delimiter > 0)
+                int delimiter = progress.LastIndexOf(progressTestChar, progress.Length - 1);
+                if (startIndex > 0
+                    && delimiter > 0
+                    && delimiter > startIndex)
                 {
+                    //var nextDelimiter = progress.LastIndexOf(progressTestChar, delimiter);
                     // then we found a progress message; pad the message to 110 chars because no message is longer than 110 chars
                     return progress.Substring(delimiter + 1).PadRight(110);
                 }

nanoFirmwareFlasher.Library/FirmwarePackage.cs

@@ -599,7 +599,7 @@ private static async Task<DownloadUrlResult> GetDownloadUrlAsync(
                     return new DownloadUrlResult(string.Empty, string.Empty, ExitCodes.E9005);
                 }
 
-                if (verbosity > VerbosityLevel.Quiet)
+                if (verbosity >= VerbosityLevel.Detailed)
                 {
                     Console.ForegroundColor = ConsoleColor.Green;
                     Console.WriteLine($"OK");