Unify PromptKit and ConfigKit source wiring

This commit is contained in:
2026-11-18 19:01:17 +00:00
parent ae5344a77d
commit e7a8b0db04
21 changed files with 53 additions and 54 deletions

View File

@@ -6,7 +6,6 @@ import (
"fmt"
"io"
legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit"
appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config"
"go.maximumdirect.net/configkit"
)
@@ -54,18 +53,12 @@ func loadApplicationSettings(configPath, overlay string, explicit bool, override
func writeApplicationError(output io.Writer, label string, err error) {
var loadError *configkit.LoadError
if errors.As(err, &loadError) {
_, _ = fmt.Fprintf(output, "%s error:\n", label)
if writeErr := configkit.WriteDiagnostics(output, loadError.Diagnostics()); writeErr != nil {
_, _ = fmt.Fprintf(output, "%s diagnostic write error: %v\n", label, writeErr)
}
return
}
var legacyLoadError *legacyconfigkit.LoadError
if errors.As(err, &legacyLoadError) {
if writeErr := legacyconfigkit.WriteDiagnostics(output, legacyLoadError.Diagnostics()); writeErr != nil {
_, _ = fmt.Fprintf(output, "%s diagnostic write error: %v\n", label, writeErr)
}
return
}
_, _ = fmt.Fprintf(output, "%s error: %v\n", label, err)
}