fixup! wip: refactor: API

This commit is contained in:
Rob Watson 2025-05-10 21:18:42 +02:00
parent 116623f386
commit 59b0a060ba
3 changed files with 25 additions and 27 deletions

View File

@ -51,18 +51,16 @@ func run() error {
return fmt.Errorf("read build info: %w", err)
}
app := client.NewApp(
clipboardAvailable,
domain.BuildInfo{
app := client.New(client.NewParams{
ClipboardAvailable: clipboardAvailable,
BuildInfo: domain.BuildInfo{
GoVersion: buildInfo.GoVersion,
Version: version,
Commit: commit,
Date: date,
},
nil,
logger,
)
Logger: logger,
})
if err := app.Run(ctx); err != nil {
return fmt.Errorf("run app: %w", err)
}

View File

@ -52,17 +52,16 @@ func buildClientServer(
logger *slog.Logger,
) (*client.App, *app.App) {
buildInfo := domain.BuildInfo{Version: "0.0.1", GoVersion: "go1.16.3"}
clientApp := client.NewApp(
false,
buildInfo,
&terminal.Screen{
clientApp := client.New(client.NewParams{
BuildInfo: buildInfo,
Screen: &terminal.Screen{
Screen: screen,
Width: 160,
Height: 25,
CaptureC: screenCaptureC,
},
logger,
)
Logger: logger,
})
// TODO: use buildAppParams
srvApp := app.New(app.Params{

View File

@ -24,21 +24,22 @@ type App struct {
logger *slog.Logger
}
// NewApp creates a new App instance.
//
// TODO: params
func NewApp(
clipboardAvailable bool,
buildInfo domain.BuildInfo,
screen *terminal.Screen,
logger *slog.Logger,
) *App {
// NewParams contains the parameters for the App.
type NewParams struct {
ClipboardAvailable bool
BuildInfo domain.BuildInfo
Screen *terminal.Screen
Logger *slog.Logger
}
// New creates a new App instance.
func New(params NewParams) *App {
return &App{
bus: event.NewBus(logger),
clipboardAvailable: clipboardAvailable,
buildInfo: buildInfo,
screen: screen,
logger: logger,
bus: event.NewBus(params.Logger),
clipboardAvailable: params.ClipboardAvailable,
buildInfo: params.BuildInfo,
screen: params.Screen,
logger: params.Logger,
}
}