Fix for plandos not loading properly

TheTrackerCouncil · Oct 18, 2024 · 3b6d7fd · 3b6d7fd
1 parent c345200
commit 3b6d7fd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/TrackerCouncil.Smz3.Data/Services/GenerationSettingsWindowService.cs b/src/TrackerCouncil.Smz3.Data/Services/GenerationSettingsWindowService.cs
@@ -218,8 +218,10 @@ public bool LoadPlando(string file, out string? error)
                 .WithNamingConvention(PascalCaseNamingConvention.Instance)
                 .IgnoreUnmatchedProperties()
                 .Build();
-            var configString = File.ReadAllText(file);
-            LoadPlando(deserializer.Deserialize<PlandoConfig>(configString));
+            var configString = File.ReadAllText(file, Encoding.UTF8);
+            var config = deserializer.Deserialize<PlandoConfig>(configString);
+            config.FileName = Path.GetFileNameWithoutExtension(file);
+            LoadPlando(config);
             return true;
         }
         catch (Exception e)

diff --git a/src/TrackerCouncil.Smz3.SeedGenerator/Generation/RomGenerationService.cs b/src/TrackerCouncil.Smz3.SeedGenerator/Generation/RomGenerationService.cs
@@ -300,7 +300,7 @@ public async Task<GeneratedRomResult> GeneratePreSeededRomAsync(RandomizerOption
     {
         var bytes = GenerateRomBytes(options, seed);
         var config = seed.Playthrough.Config;
-        var safeSeed = seed.Seed.ReplaceAny(Path.GetInvalidFileNameChars(), '_');
+        var safeSeed = seed.Seed.ReplaceAny(Path.GetInvalidFileNameChars(), '_').Trim();
 
         var folderPath = Path.Combine(options.RomOutputPath, $"{DateTimeOffset.Now:yyyyMMdd-HHmmss}_{safeSeed}");
         Directory.CreateDirectory(folderPath);

diff --git a/src/TrackerCouncil.Smz3.SeedGenerator/Generation/Smz3Plandomizer.cs b/src/TrackerCouncil.Smz3.SeedGenerator/Generation/Smz3Plandomizer.cs
@@ -57,7 +57,9 @@ public SeedData GenerateSeed(Config config, CancellationToken cancellationToken
             playthrough = new Playthrough(config, Enumerable.Empty<Playthrough.Sphere>());
         }
 
-        var plandoName = config.PlandoConfig?.FileName ?? "unknown";
+        var plandoName = string.IsNullOrEmpty(config.PlandoConfig?.FileName)
+            ? config.Seed
+            : config.PlandoConfig.FileName;
 
         // If matching base plando file name, just use the date for the seed name
         if (Regex.IsMatch(plandoName, "^Spoiler_Plando_(.*)_[0-9]+$"))