DrakiaXYZ/BotGenerator
0
0
Fork 0
forked from chomp/BotGenerator
Code Pull Requests Activity

Update bot parsing code to use Parallel.ForEachAsync + make parser static + make parser async

Browse Source
This commit is contained in:
Chomp 2021-11-26 14:50:07 +00:00
parent 4489785cd3
commit fa59624172
3 changed files with 165 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
Common/Bot/BotParser.cs
View File

@ -1,71 +1,83 @@
using Common.Models.Input;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
namespace Common.Bots
namespace Common.Bots;
public static class BotParser
{
public class BotParser
{
private readonly string _dumpPath;
static JsonSerializerOptions serialiserOptions = new JsonSerializerOptions { };
public BotParser(string dumpPath)
{
_dumpPath = dumpPath;
}
public List<Datum> Parse()
public static async Task<List<Datum>> ParseAsync(string dumpPath)
{
var stopwatch = Stopwatch.StartNew();
var failedFilesCount = 0;
DiskHelpers.CreateDirIfDoesntExist(_dumpPath);
DiskHelpers.CreateDirIfDoesntExist(dumpPath);
var botFiles = Directory.GetFiles(_dumpPath, "*.json", SearchOption.TopDirectoryOnly).ToList();
Console.WriteLine($"{botFiles.Count} bot dump files found");
var botFiles = Directory.GetFiles(dumpPath, "*.json", SearchOption.TopDirectoryOnly).ToList();
LoggingHelpers.LogToConsole($"{botFiles.Count} bot dump files found");
var parsedBots = new List<Datum>();
Parallel.ForEach(botFiles, file => {
var splitFile = file.Split("\\");
var parsedBotsDict = new Dictionary<string, Datum>(10000);
int totalDupeCount = 0;
var json = File.ReadAllText(file);
try
ParallelOptions parallelOptions = new()
{
json = PruneMalformedBsgJson(json, splitFile.Last());
MaxDegreeOfParallelism = Environment.ProcessorCount
};
await Parallel.ForEachAsync(botFiles, parallelOptions, async(file, token) =>
{
var splitFilePath = file.Split("\\");
int dupeCount = 0;
var rawInputString = await ReadFileContentsAsync(file);
var json = rawInputString;
if (rawInputString.Contains("location\":1,"))
{
json = PruneMalformedBsgJson(rawInputString, splitFilePath.Last());
}
var bots = ParseJson(json);
if (bots == null || bots.Count == 0)
{
Console.WriteLine($"skipping file: {splitFile.Last()}. no bots found, ");
Console.WriteLine($"skipping file: {splitFilePath.Last()}. no bots found, ");
return;
}
Console.WriteLine($"parsing: {bots.Count} bots in file {splitFile.Last()}");
Console.WriteLine($"parsing: {bots.Count} bots in file {splitFilePath.Last()}");
foreach (var bot in bots)
{
parsedBots.Add(bot);
}
}
catch (JsonException jex)
if (!parsedBotsDict.ContainsKey(bot._id))
{
failedFilesCount++;
Console.WriteLine($"JSON Error message: {jex.Message} || file: {splitFile.Last()}");
parsedBotsDict.Add(bot._id, bot);
}
else
{
dupeCount++;
}
}
totalDupeCount += dupeCount;
});
stopwatch.Stop();
LoggingHelpers.LogToConsole($"Cleaned and Parsed: {parsedBots.Count} bots. Failed: {failedFilesCount}. Took {LoggingHelpers.LogTimeTaken(stopwatch.Elapsed.TotalSeconds)} seconds");
LoggingHelpers.LogToConsole($"Cleaned and Parsed: {parsedBotsDict.Count} bots. {totalDupeCount} dupes were ignored. Took {LoggingHelpers.LogTimeTaken(stopwatch.Elapsed.TotalSeconds)} seconds");
return parsedBots;
return (parsedBotsDict.Select(x => x.Value)).ToList();
}
private string PruneMalformedBsgJson(string json, string fileName)
private static async Task<string> ReadFileContentsAsync(string file)
{
using var reader = File.OpenText(file);
return await reader.ReadToEndAsync();
}
private static 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);
@ -74,22 +86,24 @@ namespace Common.Bots
if (jItemsToReplace != null && jItemsToReplace.Any())
{
LoggingHelpers.LogToConsole($"file {fileName} has {jItemsToReplace.Count()} json issues, cleaning up.");
LoggingHelpers.LogToConsole($"file {fileName} has {jItemsToReplace.Count()} json issues, cleaning up.", ConsoleColor.Yellow);
foreach (var item in jItemsToReplace)
{
var obj = new { x = 1, y = 0, r = 0 };
item.Replace(JToken.FromObject(obj));
}
}
var returnString = o.ToString();
return o.ToString();
o = null;
jItemsToReplace = null;
return returnString;
}
private static List<Datum> ParseJson(string json)
{
var serialisedObject = JsonConvert.DeserializeObject<Root>(json);
return serialisedObject.data;
}
var deSerialisedObject = JsonSerializer.Deserialize<Root>(json, serialiserOptions);
return deSerialisedObject.data;
}
}

16
Generator/Program.cs
View File

@ -1,14 +1,8 @@
using Common;
using Common.Bots;
using Common.Models.Output;
using System.IO;
using System.Linq;
namespace Generator;
namespace Generator
internal static class Program
{
internal static class Program
{
internal static void Main(string[] args)
internal static async Task Main(string[] args)
{
// Create list of bots we want to process
string[] botTypes = {
@ -41,8 +35,7 @@ namespace Generator
// Read raw bot dumps and turn into c# objects
var workingPath = Directory.GetCurrentDirectory();
var dumpPath = $"{workingPath}//dumps";
var botParser = new BotParser(dumpPath);
var parsedBots = botParser.Parse();
var parsedBots = await BotParser.ParseAsync(dumpPath);
if (parsedBots.Count == 0)
{
@ -61,5 +54,4 @@ namespace Generator
var jsonWriter = new JsonWriter(workingPath, "output");
jsonWriter.WriteJson(bots.ToList());
}
}
}

20
UniqueTemplates/Program.cs
View File

@ -1,25 +1,23 @@
using Common;
using Common.Bots;
using Common.Models.Input;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using UniqueTemplates.Extensions;
using System.Threading.Tasks;
namespace UniqueTemplates
namespace UniqueTemplates;
public class Program
{
public class Program
{
static void Main(string[] args)
static async Task Main(string[] args)
{
// Get the unique bot types that bsg generate from live dumps
// Read raw bot dumps and turn into c# objects
var workingPath = Directory.GetCurrentDirectory();
var dumpPath = $"{workingPath}//dumps";
var botParser = new BotParser(dumpPath);
var parsedBots = botParser.Parse();
var parsedBots = await BotParser.ParseAsync(dumpPath);
if (parsedBots.Count == 0)
{
@ -74,10 +72,4 @@ namespace UniqueTemplates
jsonWriter.WriteJson(botList, group.Key);
}
}
}
}