Fix relative path file for bin files in JLink (#278)

***NO_CI***
nanoframework · Jun 18, 2024 · 2434645 · 2434645
1 parent 0d2f7b4
commit 2434645
Showing 1 changed file with 21 additions and 16 deletions.
diff --git a/nanoFirmwareFlasher.Library/JLinkCli.cs b/nanoFirmwareFlasher.Library/JLinkCli.cs
@@ -136,10 +136,13 @@ public ExitCodes ExecuteFlashBinFiles(
             IList<string> addresses,
             string probeId)
         {
-            // check file existence
-            if (files.Any(f => !File.Exists(f)))
+            List<string> shadowFiles = [];
+
+            var processFileResult = ProcessFilePaths(files, shadowFiles);
+
+            if (processFileResult != ExitCodes.OK)
             {
-                return ExitCodes.E5004;
+                return processFileResult;
             }
 
             // perform check on address(es)
@@ -179,10 +182,6 @@ public ExitCodes ExecuteFlashBinFiles(
                 }
             }
 
-            List<string> shadowFiles = [];
-
-            ProcessFilePaths(files, shadowFiles);
-
             // erase flash
             if (DoMassErase)
             {
@@ -284,7 +283,7 @@ public ExitCodes ExecuteFlashBinFiles(
             return ExitCodes.OK;
         }
 
-        private void ProcessFilePaths(IList<string> files, List<string> shadowFiles)
+        private ExitCodes ProcessFilePaths(IList<string> files, List<string> shadowFiles)
         {
             // J-Link can't handle diacritc chars
             // developer note: reported to Segger (Case: 60276735) and can be removed if this is fixed/improved
@@ -295,6 +294,12 @@ private void ProcessFilePaths(IList<string> files, List<string> shadowFiles)
                     Environment.CurrentDirectory,
                     binFile);
 
+                // check file existence
+                if (!File.Exists(binFilePath))
+                {
+                    return ExitCodes.E5004;
+                }
+
                 if (!binFilePath.IsNormalized(NormalizationForm.FormD)
                     || binFilePath.Contains(' '))
                 {
@@ -315,8 +320,9 @@ private void ProcessFilePaths(IList<string> files, List<string> shadowFiles)
                     // copy file to shadow list
                     shadowFiles.Add(binFile);
                 }
-
             }
+
+            return ExitCodes.OK;
         }
 
         /// <summary>
@@ -329,15 +335,14 @@ public ExitCodes ExecuteFlashHexFiles(
             IList<string> files,
             string probeId)
         {
-            // check file existence
-            if (files.Any(f => !File.Exists(f)))
-            {
-                return ExitCodes.E5004;
-            }
-
             List<string> shadowFiles = [];
 
-            ProcessFilePaths(files, shadowFiles);
+            var processFileResult = ProcessFilePaths(files, shadowFiles);
+
+            if (processFileResult != ExitCodes.OK)
+            {
+                return processFileResult;
+            }
 
             // erase flash
             if (DoMassErase)