Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-13 13:06:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop spinner on cancel

Browse Source 
Signed-off-by: Boris Kreitchman <bkreitch@gmail.com>
This commit is contained in:
Boris Kreitchman
2024-08-09 16:02:51 +03:00
parent b8bf44e0ae
commit 170e4f6f57
2 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/build/diff.go
View File

@@ -77,11 +77,9 @@ func (b *Builder) Diff() (string, bool, error) {
ctx, cancel := context.WithTimeout(context.Background(), b.timeout)
defer cancel()
if b.spinner != nil {
err = b.spinner.Start()
if err != nil {
return "", false, fmt.Errorf("failed to start spinner: %w", err)
}
err = b.startSpinner()
if err != nil {
return "", false, err
}
var diffErrs []error
@@ -151,11 +149,9 @@ func (b *Builder) Diff() (string, bool, error) {
}
}
if b.spinner != nil {
err = b.spinner.Stop()
if err != nil {
return "", createdOrDrifted, fmt.Errorf("failed to stop spinner: %w", err)
}
err = b.stopSpinner()
if err != nil {
return "", createdOrDrifted, err
}
return output.String(), createdOrDrifted, errors.Reduce(errors.Flatten(errors.NewAggregate(diffErrs)))