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

snapshots: Unify 'snapshot' and 'backup' code

Browse source
This commit is contained in:
Tom Wiesing 2022-10-03 13:37:12 +02:00
parent 630da9e12f
commit ea714aba86
No known key found for this signature in database
3 changed files with 142 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

44
internal/component/snapshots/report.go
View file

@ -4,13 +4,9 @@ import (
"encoding/json"
"fmt"
"io"
"path/filepath"
"strings"
"github.com/FAU-CDI/wisski-distillery/pkg/countwriter"
"github.com/FAU-CDI/wisski-distillery/pkg/environment"
"github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/tkw1536/goprogram/stream"
)
func (snapshot Snapshot) String() string {
@ -65,26 +61,6 @@ func (snapshot Snapshot) Report(w io.Writer) (int, error) {
return ww.Sum()
}
// WriteReport writes out the report belonging to this snapshot.
// It is a separate function, to allow writing it indepenently of the rest.
func (snapshot *Snapshot) WriteReport(env environment.Environment, stream stream.IOStream) error {
return logging.LogOperation(func() error {
reportPath := filepath.Join(snapshot.Description.Dest, "report.txt")
stream.Println(reportPath)
// create the report file!
report, err := env.Create(reportPath, environment.DefaultFilePerm)
if err != nil {
return err
}
defer report.Close()
// print the report into it!
_, err = io.WriteString(report, snapshot.String())
return err
}, stream, "Writing snapshot report")
}
// Strings turns this backup into a string for the BackupReport.
func (backup Backup) String() string {
var builder strings.Builder
@ -132,23 +108,3 @@ func (backup Backup) Report(w io.Writer) (int, error) {
return cw.Sum()
}
// WriteReport writes out the report belonging to this backup.
// It is a separate function, to allow writing it indepenently of the rest.
func (backup Backup) WriteReport(env environment.Environment, stream stream.IOStream) error {
return logging.LogOperation(func() error {
reportPath := filepath.Join(backup.Description.Dest, "report.txt")
stream.Println(reportPath)
// create the report file!
report, err := env.Create(reportPath, environment.DefaultFilePerm)
if err != nil {
return err
}
defer report.Close()
// print the report into it!
_, err = io.WriteString(report, backup.String())
return err
}, stream, "Writing backup report")
}