chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup importerutil, remove unecessary FileStream read

Browse Source
This commit is contained in:
Archangel
2025-05-30 14:46:34 +02:00
parent f5c1fe7384
commit 7497ed8f9f
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Utils/ImporterUtil.cs
+22 -25
View File
@@ -97,31 +97,28 @@ public class ImporterUtil
{
try
{
using (var fs = new FileStream(file, FileMode.Open, FileAccess.Read))
onReadCallback?.Invoke(file);
// Get the set method to update the object
var setMethod = GetSetMethod(
_fileUtil.StripExtension(file).ToLower(),
loadedType,
out var propertyType,
out var isDictionary
);
var fileDeserialized = await DeserializeFileAsync(file, propertyType);
onObjectDeserialized?.Invoke(file, fileDeserialized);
lock (dictionaryLock)
{
onReadCallback?.Invoke(file);
// Get the set method to update the object
var setMethod = GetSetMethod(
_fileUtil.StripExtension(file).ToLower(),
loadedType,
out var propertyType,
out var isDictionary
setMethod.Invoke(
result,
isDictionary
? [_fileUtil.StripExtension(file), fileDeserialized]
: new[] { fileDeserialized }
);
var fileDeserialized = await DeserializeFileAsync(fs, file, propertyType);
onObjectDeserialized?.Invoke(file, fileDeserialized);
lock (dictionaryLock)
{
setMethod.Invoke(
result,
isDictionary
? [_fileUtil.StripExtension(file), fileDeserialized]
: new[] { fileDeserialized }
);
}
}
}
catch (Exception ex)
@@ -159,14 +156,14 @@ public class ImporterUtil
}
}
private async Task<object> DeserializeFileAsync(FileStream fs, string file, Type propertyType)
private async Task<object> DeserializeFileAsync(string file, Type propertyType)
{
if (propertyType.IsGenericType && propertyType.GetGenericTypeDefinition() == typeof(LazyLoad<>))
{
return CreateLazyLoadDeserialization(file, propertyType);
}
return await Task.Run(() => _jsonUtil.DeserializeFromFileStream(fs, propertyType));
return await _jsonUtil.DeserializeFromFileAsync(file, propertyType);
}
private object CreateLazyLoadDeserialization(string file, Type propertyType)