From 44fb7790348cee439581ef92b0e9a3a5a7078a61 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Mon, 7 Jul 2025 22:44:34 +0100
Subject: [PATCH] [Refactor] Replace OrderBy with Order for file sorting in
 ImportDatFolderViewModel and FileImporter

---
 RomRepoMgr.Core/Workers/FileImporter.cs           |  2 +-
 RomRepoMgr/ViewModels/ImportDatFolderViewModel.cs | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/RomRepoMgr.Core/Workers/FileImporter.cs b/RomRepoMgr.Core/Workers/FileImporter.cs
index 3b6e83f..442ec52 100644
--- a/RomRepoMgr.Core/Workers/FileImporter.cs
+++ b/RomRepoMgr.Core/Workers/FileImporter.cs
@@ -77,7 +77,7 @@ public class FileImporter
                                    Message = Localization.EnumeratingFiles
                                });
 
-            string[] files = Directory.GetFiles(path, "*", SearchOption.AllDirectories).OrderBy(p => p).ToArray();
+            string[] files = Directory.GetFiles(path, "*", SearchOption.AllDirectories).Order().ToArray();
             _totalFiles += files.LongLength;
 
             SetProgressBounds?.Invoke(this,
diff --git a/RomRepoMgr/ViewModels/ImportDatFolderViewModel.cs b/RomRepoMgr/ViewModels/ImportDatFolderViewModel.cs
index e8add54..b84f09a 100644
--- a/RomRepoMgr/ViewModels/ImportDatFolderViewModel.cs
+++ b/RomRepoMgr/ViewModels/ImportDatFolderViewModel.cs
@@ -231,12 +231,13 @@ public sealed class ImportDatFolderViewModel : ViewModelBase
 
             if(_allFilesChecked)
             {
-                _datFiles = Directory
-                           .GetFiles(FolderPath,
-                                     "*.*",
-                                     _recursiveChecked ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly)
-                           .OrderBy(f => f)
-                           .ToArray();
+                _datFiles = Directory.GetFiles(FolderPath,
+                                               "*.*",
+                                               _recursiveChecked
+                                                   ? SearchOption.AllDirectories
+                                                   : SearchOption.TopDirectoryOnly)
+                                     .Order()
+                                     .ToArray();
             }
             else
             {
@@ -252,7 +253,7 @@ public sealed class ImportDatFolderViewModel : ViewModelBase
                                                        ? SearchOption.AllDirectories
                                                        : SearchOption.TopDirectoryOnly);
 
-                _datFiles = dats.Concat(xmls).OrderBy(f => f).ToArray();
+                _datFiles = dats.Concat(xmls).Order().ToArray();
             }
 
             Dispatcher.UIThread.Post(() =>