Fix progress bar not reaching 100%

Author: luebbe

scripts/ota_updater/ota_updater.py

@@ -5,6 +5,9 @@
 import base64, sys, math
 from hashlib import md5
 
+# Global variable for total bytes to transfer
+total = 0
+
 # The callback for when the client receives a CONNACK response from the server.
 def on_connect(client, userdata, flags, rc):
     if rc != 0:
@@ -19,27 +22,36 @@ def on_connect(client, userdata, flags, rc):
 
     print("Waiting for device to come online...")
 
+# Called from on_message to print a progress bar
+def on_progress(progress, total):
+    g_total = total
+    bar_width = 30
+    bar = int(bar_width*(progress/total))
+    print("\r[", '+'*bar, ' '*(bar_width-bar), "] ", progress, end='', sep='')
+    if (progress == total):
+        print()
+    sys.stdout.flush()
 
 # The callback for when a PUBLISH message is received from the server.
 def on_message(client, userdata, msg):
+    global total
     # decode string for python2/3 compatiblity
     msg.payload = msg.payload.decode()
 
     if msg.topic.endswith('$implementation/ota/status'):
         status = int(msg.payload.split()[0])
 
         if userdata.get("published"):
-            if status == 202:
+            if status == 200:
+                on_progress(total, total)
+                print("Firmware uploaded successfully. Waiting for device to come back online.")
+                sys.stdout.flush()
+            elif status == 202:
                 print("Checksum accepted")
             elif status == 206: # in progress
                 # state in progress, print progress bar
                 progress, total = [int(x) for x in msg.payload.split()[1].split('/')]
-                bar_width = 30
-                bar = int(bar_width*(progress/total))
-                print("\r[", '+'*bar, ' '*(bar_width-bar), "] ", msg.payload.split()[1], end='', sep='')
-                if (progress == total):
-                    print()
-                sys.stdout.flush()
+                on_progress(progress, total)
             elif status == 304: # not modified
                 print("Device firmware already up to date with md5 checksum: {}".format(userdata.get('md5')))
                 client.disconnect()