diff --git a/src/pkg/backup/backup.go b/src/pkg/backup/backup.go index 42f3cb68b..cef46aa3e 100644 --- a/src/pkg/backup/backup.go +++ b/src/pkg/backup/backup.go @@ -89,23 +89,27 @@ func PrintAll(ctx context.Context, bs []*Backup) { } type Printable struct { - ID model.StableID `json:"id"` - ErrorCount int `json:"errorCount"` - StartedAt time.Time `json:"started at"` - Status string `json:"status"` - Version string `json:"version"` - Selectors selectors.Printable `json:"selectors"` + ID model.StableID `json:"id"` + ErrorCount int `json:"errorCount"` + StartedAt time.Time `json:"started at"` + Status string `json:"status"` + Version string `json:"version"` + Selectors selectors.Printable `json:"selectors"` + BytesRead int64 `json:"bytesRead"` + BytesUploaded int64 `json:"bytesUploaded"` } // MinimumPrintable reduces the Backup to its minimally printable details. func (b Backup) MinimumPrintable() any { return Printable{ - ID: b.ID, - ErrorCount: support.GetNumberOfErrors(b.ReadErrors) + support.GetNumberOfErrors(b.WriteErrors), - StartedAt: b.StartedAt, - Status: b.Status, - Version: "0", - Selectors: b.Selectors.ToPrintable(), + ID: b.ID, + ErrorCount: support.GetNumberOfErrors(b.ReadErrors) + support.GetNumberOfErrors(b.WriteErrors), + StartedAt: b.StartedAt, + Status: b.Status, + Version: "0", + Selectors: b.Selectors.ToPrintable(), + BytesRead: b.BytesRead, + BytesUploaded: b.BytesUploaded, } } diff --git a/src/pkg/backup/backup_test.go b/src/pkg/backup/backup_test.go index 4fe2fa09f..aad71980b 100644 --- a/src/pkg/backup/backup_test.go +++ b/src/pkg/backup/backup_test.go @@ -45,8 +45,10 @@ func stubBackup(t time.Time) backup.Backup { WriteErrors: errors.New("1"), }, ReadWrites: stats.ReadWrites{ - ItemsRead: 1, - ItemsWritten: 1, + BytesRead: 301, + BytesUploaded: 301, + ItemsRead: 1, + ItemsWritten: 1, }, StartAndEndTime: stats.StartAndEndTime{ StartedAt: t, @@ -98,4 +100,7 @@ func (suite *BackupSuite) TestBackup_MinimumPrintable() { bselp := b.Selectors.ToPrintable() assert.Equal(t, bselp, result.Selectors, "selectors") assert.Equal(t, bselp.Resources(), result.Selectors.Resources(), "selector resources") + + assert.Equal(t, b.BytesRead, result.BytesRead, "size") + assert.Equal(t, b.BytesUploaded, result.BytesUploaded, "stored size") }