That-One-Nerd/SrcMod
1
0
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Releases 9 Wiki Activity

Fixed issue #107. The code for it was mostly already written.

Browse Source
This commit is contained in:
That_One_Nerd 2023-05-30 10:29:51 -04:00
parent 4a948b9098
commit 48f93e6f0d
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SrcMod/Valve.NET/Vkv/VkvConvert.cs
View File

@ -19,16 +19,19 @@ public static class VkvConvert
#region DeserializeNode #region DeserializeNode
public static VkvNode? DeserializeNode(StreamReader reader) => public static VkvNode? DeserializeNode(StreamReader reader) =>
DeserializeNode(reader, VkvOptions.Default); DeserializeNode(reader, VkvOptions.Default, out _);
public static VkvNode? DeserializeNode(StreamReader reader, VkvOptions options) public static VkvNode? DeserializeNode(StreamReader reader, VkvOptions options) =>
DeserializeNode(reader, options, out _);
public static VkvNode? DeserializeNode(StreamReader reader, VkvOptions options, out string name)
{ {
try try
{ {
return DeserializeNode(reader, options, out _, null); return DeserializeNode(reader, options, out name, null);
} }
catch catch
{ {
if (!options.noExceptions) throw; if (!options.noExceptions) throw;
name = string.Empty;
return null; return null;
} }
} }

17
SrcMod/Valve.NET/Vkv/VkvSerializer.cs
View File

@ -29,6 +29,23 @@ public class VkvSerializer
if (!p_options.closeWhenFinished && p_options.resetStreamPosition) stream.Seek(pos, SeekOrigin.Begin); if (!p_options.closeWhenFinished && p_options.resetStreamPosition) stream.Seek(pos, SeekOrigin.Begin);
} }
} }
public VkvNode? Deserialize(Stream stream, out string name)
{
long pos = stream.Position;
StreamReader reader = new(stream, leaveOpen: !p_options.closeWhenFinished);
try
{
VkvNode? result = VkvConvert.DeserializeNode(reader, p_options, out name);
reader.Close();
if (!p_options.closeWhenFinished && p_options.resetStreamPosition) stream.Seek(pos, SeekOrigin.Begin);
return result;
}
finally
{
reader.Close();
if (!p_options.closeWhenFinished && p_options.resetStreamPosition) stream.Seek(pos, SeekOrigin.Begin);
}
}
public T? Deserialize<T>(Stream stream) public T? Deserialize<T>(Stream stream)
{ {
VkvNode? result = Deserialize(stream); VkvNode? result = Deserialize(stream);