[change] 读取luban.conf及json数据源支持额外的comma及注释

focus-creative-games · Mar 22, 2024 · 5aeb05b · 5aeb05b
1 parent d2e8317
commit 5aeb05b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Luban.Core/GlobalConfigLoader.cs b/src/Luban.Core/GlobalConfigLoader.cs
@@ -62,6 +62,8 @@ public LubanConfig Load(string fileName)
  var options = new JsonSerializerOptions
  {
  PropertyNameCaseInsensitive = true,
+ AllowTrailingCommas = true,
+ ReadCommentHandling = JsonCommentHandling.Skip,
  };
  var globalConf = JsonSerializer.Deserialize<LubanConf>(File.ReadAllText(fileName, Encoding.UTF8), options);
 

diff --git a/src/Luban.DataLoader.Builtin/Json/JsonDataSource.cs b/src/Luban.DataLoader.Builtin/Json/JsonDataSource.cs
@@ -15,7 +15,11 @@ public class JsonDataSource : DataLoaderBase
  public override void Load(string rawUrl, string sheetOrFieldName, Stream stream)
  {
  RawUrl = rawUrl;
- this._data = JsonDocument.Parse(stream).RootElement;
+ this._data = JsonDocument.Parse(stream, new JsonDocumentOptions()
+ {
+ AllowTrailingCommas = true,
+ CommentHandling = JsonCommentHandling.Skip,
+ }).RootElement;
 
  if (!string.IsNullOrEmpty(sheetOrFieldName))
  {