Add meta and settings json

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "ALttPDoorRandomizer"]
 	path = ALttPDoorRandomizer
 	url = https://github.com/ardnaxelarak/ALttPDoorRandomizer
+[submodule "BaseRandomizer"]
+	path = BaseRandomizer
+	url = https://github.com/ardnaxelarak/ALttPDoorRandomizer

ALttPRandomizer/Azure/AzureStorage.cs

@@ -19,6 +19,10 @@
             await BlobClient.UploadBlobAsync(name, data);
         }
 
+        public async Task UploadFile(string name, BinaryData data) {
+            await BlobClient.UploadBlobAsync(name, data);
+        }
+
         public async Task UploadFileAndDelete(string name, string filepath) {
             using (var stream = new FileStream(filepath, FileMode.Open, FileAccess.Read)) {
                 this.Logger.LogDebug("Uploading file {filepath} -> {name}", filepath, name);

ALttPRandomizer/JsonOptions.cs

@@ -0,0 +1,15 @@
+namespace ALttPRandomizer {
+    using System.Text.Json;
+    using System.Text.Json.Serialization;
+
+    public static class JsonOptions {
+        public static JsonSerializerOptions Default = new JsonSerializerOptions() {
+            PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,
+        }.WithStringEnum();
+
+        public static JsonSerializerOptions WithStringEnum(this JsonSerializerOptions options) {
+            options.Converters.Add(new JsonStringEnumConverter());
+            return options;
+        }
+    }
+}

ALttPRandomizer/Program.cs

@@ -40,8 +40,7 @@
                 });
             });
 
-            builder.Services.AddControllers().AddJsonOptions(x =>
+            builder.Services.AddControllers().AddJsonOptions(x => x.JsonSerializerOptions.WithStringEnum());
-                x.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter()));
             builder.Services.AddSwaggerGen();
 
             var options = new DefaultAzureCredentialOptions();

ALttPRandomizer/Randomizer.cs

@@ -5,9 +5,11 @@
     using ALttPRandomizer.Settings;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
+    using System;
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.IO;
+    using System.Text.Json;
     using System.Threading.Tasks;
 
     public class Randomizer {
@@ -48,6 +50,8 @@
             args.Add("--outputname");
             args.Add(id);
 
+            args.Add("--spoiler=json");
+
             args.Add("--reduce_flashing");
             args.Add("--quickswap");
 
@@ -95,7 +99,7 @@
                 if (exitcode != 0) {
                     this.GenerationFailed(id, exitcode);
                 } else {
-                    await this.GenerationSucceeded(id);
+                    await this.GenerationSucceeded(id, settings);
                 }
             };
         }
@@ -106,19 +110,30 @@
             }
         }
 
-        private async Task GenerationSucceeded(string id) {
+        private async Task GenerationSucceeded(string id, SeedSettings settings) {
             var rom = Path.Join(Path.GetTempPath(), string.Format("OR_{0}.sfc", id));
 
             var bpsIn = Path.Join(Path.GetTempPath(), string.Format("OR_{0}.bps", id));
             var bpsOut = string.Format("{0}/patch.bps", id);
-
-            var spoilerIn = Path.Join(Path.GetTempPath(), string.Format("OR_{0}_Spoiler.txt", id));
-            var spoilerOut = string.Format("{0}/spoiler.txt", id);
-
             var uploadPatch = this.AzureStorage.UploadFileAndDelete(bpsOut, bpsIn);
+
+            var spoilerIn = Path.Join(Path.GetTempPath(), string.Format("OR_{0}_Spoiler.json", id));
+            var spoilerOut = string.Format("{0}/spoiler.json", id);
             var uploadSpoiler = this.AzureStorage.UploadFileAndDelete(spoilerOut, spoilerIn);
 
-            await Task.WhenAll(uploadPatch, uploadSpoiler);
+            var metaIn = Path.Join(Path.GetTempPath(), string.Format("OR_{0}_Meta.json", id));
+            var metaOut = string.Format("{0}/meta.json", id);
+            var meta = this.ProcessMetadata(metaIn);
+            var uploadMeta = this.AzureStorage.UploadFile(metaOut, new BinaryData(meta));
+
+            var settingsJson = JsonSerializer.SerializeToDocument(settings, JsonOptions.Default);
+            var settingsOut = string.Format("{0}/settings.json", id);
+            var uploadSettings = this.AzureStorage.UploadFile(settingsOut, new BinaryData(settingsJson));
+
+            await Task.WhenAll(uploadPatch, uploadSpoiler, uploadMeta, uploadSettings);
+
+            this.Logger.LogDebug("Deleting file {filepath}", metaIn);
+            File.Delete(metaIn);
 
             this.Logger.LogDebug("Deleting file {filepath}", rom);
             File.Delete(rom);
@@ -126,6 +141,26 @@
             this.Logger.LogDebug("Finished uploading seed id {id}", id);
         }
 
+        private JsonDocument ProcessMetadata(string path) {
+            JsonDocument orig;
+            using (var file = File.OpenRead(path)) {
+                orig = JsonDocument.Parse(file);
+            }
+
+
+            var processed = new Dictionary<string, JsonElement>();
+            foreach (var toplevel in orig.RootElement.EnumerateObject()) {
+                var value = toplevel.Value;
+                if (value.ValueKind == JsonValueKind.Object && value.TryGetProperty("1", out var p1)) {
+                    processed[toplevel.Name] = p1;
+                } else {
+                    processed[toplevel.Name] = toplevel.Value;
+                }
+            }
+
+            return JsonSerializer.SerializeToDocument(processed, JsonOptions.Default);
+        }
+
         private void GenerationFailed(string id, int exitcode) {
         }
     }

ALttPRandomizer/Service/SeedService.cs

@@ -2,6 +2,7 @@
     using ALttPRandomizer.Azure;
     using System;
     using System.Collections.Generic;
+    using System.Text.Json;
     using System.Threading.Tasks;
 
     public class SeedService {
@@ -11,12 +12,28 @@
 
         private AzureStorage AzureStorage { get; }
 
-        public async Task<IDictionary<string, string>> GetSeed(string seedId) {
+        public async Task<IDictionary<string, object>> GetSeed(string seedId) {
             var files = await this.AzureStorage.GetFiles(seedId);
 
-            var result = new Dictionary<string, string>();
+            var result = new Dictionary<string, object>();
-            foreach (var file in files) {
+
-                result[file.Key] = Convert.ToBase64String(file.Value.ToMemory().ToArray());
+            if (files.TryGetValue("settings.json", out var settingsData)) {
+                var json = JsonDocument.Parse(settingsData.ToString());
+                result["settings"] = json;
+            }
+
+            if (files.TryGetValue("meta.json", out var metaData)) {
+                var json = JsonDocument.Parse(metaData.ToString());
+                result["meta"] = json;
+            }
+
+            if (files.TryGetValue("spoiler.json", out var spoilerData)) {
+                var json = JsonDocument.Parse(spoilerData.ToString());
+                result["spoiler"] = json;
+            }
+
+            if (files.TryGetValue("patch.bps", out var patchData)) {
+                result["patch.bps"] = Convert.ToBase64String(patchData.ToArray());
             }
 
             return result;

Dockerfile

@@ -25,10 +25,10 @@ RUN python3 -m ensurepip --upgrade
 WORKDIR /randomizer
 COPY alttp.sfc .
 
-COPY ALttPDoorRandomizer/resources/app/meta/manifests/pip_requirements.txt requirements.txt
+COPY BaseRandomizer/resources/app/meta/manifests/pip_requirements.txt requirements.txt
 RUN python3 -m pip install -r requirements.txt
 
-COPY ALttPDoorRandomizer/ .
+COPY BaseRandomizer/ .
 
 WORKDIR /app
 COPY --from=build /app/publish .