chomp/BotGenerator
0
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Add code to clean up bsg json so more bot files can be parsed instead of discarded

Browse Source
This commit is contained in:
Chomp 2021-08-13 16:22:10 +01:00
parent 86d197879f
commit 52da9c254b
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Generator/BotParser.cs
View File

@ -2,6 +2,7 @@
using Generator.Models.Input; using Generator.Models.Input;
using Generator.Models.Output; using Generator.Models.Output;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
@ -12,22 +13,18 @@ namespace Generator
{ {
internal class BotParser internal class BotParser
{ {
private readonly string _workingPath;
private readonly string _dumpPath; private readonly string _dumpPath;
private readonly string[] _botTypes;
public BotParser(string workingPath, string dumpPath, string[] botTypes) public BotParser(string dumpPath, string[] botTypes)
{ {
_workingPath = workingPath;
_dumpPath = dumpPath; _dumpPath = dumpPath;
_botTypes = botTypes;
} }
public List<Datum> Parse() public List<Datum> Parse()
{ {
var stopwatch = Stopwatch.StartNew(); var stopwatch = Stopwatch.StartNew();
var failedFiles = 0; var failedFilesCount = 0;
CreateDirIfDoesntExist(_dumpPath); CreateDirIfDoesntExist(_dumpPath);
var botFiles = Directory.GetFiles(_dumpPath, "*.json", SearchOption.TopDirectoryOnly).ToList(); var botFiles = Directory.GetFiles(_dumpPath, "*.json", SearchOption.TopDirectoryOnly).ToList();
@ -37,16 +34,18 @@ namespace Generator
foreach (var file in botFiles) foreach (var file in botFiles)
{ {
var splitFile = file.Split("\\"); var splitFile = file.Split("\\");
failedFiles++;
var json = File.ReadAllText(file); var json = File.ReadAllText(file);
try try
{ {
json = PruneMalformedBsgJson(json, splitFile.Last());
var bots = ParseJson(json, file); var bots = ParseJson(json, file);
if (bots == null || bots.Count == 0) if (bots == null || bots.Count == 0)
{ {
Console.WriteLine($"no bots found, skipping file: {splitFile.Last()}"); Console.WriteLine($"skipping file: {splitFile.Last()}. no bots found, ");
continue; continue;
} }
@ -58,21 +57,37 @@ namespace Generator
} }
catch (JsonException jex) catch (JsonException jex)
{ {
failedFilesCount++;
Console.WriteLine($"JSON Error message: {jex.Message} || file: {splitFile.Last()}"); Console.WriteLine($"JSON Error message: {jex.Message} || file: {splitFile.Last()}");
continue;
} }
} }
stopwatch.Stop(); stopwatch.Stop();
LoggingHelpers.LogToConsole($"Cleaned and Parsed: {parsedBots.Count} Failed: {failedFilesCount}. Took {LoggingHelpers.LogTimeTaken(stopwatch.Elapsed.TotalSeconds)} seconds");
Console.WriteLine($"Parsed: {parsedBots.Count} Failed: {failedFiles}. Took {LoggingHelpers.LogTimeTaken(stopwatch.Elapsed.TotalSeconds)} seconds");
return parsedBots; return parsedBots;
} }
private string PruneMalformedBsgJson(string json, string fileName)
{
// Bsg send json where an item has a location of 1 but it should be an object with x/y/z coords
var o = JObject.Parse(json);
var jItemsToReplace = o.SelectTokens("$.data[*].Inventory.items[?(@.location == 1)].location");
//var jItemsToReplace = o.SelectTokens("$.data[*].Inventory.items[?(@.location == 1 && @.slotId == 'cartridges')].location");
if (jItemsToReplace != null && jItemsToReplace.Any())
{
LoggingHelpers.LogToConsole($"file {fileName} has {jItemsToReplace.Count()} json issues, cleaning up.");
foreach (var item in jItemsToReplace)
{
var obj = new { x = 1, y = 0, r = 0 };
item.Replace(JToken.FromObject(obj));
}
}
return o.ToString();
}
private void CreateDirIfDoesntExist(string path) private void CreateDirIfDoesntExist(string path)
{ {
if (!Directory.Exists($"{path}")) if (!Directory.Exists($"{path}"))