space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make yaml linter 5 times faster (~80% less execution time)

Browse Source
This commit is contained in:
DrSmugleaf
2021-03-04 12:53:17 +01:00
parent 5a0c88f3e1
commit 2ee4cc2c26
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Robust.Shared/Prototypes/PrototypeManager.cs
View File

@@ -71,7 +71,7 @@ namespace Robust.Shared.Prototypes
/// </summary> /// </summary>
List<IPrototype> LoadDirectory(ResourcePath path); List<IPrototype> LoadDirectory(ResourcePath path);
Dictionary<string, HashSet<ErrorNode>> ValidateDirectory(ResourcePath path); IEnumerable<KeyValuePair<string, HashSet<ErrorNode>>> ValidateDirectory(ResourcePath path);
List<IPrototype> LoadFromStream(TextReader stream); List<IPrototype> LoadFromStream(TextReader stream);
@@ -341,12 +341,11 @@ namespace Robust.Shared.Prototypes
return changedPrototypes; return changedPrototypes;
} }
public Dictionary<string, HashSet<ErrorNode>> ValidateDirectory(ResourcePath path) public IEnumerable<KeyValuePair<string, HashSet<ErrorNode>>> ValidateDirectory(ResourcePath path)
{ {
var streams = Resources.ContentFindFiles(path).ToList().AsParallel() var streams = Resources.ContentFindFiles(path).ToList().AsParallel()
.Where(filePath => filePath.Extension == "yml" && !filePath.Filename.StartsWith(".")); .Where(filePath => filePath.Extension == "yml" && !filePath.Filename.StartsWith("."));
var dict = new Dictionary<string, HashSet<ErrorNode>>();
foreach (var resourcePath in streams) foreach (var resourcePath in streams)
{ {
using var reader = ReadFile(resourcePath); using var reader = ReadFile(resourcePath);
@@ -359,9 +358,9 @@ namespace Robust.Shared.Prototypes
var yamlStream = new YamlStream(); var yamlStream = new YamlStream();
yamlStream.Load(reader); yamlStream.Load(reader);
for (var i = 0; i < yamlStream.Documents.Count; i++) foreach (var doc in yamlStream.Documents)
{ {
var rootNode = (YamlSequenceNode) yamlStream.Documents[i].RootNode; var rootNode = (YamlSequenceNode) doc.RootNode;
foreach (YamlMappingNode node in rootNode.Cast<YamlMappingNode>()) foreach (YamlMappingNode node in rootNode.Cast<YamlMappingNode>())
{ {
var type = node.GetNode("type").AsString(); var type = node.GetNode("type").AsString();
@@ -372,7 +371,8 @@ namespace Robust.Shared.Prototypes
continue; continue;
} }
throw new PrototypeLoadException($"Unknown prototype type: '{type}'"); // throw new PrototypeLoadException($"Unknown prototype type: '{type}'");
continue; // TODO populate ignored prototypes in a better way
} }
var mapping = node.ToDataNodeCast<MappingDataNode>(); var mapping = node.ToDataNodeCast<MappingDataNode>();
@@ -380,15 +380,11 @@ namespace Robust.Shared.Prototypes
var errorNodes = _serializationManager.ValidateNode(prototypeTypes[type], mapping).GetErrors().ToHashSet(); var errorNodes = _serializationManager.ValidateNode(prototypeTypes[type], mapping).GetErrors().ToHashSet();
if (errorNodes.Count != 0) if (errorNodes.Count != 0)
{ {
if (!dict.TryGetValue(resourcePath.ToString(), out var hashSet)) yield return new KeyValuePair<string, HashSet<ErrorNode>>(resourcePath.ToString(), errorNodes);
dict[resourcePath.ToString()] = new HashSet<ErrorNode>();
dict[resourcePath.ToString()].UnionWith(errorNodes);
} }
} }
} }
} }
return dict;
} }
private StreamReader? ReadFile(ResourcePath file, bool @throw = true) private StreamReader? ReadFile(ResourcePath file, bool @throw = true)