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

46
TShockAPI/FileTools.cs
View file

@ -16,9 +16,13 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using TShockAPI.ServerSideCharacters;
namespace TShockAPI
@ -103,23 +107,26 @@ namespace TShockAPI
CreateIfNot(MotdPath, MotdFormat);
CreateIfNot(WhitelistPath);
bool writeConfig = true; // Default to true if the file doesn't exist
if (File.Exists(ConfigPath))
{
TShock.Config = ConfigFile.Read(ConfigPath);
// Add all the missing config properties in the json file
TShock.Config = ConfigFile.Read(ConfigPath, out writeConfig);
}
else
if (writeConfig)
{
// Add all the missing config properties in the json file
TShock.Config.Write(ConfigPath);
}
bool writeSSCConfig = true; // Default to true if the file doesn't exist
if (File.Exists(ServerSideCharacterConfigPath))
{
TShock.ServerSideCharacterConfig = ServerSideConfig.Read(ServerSideCharacterConfigPath);
// Add all the missing config properties in the json file
TShock.ServerSideCharacterConfig =
ServerSideConfig.Read(ServerSideCharacterConfigPath, out writeSSCConfig);
}
else
if (writeSSCConfig)
{
// Add all the missing config properties in the json file
TShock.ServerSideCharacterConfig = new ServerSideConfig
{
StartingInventory =
@ -166,5 +173,30 @@ namespace TShockAPI
return true;
}
}
/// <summary>
/// Parse some json text and also return whether any fields are missing from the json
/// </summary>
/// <typeparam name="T">The type of the config file object</typeparam>
/// <param name="json">The json text to parse</param>
/// <param name="anyMissingFields">Whether any fields are missing from the config</param>
/// <returns>The config object</returns>
internal static T LoadConfigAndCheckForMissingFields<T>(string json, out bool anyMissingFields)
{
JObject jObject = JObject.Parse(json);
anyMissingFields = false;
var configFields = new HashSet<string>(typeof(T).GetFields()
.Where(field => !field.IsStatic)
.Select(field => field.Name));
var jsonFields = new HashSet<string>(jObject
.Children()
.Select(field => field as JProperty)
.Where(field => field != null)
.Select(field => field.Name));
anyMissingFields = !configFields.SetEquals(jsonFields);
return jObject.ToObject<T>();
}
}
}
}