rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wdcli: Use progress writer instead of IOStream

Browse source
This commit is contained in:
Tom Wiesing 2022-11-30 11:39:29 +01:00
parent 890022ae64
commit 3b78b06fff
No known key found for this signature in database
49 changed files with 396 additions and 393 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/wisski/ingredient/barrel/build.go
View file

@ -2,6 +2,7 @@ package barrel
import (
"context"
"io"
"time"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component"
@ -10,13 +11,12 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient"
"github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient/locker"
"github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient/mstore"
"github.com/tkw1536/goprogram/stream"
)
// Build builds or rebuilds the barel connected to this instance.
//
// It also logs the current time into the metadata belonging to this instance.
func (barrel *Barrel) Build(ctx context.Context, stream stream.IOStream, start bool) error {
func (barrel *Barrel) Build(ctx context.Context, progress io.Writer, start bool) error {
if !barrel.Locker.TryLock(ctx) {
err := locker.Locked
return err
@ -28,14 +28,14 @@ func (barrel *Barrel) Build(ctx context.Context, stream stream.IOStream, start b
var context component.InstallationContext
{
err := stack.Install(ctx, stream, context)
err := stack.Install(ctx, progress, context)
if err != nil {
return err
}
}
{
err := stack.Update(ctx, stream, start)
err := stack.Update(ctx, progress, start)
if err != nil {
return err
}