From b3a1f085caf2fb58663188be4f05a2e6a3661a51 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sun, 25 Sep 2022 20:56:45 -0400 Subject: [PATCH] Core/DBUpdater: No need for sorted set, just order the files when we get them. --- Source/Framework/Database/DatabaseUpdater.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Framework/Database/DatabaseUpdater.cs b/Source/Framework/Database/DatabaseUpdater.cs index 3c11b1b67..481ba53d2 100644 --- a/Source/Framework/Database/DatabaseUpdater.cs +++ b/Source/Framework/Database/DatabaseUpdater.cs @@ -152,7 +152,7 @@ namespace Framework.Database if (hashIter != null) { // Check if the original file was removed if not we've got a problem. - var renameFile = availableFiles.FirstOrDefault(p => p.GetFileName() == hashIter.Name); + var renameFile = availableFiles.Find(p => p.GetFileName() == hashIter.Name); if (renameFile != null) { Log.outWarn(LogFilter.SqlUpdates, $"Seems like update \"{availableQuery.GetFileName()}\" \'{hash.Substring(0, 7)}\' was renamed, but the old file is still there! " + @@ -340,9 +340,9 @@ namespace Framework.Database Apply(update); } - SortedSet GetFileList() + List GetFileList() { - SortedSet fileList = new(); + List fileList = new(); SQLResult result = _database.Query("SELECT `path`, `state` FROM `updates_include`"); if (result.IsEmpty()) @@ -398,17 +398,17 @@ namespace Framework.Database directory = queue.Dequeue(); try { - foreach (string subDir in Directory.GetDirectories(directory)) + foreach (string subDir in Directory.GetDirectories(directory).OrderBy(p => p)) { queue.Enqueue(subDir); } } catch (Exception ex) { - Console.Error.WriteLine(ex); + Log.outFatal(LogFilter.SqlUpdates, $"DBUpdater: {directory} Exception: {ex}"); } - string[] files = Directory.GetFiles(directory, "*.sql"); + string[] files = Directory.GetFiles(directory, "*.sql").OrderBy(p => p).ToArray(); for (int i = 0; i < files.Length; i++) { yield return new FileEntry(files[i], state);