6a100ef6e7
Addresses final code review of phase-1 branch (Important I-1, I-3): - Move plugin Enable() loop inside the same try block as GameWindow.Run, and wrap each Enable() in per-plugin try/catch mirroring the Disable loop. Previously, a plugin Enable() throwing would skip the finally block entirely: plugins that had already enabled would never get disabled, Serilog would never flush, and the exception would escape ungracefully. Now Enable failures are logged and contained, and shutdown always runs. - Add a comment at the Get<LandBlock> call in GameWindow.OnLoad explaining why TryGet was avoided (the [MaybeNullWhen(false)] nullable-generic analysis trips TreatWarningsAsErrors). I-2 (camera aspect doesn't update on window resize) deferred to Phase 2. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
64 lines
1.7 KiB
C#
64 lines
1.7 KiB
C#
using AcDream.App.Plugins;
|
|
using AcDream.App.Rendering;
|
|
using AcDream.Core.Plugins;
|
|
using Serilog;
|
|
|
|
Log.Logger = new LoggerConfiguration()
|
|
.MinimumLevel.Debug()
|
|
.WriteTo.Console()
|
|
.CreateLogger();
|
|
|
|
var datDir = args.FirstOrDefault() ?? Environment.GetEnvironmentVariable("ACDREAM_DAT_DIR");
|
|
if (string.IsNullOrWhiteSpace(datDir))
|
|
{
|
|
Log.Error("usage: AcDream.App <dat-directory> (or set ACDREAM_DAT_DIR)");
|
|
return 2;
|
|
}
|
|
|
|
var host = new AppPluginHost(new SerilogAdapter(Log.Logger));
|
|
|
|
var pluginsDir = Path.Combine(AppContext.BaseDirectory, "plugins");
|
|
Log.Information("scanning plugins in {PluginsDir}", pluginsDir);
|
|
|
|
var loaded = new List<LoadedPlugin>();
|
|
foreach (var result in PluginDiscovery.Scan(pluginsDir))
|
|
{
|
|
if (!result.Success)
|
|
{
|
|
Log.Warning("plugin discovery failed for {Dir}: {Error}", result.PluginDirectory, result.Error);
|
|
continue;
|
|
}
|
|
|
|
var loadResult = PluginLoader.Load(result.PluginDirectory, result.Manifest!, host);
|
|
if (!loadResult.Success)
|
|
{
|
|
Log.Warning("plugin load failed for {Id}: {Error}", result.Manifest!.Id, loadResult.Error);
|
|
continue;
|
|
}
|
|
|
|
loaded.Add(loadResult);
|
|
Log.Information("loaded plugin {Id} ({DisplayName})", result.Manifest!.Id, result.Manifest.DisplayName);
|
|
}
|
|
|
|
try
|
|
{
|
|
foreach (var plugin in loaded)
|
|
{
|
|
try { plugin.Plugin!.Enable(); }
|
|
catch (Exception ex) { Log.Error(ex, "plugin enable failed: {Id}", plugin.Manifest.Id); }
|
|
}
|
|
|
|
using var window = new GameWindow(datDir);
|
|
window.Run();
|
|
}
|
|
finally
|
|
{
|
|
foreach (var plugin in loaded)
|
|
{
|
|
try { plugin.Plugin!.Disable(); }
|
|
catch (Exception ex) { Log.Error(ex, "plugin disable failed: {Id}", plugin.Manifest.Id); }
|
|
}
|
|
Log.CloseAndFlush();
|
|
}
|
|
|
|
return 0;
|