validate input file extension for current import format, fix null ref if json log enabled and cancelled conversion in gui

Author: unitycoder

MainWindow.xaml.cs

@@ -447,8 +447,11 @@ private static async Task ProcessAllFiles(object workerParamsObject)
                             Interlocked.Increment(ref errorCounter); // thread-safe error counter increment
                             if (importSettings.useJSONLog)
                             {
-                                //Trace.WriteLine("useJSONLoguseJSONLoguseJSONLoguseJSONLog");
-                                Log.Write("{\"event\": \"" + LogEvent.File + "\", \"path\": " + System.Text.Json.JsonSerializer.Serialize(importSettings.inputFiles[i]) + ", \"status\": \"" + LogStatus.Processing + "\"}", LogEvent.Error);
+                                // if canceled, we dont want to log this (causes nullref)
+                                if (cancellationToken.IsCancellationRequested == false)
+                                {
+                                    Log.Write("{\"event\": \"" + LogEvent.File + "\", \"path\": " + System.Text.Json.JsonSerializer.Serialize(importSettings.inputFiles[i]) + ", \"status\": \"" + LogStatus.Processing + "\"}", LogEvent.Error);
+                                }
                             }
                             else
                             {

Tools/ArgParser.cs

@@ -922,6 +922,38 @@ public static ImportSettings Parse(string[] args, string rootFolder, ILogger log
                 importSettings.errors.Add("No export format defined (Example: -exportformat" + argValueSeparator + "PCROOT)");
             }
 
+            // check that files are in correct format
+            if (importSettings.inputFiles != null && importSettings.inputFiles.Count > 0)
+            {
+                var currentExtension = importSettings.importFormat.ToString().ToLower();
+                bool wrongExtension = false;
+
+                for (int i = 0; i < importSettings.inputFiles.Count; i++)
+                {
+                    var ext = Path.GetExtension(importSettings.inputFiles[i]).ToLower();
+
+                    if (currentExtension == "las")
+                    {
+                        if (ext != ".las" && ext != ".laz")
+                        {
+                            wrongExtension = true;
+                            break;
+                        }
+                    }
+                    else if (currentExtension == "ply")
+                    {
+                        if (ext != ".ply")
+                        {
+                            wrongExtension = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (wrongExtension) importSettings.errors.Add("Input files are not in the selected format (" + importSettings.importFormat + ")");
+            }
+
+
             // cannot have both rgb & intensity
             //if (importSettings.importRGB == true && importSettings.importIntensity == true)
             //{