TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-10-10 03:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

restore: pass action enum to restore progress

Browse Source
This commit is contained in:
Michael Eischer
2024-06-29 21:24:45 +02:00
parent 798256ec52
commit ae978d60cc
4 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/ui/restore/progress.go
View File

@@ -88,7 +88,7 @@ func (p *Progress) AddFile(size uint64) {
}
// AddProgress accumulates the number of bytes written for a file
func (p *Progress) AddProgress(name string, isDir bool, isNew bool, bytesWrittenPortion uint64, bytesTotal uint64) {
func (p *Progress) AddProgress(name string, action ItemAction, bytesWrittenPortion uint64, bytesTotal uint64) {
if p == nil {
return
}
@@ -108,12 +108,6 @@ func (p *Progress) AddProgress(name string, isDir bool, isNew bool, bytesWritten
delete(p.progressInfoMap, name)
p.s.FilesFinished++
action := ActionFileUpdated
if isDir {
action = ActionDirRestored
} else if isNew {
action = ActionFileRestored
}
p.printer.CompleteItem(action, name, bytesTotal)
}
}

26
internal/ui/restore/progress_test.go
View File

@@ -81,7 +81,7 @@ func TestFirstProgressOnAFile(t *testing.T) {
result, items := testProgress(func(progress *Progress) bool {
progress.AddFile(expectedBytesTotal)
progress.AddProgress("test", false, false, expectedBytesWritten, expectedBytesTotal)
progress.AddProgress("test", ActionFileUpdated, expectedBytesWritten, expectedBytesTotal)
return false
})
test.Equals(t, printerTrace{
@@ -95,9 +95,9 @@ func TestLastProgressOnAFile(t *testing.T) {
result, items := testProgress(func(progress *Progress) bool {
progress.AddFile(fileSize)
progress.AddProgress("test", false, false, 30, fileSize)
progress.AddProgress("test", false, false, 35, fileSize)
progress.AddProgress("test", false, false, 35, fileSize)
progress.AddProgress("test", ActionFileUpdated, 30, fileSize)
progress.AddProgress("test", ActionFileUpdated, 35, fileSize)
progress.AddProgress("test", ActionFileUpdated, 35, fileSize)
return false
})
test.Equals(t, printerTrace{
@@ -114,9 +114,9 @@ func TestLastProgressOnLastFile(t *testing.T) {
result, items := testProgress(func(progress *Progress) bool {
progress.AddFile(fileSize)
progress.AddFile(50)
progress.AddProgress("test1", false, false, 50, 50)
progress.AddProgress("test2", false, false, 50, fileSize)
progress.AddProgress("test2", false, false, 50, fileSize)
progress.AddProgress("test1", ActionFileUpdated, 50, 50)
progress.AddProgress("test2", ActionFileUpdated, 50, fileSize)
progress.AddProgress("test2", ActionFileUpdated, 50, fileSize)
return false
})
test.Equals(t, printerTrace{
@@ -134,8 +134,8 @@ func TestSummaryOnSuccess(t *testing.T) {
result, _ := testProgress(func(progress *Progress) bool {
progress.AddFile(fileSize)
progress.AddFile(50)
progress.AddProgress("test1", false, false, 50, 50)
progress.AddProgress("test2", false, false, fileSize, fileSize)
progress.AddProgress("test1", ActionFileUpdated, 50, 50)
progress.AddProgress("test2", ActionFileUpdated, fileSize, fileSize)
return true
})
test.Equals(t, printerTrace{
@@ -149,8 +149,8 @@ func TestSummaryOnErrors(t *testing.T) {
result, _ := testProgress(func(progress *Progress) bool {
progress.AddFile(fileSize)
progress.AddFile(50)
progress.AddProgress("test1", false, false, 50, 50)
progress.AddProgress("test2", false, false, fileSize/2, fileSize)
progress.AddProgress("test1", ActionFileUpdated, 50, 50)
progress.AddProgress("test2", ActionFileUpdated, fileSize/2, fileSize)
return true
})
test.Equals(t, printerTrace{
@@ -179,8 +179,8 @@ func TestProgressTypes(t *testing.T) {
_, items := testProgress(func(progress *Progress) bool {
progress.AddFile(fileSize)
progress.AddFile(0)
progress.AddProgress("dir", true, false, fileSize, fileSize)
progress.AddProgress("new", false, true, 0, 0)
progress.AddProgress("dir", ActionDirRestored, fileSize, fileSize)
progress.AddProgress("new", ActionFileRestored, 0, 0)
return true
})
test.Equals(t, itemTrace{