From d1eab39b4abb713236b2bb669bb80b19c35e1fa0 Mon Sep 17 00:00:00 2001
From: Omar <omar@ojoa.life>
Date: Thu, 28 Oct 2021 18:29:14 -0400
Subject: [PATCH] Filter and sort inputfiles to files match input and are in
 the correct order

---
 src/nxDumpFuse/Model/Fuse.cs        | 8 ++++----
 src/nxDumpFuse/Views/FuseView.axaml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/nxDumpFuse/Model/Fuse.cs b/src/nxDumpFuse/Model/Fuse.cs
index d6db3da..bd6a681 100644
--- a/src/nxDumpFuse/Model/Fuse.cs
+++ b/src/nxDumpFuse/Model/Fuse.cs
@@ -75,12 +75,12 @@ namespace nxDumpFuse.Model
             }
 
             var inputFiles = GetInputFiles();
-            if (inputFiles.Length == 0)
+            if (inputFiles.Count == 0)
             {
                 Log(FuseSimpleLogType.Error, "No input files found");
                 return;
             }
-
+            inputFiles.Sort();
             FuseFiles(inputFiles, _outputFilePath);
         }
 
@@ -186,11 +186,11 @@ namespace nxDumpFuse.Model
             return totalFileSize;
         }
 
-        private string[] GetInputFiles()
+        private List<string> GetInputFiles()
         {
             var inputDir = Path.GetDirectoryName(_inputFilePath);
             if (string.IsNullOrEmpty(inputDir)) inputDir = Path.GetPathRoot(_inputFilePath);
-            return inputDir != null ? Directory.GetFiles(inputDir) : new string[] { };
+            return inputDir != null ? Directory.GetFiles(inputDir, $"{Path.GetFileNameWithoutExtension(_inputFilePath)}*").ToList() : new List<string>();
         }
 
         public void StopFuse()
diff --git a/src/nxDumpFuse/Views/FuseView.axaml b/src/nxDumpFuse/Views/FuseView.axaml
index ff04443..ead28cd 100644
--- a/src/nxDumpFuse/Views/FuseView.axaml
+++ b/src/nxDumpFuse/Views/FuseView.axaml
@@ -61,7 +61,7 @@
                       </DataGrid.Columns>
                   </DataGrid>
                   <Button Grid.Column="1" Command="{Binding ClearLogCommand}" Content="Clear" HorizontalAlignment="Stretch"
-                          HorizontalContentAlignment="Center" VerticalAlignment="Top" Margin="4" />
+                          HorizontalContentAlignment="Center" VerticalAlignment="Top" Margin=" 4 0 0 0" />
                   </Grid>
 
                 </Expander>