Merge pull request #2180 from resin-io/fix-writer-progress-state

fix(writer): Fix writer progress state values
This commit is contained in:
Jonas Hermsmeier 2018-04-05 23:44:48 +02:00 committed by GitHub
commit 65a3e51ff9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -400,15 +400,15 @@ class ImageWriter extends EventEmitter {
state.succeeded += !dest.error && dest.finished && (dest.verified || !this.verifyChecksums) ? 1 : 0
if (!(dest.finished && dest.verified) && !dest.error) {
state.totalSpeed += state.type === 'write'
? dest.stream.speed
: dest.progress.state.speed
? (dest.stream.speed || 0)
: (dest.progress.state.speed || 0)
state.active += 1
}
})
state.speed = state.active
? state.totalSpeed / state.active
: state.active
: state.totalSpeed
state.eta = state.speed ? state.remaining / state.speed : 0

View File

@ -56,6 +56,7 @@ class ProgressStream extends Stream.Transform {
remaining: 0,
runtime: 0,
speed: 0,
totalSpeed: 0,
transferred: 0
}