mirror of
https://github.com/balena-io/etcher.git
synced 2025-07-23 11:16:39 +00:00
Merge pull request #2180 from resin-io/fix-writer-progress-state
fix(writer): Fix writer progress state values
This commit is contained in:
commit
65a3e51ff9
@ -400,15 +400,15 @@ class ImageWriter extends EventEmitter {
|
|||||||
state.succeeded += !dest.error && dest.finished && (dest.verified || !this.verifyChecksums) ? 1 : 0
|
state.succeeded += !dest.error && dest.finished && (dest.verified || !this.verifyChecksums) ? 1 : 0
|
||||||
if (!(dest.finished && dest.verified) && !dest.error) {
|
if (!(dest.finished && dest.verified) && !dest.error) {
|
||||||
state.totalSpeed += state.type === 'write'
|
state.totalSpeed += state.type === 'write'
|
||||||
? dest.stream.speed
|
? (dest.stream.speed || 0)
|
||||||
: dest.progress.state.speed
|
: (dest.progress.state.speed || 0)
|
||||||
state.active += 1
|
state.active += 1
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
state.speed = state.active
|
state.speed = state.active
|
||||||
? state.totalSpeed / state.active
|
? state.totalSpeed / state.active
|
||||||
: state.active
|
: state.totalSpeed
|
||||||
|
|
||||||
state.eta = state.speed ? state.remaining / state.speed : 0
|
state.eta = state.speed ? state.remaining / state.speed : 0
|
||||||
|
|
||||||
|
@ -56,6 +56,7 @@ class ProgressStream extends Stream.Transform {
|
|||||||
remaining: 0,
|
remaining: 0,
|
||||||
runtime: 0,
|
runtime: 0,
|
||||||
speed: 0,
|
speed: 0,
|
||||||
|
totalSpeed: 0,
|
||||||
transferred: 0
|
transferred: 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user