Fix crash due to spaces in player names

This commit is contained in:
2025-03-14 08:47:45 -05:00
parent ad2c529652
commit a3c6b6a0fb

View File

@@ -106,7 +106,11 @@
process.BeginErrorReadLine(); process.BeginErrorReadLine();
process.Exited += async (sender, args) => { process.Exited += async (sender, args) => {
try {
await completed.Invoke(process.ExitCode); await completed.Invoke(process.ExitCode);
} catch (Exception ex) {
this.Logger.LogError(ex, "Error while invoking completion of randomizer generation.");
}
}; };
} }
@@ -129,7 +133,7 @@
public async Task RandomizeMultiworld(string id, IList<SeedSettings> settings) { public async Task RandomizeMultiworld(string id, IList<SeedSettings> settings) {
Logger.LogDebug("Recieved request for id {id} to randomize multiworld settings {@settings}", id, settings); Logger.LogDebug("Recieved request for id {id} to randomize multiworld settings {@settings}", id, settings);
var names = settings.Select(s => s.PlayerName).ToList(); var names = settings.Select(s => s.PlayerName.Replace(' ', '_')).ToList();
var args = settings.Select((s, idx) => string.Format("--p{0}={1}", idx + 1, string.Join(" ", this.GetArgs(s)))) var args = settings.Select((s, idx) => string.Format("--p{0}={1}", idx + 1, string.Join(" ", this.GetArgs(s))))
.Append(string.Format("--names={0}", string.Join(",", names))) .Append(string.Format("--names={0}", string.Join(",", names)))
@@ -139,7 +143,7 @@
if (exitcode != 0) { if (exitcode != 0) {
await GenerationFailed(id, exitcode); await GenerationFailed(id, exitcode);
} else { } else {
await MultiSucceeded(id, settings); await MultiSucceeded(id, settings, names);
} }
}); });
@@ -149,6 +153,7 @@
} }
private async Task SingleSucceeded(string id) { private async Task SingleSucceeded(string id) {
try {
var basename = string.Format("OR_{0}", id); var basename = string.Format("OR_{0}", id);
await this.UploadFiles(id, basename, 1, null); await this.UploadFiles(id, basename, 1, null);
@@ -160,10 +165,11 @@
Logger.LogDebug("Deleting file {filepath}", spoilerIn); Logger.LogDebug("Deleting file {filepath}", spoilerIn);
File.Delete(spoilerIn); File.Delete(spoilerIn);
Logger.LogInformation("Finished uploading seed id {id}", id);
} finally {
var generating = string.Format("{0}/generating", id); var generating = string.Format("{0}/generating", id);
await AzureStorage.DeleteFile(generating); await AzureStorage.DeleteFile(generating);
}
Logger.LogInformation("Finished uploading seed id {id}", id);
} }
private async Task UploadFiles(string id, string basename, int playerNum, string? parentId) { private async Task UploadFiles(string id, string basename, int playerNum, string? parentId) {
@@ -194,13 +200,14 @@
await Task.WhenAll(tasks); await Task.WhenAll(tasks);
} }
private async Task MultiSucceeded(string id, IList<SeedSettings> settings) { private async Task MultiSucceeded(string id, IList<SeedSettings> settings, IList<string> names) {
var tasks = new List<Task>(); var tasks = new List<Task>();
var subIds = new List<string>(); var subIds = new List<string>();
var worlds = new List<object>(); var worlds = new List<object>();
try {
for (var i = 0; i < settings.Count; i++) { for (var i = 0; i < settings.Count; i++) {
var basename = string.Format("OR_{0}_P{1}_{2}", id, i + 1, settings[i].PlayerName); var basename = string.Format("OR_{0}_P{1}_{2}", id, i + 1, names[i]);
var randomId = this.IdGenerator.GenerateId(); var randomId = this.IdGenerator.GenerateId();
subIds.Add(randomId); subIds.Add(randomId);
tasks.Add(this.UploadFiles(randomId, basename, i + 1, id)); tasks.Add(this.UploadFiles(randomId, basename, i + 1, id));
@@ -233,10 +240,11 @@
await Task.WhenAll(uploadMeta, uploadSpoiler, uploadMultidata); await Task.WhenAll(uploadMeta, uploadSpoiler, uploadMultidata);
Logger.LogInformation("Finished uploading multiworld id {id}", id);
} finally {
var generating = string.Format("{0}/generating", id); var generating = string.Format("{0}/generating", id);
var deleteGenerating = AzureStorage.DeleteFile(generating); var deleteGenerating = AzureStorage.DeleteFile(generating);
}
Logger.LogInformation("Finished uploading multiworld id {id}", id);
} }
private JsonDocument ProcessMetadata(string path, int playerNum) { private JsonDocument ProcessMetadata(string path, int playerNum) {