diff --git a/internal/ui/restore/json.go b/internal/ui/restore/json.go index 0ff0a89cd..c1b95b00b 100644 --- a/internal/ui/restore/json.go +++ b/internal/ui/restore/json.go @@ -25,9 +25,9 @@ func (t *jsonPrinter) Update(filesFinished, filesTotal, allBytesWritten, allByte MessageType: "status", SecondsElapsed: uint64(duration / time.Second), TotalFiles: filesTotal, - FilesDone: filesFinished, + FilesRestored: filesFinished, TotalBytes: allBytesTotal, - BytesDone: allBytesWritten, + BytesRestored: allBytesWritten, } if allBytesTotal > 0 { @@ -42,9 +42,9 @@ func (t *jsonPrinter) Finish(filesFinished, filesTotal, allBytesWritten, allByte MessageType: "summary", SecondsElapsed: uint64(duration / time.Second), TotalFiles: filesTotal, - FilesDone: filesFinished, + FilesRestored: filesFinished, TotalBytes: allBytesTotal, - BytesDone: allBytesWritten, + BytesRestored: allBytesWritten, } t.print(status) } @@ -54,16 +54,16 @@ type statusUpdate struct { SecondsElapsed uint64 `json:"seconds_elapsed,omitempty"` PercentDone float64 `json:"percent_done"` TotalFiles uint64 `json:"total_files,omitempty"` - FilesDone uint64 `json:"files_done,omitempty"` + FilesRestored uint64 `json:"files_restored,omitempty"` TotalBytes uint64 `json:"total_bytes,omitempty"` - BytesDone uint64 `json:"bytes_done,omitempty"` + BytesRestored uint64 `json:"bytes_restored,omitempty"` } type summaryOutput struct { MessageType string `json:"message_type"` // "summary" SecondsElapsed uint64 `json:"seconds_elapsed,omitempty"` TotalFiles uint64 `json:"total_files,omitempty"` - FilesDone uint64 `json:"files_done,omitempty"` + FilesRestored uint64 `json:"files_restored,omitempty"` TotalBytes uint64 `json:"total_bytes,omitempty"` - BytesDone uint64 `json:"bytes_done,omitempty"` + BytesRestored uint64 `json:"bytes_restored,omitempty"` } diff --git a/internal/ui/restore/json_test.go b/internal/ui/restore/json_test.go index 093c87bbb..7bcabb4d7 100644 --- a/internal/ui/restore/json_test.go +++ b/internal/ui/restore/json_test.go @@ -11,19 +11,19 @@ func TestJSONPrintUpdate(t *testing.T) { term := &mockTerm{} printer := NewJSONProgress(term) printer.Update(3, 11, 29, 47, 5*time.Second) - test.Equals(t, []string{"{\"message_type\":\"status\",\"seconds_elapsed\":5,\"percent_done\":0.6170212765957447,\"total_files\":11,\"files_done\":3,\"total_bytes\":47,\"bytes_done\":29}\n"}, term.output) + test.Equals(t, []string{"{\"message_type\":\"status\",\"seconds_elapsed\":5,\"percent_done\":0.6170212765957447,\"total_files\":11,\"files_restored\":3,\"total_bytes\":47,\"bytes_restored\":29}\n"}, term.output) } func TestJSONPrintSummaryOnSuccess(t *testing.T) { term := &mockTerm{} printer := NewJSONProgress(term) printer.Finish(11, 11, 47, 47, 5*time.Second) - test.Equals(t, []string{"{\"message_type\":\"summary\",\"seconds_elapsed\":5,\"total_files\":11,\"files_done\":11,\"total_bytes\":47,\"bytes_done\":47}\n"}, term.output) + test.Equals(t, []string{"{\"message_type\":\"summary\",\"seconds_elapsed\":5,\"total_files\":11,\"files_restored\":11,\"total_bytes\":47,\"bytes_restored\":47}\n"}, term.output) } func TestJSONPrintSummaryOnErrors(t *testing.T) { term := &mockTerm{} printer := NewJSONProgress(term) printer.Finish(3, 11, 29, 47, 5*time.Second) - test.Equals(t, []string{"{\"message_type\":\"summary\",\"seconds_elapsed\":5,\"total_files\":11,\"files_done\":3,\"total_bytes\":47,\"bytes_done\":29}\n"}, term.output) + test.Equals(t, []string{"{\"message_type\":\"summary\",\"seconds_elapsed\":5,\"total_files\":11,\"files_restored\":3,\"total_bytes\":47,\"bytes_restored\":29}\n"}, term.output) }