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

snapshots: Prepare for restructuring

Browse source 
This commit renames the 'wisski' package to 'dis' and prepares the
snapshots component for restructuring.
This commit is contained in:
Tom Wiesing 2022-10-01 19:53:18 +02:00
parent f58920baf4
commit 1dac09bc03
No known key found for this signature in database
12 changed files with 62 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

19
internal/backup/backup.go
View file

@ -9,7 +9,8 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/component"
"github.com/FAU-CDI/wisski-distillery/internal/component/instances"
"github.com/FAU-CDI/wisski-distillery/internal/wisski"
"github.com/FAU-CDI/wisski-distillery/internal/component/snapshots"
"github.com/FAU-CDI/wisski-distillery/internal/dis"
"github.com/FAU-CDI/wisski-distillery/pkg/environment"
"github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/tkw1536/goprogram/status"
@ -18,7 +19,7 @@ import (
)
// New create a new Backup
func New(io stream.IOStream, dis *wisski.Distillery, description Description) (backup Backup) {
func New(io stream.IOStream, dis *dis.Distillery, description Description) (backup Backup) {
backup.Description = description
// catch anything critical that happened during the snapshot
@ -38,7 +39,7 @@ func New(io stream.IOStream, dis *wisski.Distillery, description Description) (b
return
}
func (backup *Backup) run(ios stream.IOStream, dis *wisski.Distillery) {
func (backup *Backup) run(ios stream.IOStream, dis *dis.Distillery) {
//
// MANIFEST
//
@ -120,27 +121,27 @@ func (backup *Backup) run(ios stream.IOStream, dis *wisski.Distillery) {
}
// re-use the backup of the snapshots
backup.InstanceSnapshots = status.Group[instances.WissKI, wisski.Snapshot]{
backup.InstanceSnapshots = status.Group[instances.WissKI, snapshots.Snapshot]{
PrefixString: func(item instances.WissKI, index int) string {
return fmt.Sprintf("[snapshot %s]: ", item.Slug)
},
PrefixAlign: true,
Handler: func(instance instances.WissKI, index int, writer io.Writer) wisski.Snapshot {
Handler: func(instance instances.WissKI, index int, writer io.Writer) snapshots.Snapshot {
dir := filepath.Join(instancesBackupDir, instance.Slug)
if err := dis.Core.Environment.Mkdir(dir, environment.DefaultDirPerm); err != nil {
return wisski.Snapshot{
return snapshots.Snapshot{
ErrPanic: err,
}
}
manifest <- dir
return dis.Snapshot(instance, stream.NewIOStream(writer, writer, nil, 0), wisski.SnapshotDescription{
return dis.SnapshotManager().NewSnapshot(instance, stream.NewIOStream(writer, writer, nil, 0), snapshots.SnapshotDescription{
Dest: dir,
})
},
ResultString: func(res wisski.Snapshot, item instances.WissKI, index int) string {
ResultString: func(res snapshots.Snapshot, item instances.WissKI, index int) string {
return "done"
},
WaitString: status.DefaultWaitString[instances.WissKI],
@ -154,7 +155,7 @@ func (backup *Backup) run(ios stream.IOStream, dis *wisski.Distillery) {
<-manifestDone
// sort the instances manifest
slices.SortFunc(backup.InstanceSnapshots, func(a, b wisski.Snapshot) bool {
slices.SortFunc(backup.InstanceSnapshots, func(a, b snapshots.Snapshot) bool {
return a.Instance.Slug < b.Instance.Slug
})
}

4
internal/backup/report.go
View file

@ -8,7 +8,7 @@ import (
"strings"
"time"
"github.com/FAU-CDI/wisski-distillery/internal/wisski"
"github.com/FAU-CDI/wisski-distillery/internal/component/snapshots"
"github.com/FAU-CDI/wisski-distillery/pkg/countwriter"
"github.com/FAU-CDI/wisski-distillery/pkg/environment"
"github.com/FAU-CDI/wisski-distillery/pkg/logging"
@ -42,7 +42,7 @@ type Backup struct {
// Snapshots containing instances
InstanceListErr error
InstanceSnapshots []wisski.Snapshot
InstanceSnapshots []snapshots.Snapshot
// List of files included
Manifest []string