mirror of
https://github.com/restic/restic.git
synced 2026-11-22 05:14:23 +00:00
internal/restorer: invert dependency direction to ui/restorer
The restorer imported ui/restorer which leaks ui logic into the restorer core. Swap the direction by letting the restorer use a ProgressReporter interface + associated constants.
This commit is contained in:
1 parent
5cd39d01c1
commit
2f31cde517
12 files changed
+189
-116
No files matched your search
@@ -0,0 +1,63 @@
|
||||
package restorer
|
||||
|
||||
type progressInfoEntry struct {
|
||||
bytesWritten uint64
|
||||
bytesTotal uint64
|
||||
}
|
||||
|
||||
// progressState mirrors the state used by the restorer ui.
|
||||
type progressState struct {
|
||||
FilesFinished uint64
|
||||
FilesTotal uint64
|
||||
FilesSkipped uint64
|
||||
FilesDeleted uint64
|
||||
AllBytesWritten uint64
|
||||
AllBytesTotal uint64
|
||||
AllBytesSkipped uint64
|
||||
}
|
||||
|
||||
type testProgress struct {
|
||||
progressInfoMap map[string]progressInfoEntry
|
||||
s progressState
|
||||
}
|
||||
|
||||
var _ ProgressReporter = (*testProgress)(nil)
|
||||
|
||||
func newTestProgress() *testProgress {
|
||||
return &testProgress{
|
||||
progressInfoMap: make(map[string]progressInfoEntry),
|
||||
}
|
||||
}
|
||||
|
||||
func (p *testProgress) AddFile(size uint64) {
|
||||
p.s.FilesTotal++
|
||||
p.s.AllBytesTotal += size
|
||||
}
|
||||
|
||||
func (p *testProgress) AddProgress(name string, _ ItemAction, bytesWrittenPortion, bytesTotal uint64) {
|
||||
entry, exists := p.progressInfoMap[name]
|
||||
if !exists {
|
||||
entry.bytesTotal = bytesTotal
|
||||
}
|
||||
entry.bytesWritten += bytesWrittenPortion
|
||||
p.progressInfoMap[name] = entry
|
||||
|
||||
p.s.AllBytesWritten += bytesWrittenPortion
|
||||
if entry.bytesWritten == entry.bytesTotal {
|
||||
delete(p.progressInfoMap, name)
|
||||
p.s.FilesFinished++
|
||||
}
|
||||
}
|
||||
|
||||
func (p *testProgress) AddSkippedFile(_ string, size uint64) {
|
||||
p.s.FilesSkipped++
|
||||
p.s.AllBytesSkipped += size
|
||||
}
|
||||
|
||||
func (p *testProgress) ReportDeletion(_ string) {
|
||||
p.s.FilesDeleted++
|
||||
}
|
||||
|
||||
func (p *testProgress) state() progressState {
|
||||
return p.s
|
||||
}
|
||||
Reference in new issue
Block a user