Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/DBUpdater: Should fix errors when importing on linux.

Browse Source
This commit is contained in:
hondacrx
2022-09-25 20:36:47 -04:00
parent 590ecdc324
commit 99587eae3d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Database/DatabaseUpdater.cs
+5 -4
View File
@@ -152,7 +152,7 @@ namespace Framework.Database
if (hashIter != null) if (hashIter != null)
{ {
// Check if the original file was removed if not we've got a problem. // Check if the original file was removed if not we've got a problem.
var renameFile = availableFiles.Find(p => p.GetFileName() == hashIter.Name); var renameFile = availableFiles.FirstOrDefault(p => p.GetFileName() == hashIter.Name);
if (renameFile != null) 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! " + 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); Apply(update);
} }
List<FileEntry> GetFileList() SortedSet<FileEntry> GetFileList()
{ {
List<FileEntry> fileList = new(); SortedSet<FileEntry> fileList = new();
SQLResult result = _database.Query("SELECT `path`, `state` FROM `updates_include`"); SQLResult result = _database.Query("SELECT `path`, `state` FROM `updates_include`");
if (result.IsEmpty()) if (result.IsEmpty())
@@ -361,7 +361,8 @@ namespace Framework.Database
} }
State state = result.Read<string>(1).ToEnum<State>(); State state = result.Read<string>(1).ToEnum<State>();
fileList.AddRange(GetFilesFromDirectory(path, state)); foreach (var file in GetFilesFromDirectory(path, state))
fileList.Add(file);
Log.outDebug(LogFilter.SqlUpdates, $"Added applied file \"{path}\" from remote."); Log.outDebug(LogFilter.SqlUpdates, $"Added applied file \"{path}\" from remote.");