From 4a148bc952863fb3c3368d6c027f71a78de2b971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= <jose.simoes@eclo.solutions>
Date: Wed, 14 Jun 2023 15:40:17 +0100
Subject: [PATCH] Improve output with progress messages (#223)

***NO_CI***
---
 nanoFirmwareFlasher.Library/EspTool.cs        |  2 +-
 .../FirmwarePackage.cs                        | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/nanoFirmwareFlasher.Library/EspTool.cs b/nanoFirmwareFlasher.Library/EspTool.cs
index ae2821e2..159df1db 100644
--- a/nanoFirmwareFlasher.Library/EspTool.cs
+++ b/nanoFirmwareFlasher.Library/EspTool.cs
@@ -116,7 +116,7 @@ public EspTool(
                 }
                 catch (Exception ex)
                 {
-                    if (Verbosity >= VerbosityLevel.Detailed)
+                    if (Verbosity >= VerbosityLevel.Normal)
                     {
                         Console.ForegroundColor = ConsoleColor.DarkRed;
 
diff --git a/nanoFirmwareFlasher.Library/FirmwarePackage.cs b/nanoFirmwareFlasher.Library/FirmwarePackage.cs
index 14923ca3..414aad68 100644
--- a/nanoFirmwareFlasher.Library/FirmwarePackage.cs
+++ b/nanoFirmwareFlasher.Library/FirmwarePackage.cs
@@ -177,7 +177,7 @@ public static List<CloudSmithPackageDetail> GetTargetList(
             // check for empty array 
             if (responseBody == "[]")
             {
-                if (verbosity >= VerbosityLevel.Normal)
+                if (verbosity > VerbosityLevel.Quiet)
                 {
                     Console.WriteLine("");
                 }
@@ -378,7 +378,7 @@ internal async Task<ExitCodes> DownloadAndExtractAsync()
                     // set property
                     Version = match[0].Value;
 
-                    if (Verbosity >= VerbosityLevel.Normal)
+                    if (Verbosity > VerbosityLevel.Detailed)
                     {
                         Console.ForegroundColor = ConsoleColor.Yellow;
                         Console.WriteLine("Using cached firmware package");
@@ -389,7 +389,7 @@ internal async Task<ExitCodes> DownloadAndExtractAsync()
                 {
                     // no fw file available
 
-                    if (Verbosity >= VerbosityLevel.Normal)
+                    if (Verbosity > VerbosityLevel.Quiet)
                     {
                         Console.ForegroundColor = ConsoleColor.Red;
                         Console.WriteLine("Failure to download package and couldn't find one in the cache.");
@@ -403,7 +403,7 @@ internal async Task<ExitCodes> DownloadAndExtractAsync()
             // got here, must have a file!
 
             // unzip the firmware
-            if (Verbosity >= VerbosityLevel.Detailed)
+            if (Verbosity >= VerbosityLevel.Normal)
             {
                 Console.ForegroundColor = ConsoleColor.White;
                 Console.Write($"Extracting {Path.GetFileName(fwFileName)}...");
@@ -413,7 +413,7 @@ internal async Task<ExitCodes> DownloadAndExtractAsync()
                 Path.Combine(LocationPath, fwFileName),
                 LocationPath);
 
-            if (Verbosity >= VerbosityLevel.Detailed)
+            if (Verbosity >= VerbosityLevel.Normal)
             {
                 Console.ForegroundColor = ConsoleColor.Green;
                 Console.WriteLine("OK");
@@ -460,7 +460,7 @@ private static async Task<DownloadUrlResult> GetDownloadUrlAsync(
 
             try
             {
-                if (verbosity >= VerbosityLevel.Normal)
+                if (verbosity >= VerbosityLevel.Detailed)
                 {
                     Console.ForegroundColor = ConsoleColor.White;
                     Console.Write($"Trying to find {targetName} in {(isPreview ? "development" : "stable")} repository...");
@@ -478,7 +478,7 @@ private static async Task<DownloadUrlResult> GetDownloadUrlAsync(
                 // check for empty array 
                 if (responseBody == "[]")
                 {
-                    if (verbosity >= VerbosityLevel.Normal)
+                    if (verbosity >= VerbosityLevel.Detailed)
                     {
                         Console.ForegroundColor = ConsoleColor.Yellow;
                         Console.WriteLine("Not found");
@@ -488,7 +488,7 @@ private static async Task<DownloadUrlResult> GetDownloadUrlAsync(
                     //  try now with community targets
                     repoName = _communityTargetsRepo;
 
-                    if (verbosity >= VerbosityLevel.Normal)
+                    if (verbosity >= VerbosityLevel.Detailed)
                     {
                         Console.ForegroundColor = ConsoleColor.White;
                         Console.Write($"Trying to find {targetName} in community targets repository...");
@@ -513,7 +513,7 @@ private static async Task<DownloadUrlResult> GetDownloadUrlAsync(
                     {
                         Console.WriteLine("");
 
-                        if (verbosity >= VerbosityLevel.Normal)
+                        if (verbosity > VerbosityLevel.Quiet)
                         {
                             Console.ForegroundColor = ConsoleColor.Red;
 
@@ -553,7 +553,7 @@ private static async Task<DownloadUrlResult> GetDownloadUrlAsync(
 
                             Console.WriteLine("");
 
-                            if (verbosity >= VerbosityLevel.Normal)
+                            if (verbosity > VerbosityLevel.Quiet)
                             {
                                 Console.ForegroundColor = ConsoleColor.Red;
 
@@ -581,7 +581,7 @@ private static async Task<DownloadUrlResult> GetDownloadUrlAsync(
 
                     Console.WriteLine("");
 
-                    if (verbosity >= VerbosityLevel.Normal)
+                    if (verbosity > VerbosityLevel.Quiet)
                     {
                         // output helpful message
                         Console.ForegroundColor = ConsoleColor.Red;
@@ -599,7 +599,7 @@ private static async Task<DownloadUrlResult> GetDownloadUrlAsync(
                     return new DownloadUrlResult(string.Empty, string.Empty, ExitCodes.E9005);
                 }
 
-                if (verbosity >= VerbosityLevel.Normal)
+                if (verbosity > VerbosityLevel.Quiet)
                 {
                     Console.ForegroundColor = ConsoleColor.Green;
                     Console.WriteLine($"OK");