themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Overwrite the config if any new fields are missing

Browse source
This commit is contained in:
ZakFahey 2020-08-01 10:13:04 -07:00
parent be2040a740
commit 90f519a1c6
4 changed files with 72 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
TShockAPI/ConfigFile.cs
View file

@ -602,14 +602,21 @@ namespace TShockAPI
/// Reads a configuration file from a given path
/// </summary>
/// <param name="path">string path</param>
/// <returns>ConfigFile object</returns>
public static ConfigFile Read(string path)
/// <param name="path">The path to the config file</param>
/// <param name="anyMissingFields">
/// Whether the config object has any new files in it, meaning that the config file has to be
/// overwritten.
/// </param>
public static ConfigFile Read(string path, out bool anyMissingFields)
{
if (!File.Exists(path))
{
anyMissingFields = true;
return new ConfigFile();
}
using (var fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read))
{
return Read(fs);
return Read(fs, out anyMissingFields);
}
}
@ -617,14 +624,17 @@ namespace TShockAPI
/// Reads the configuration file from a stream
/// </summary>
/// <param name="stream">stream</param>
/// <param name="anyMissingFields">
/// Whether the config object has any new fields in it, meaning that the config file has to be
/// overwritten.
/// </param>
/// <returns>ConfigFile object</returns>
public static ConfigFile Read(Stream stream)
public static ConfigFile Read(Stream stream, out bool anyMissingFields)
{
using (var sr = new StreamReader(stream))
{
var cf = JsonConvert.DeserializeObject<ConfigFile>(sr.ReadToEnd());
if (ConfigRead != null)
ConfigRead(cf);
var cf = FileTools.LoadConfigAndCheckForMissingFields<ConfigFile>(sr.ReadToEnd(), out anyMissingFields);
ConfigRead?.Invoke(cf);
return cf;
}
}