From f119ca683e78818ab1ad791f5d11d8c0d4e69ff9 Mon Sep 17 00:00:00 2001
From: Jonas Hermsmeier <jhermsmeier@gmail.com>
Date: Thu, 5 Apr 2018 21:51:00 +0200
Subject: [PATCH] fix(writer): Fix writer progress state values

This force-defaults the individual stream speeds to zero,
in order to avoid null values when not available yet.

Change-Type: patch
---
 lib/sdk/writer/index.js           | 6 +++---
 lib/sdk/writer/progress-stream.js | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/sdk/writer/index.js b/lib/sdk/writer/index.js
index 6ac3f84f..1c72623c 100644
--- a/lib/sdk/writer/index.js
+++ b/lib/sdk/writer/index.js
@@ -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
 
diff --git a/lib/sdk/writer/progress-stream.js b/lib/sdk/writer/progress-stream.js
index 3854c78e..b1edae98 100644
--- a/lib/sdk/writer/progress-stream.js
+++ b/lib/sdk/writer/progress-stream.js
@@ -56,6 +56,7 @@ class ProgressStream extends Stream.Transform {
       remaining: 0,
       runtime: 0,
       speed: 0,
+      totalSpeed: 0,
       transferred: 0
     }