Simplify output messages (and fix to 80 column terminal)

wasp-os · May 3, 2020 · 3d6fd30 · 3d6fd30
1 parent 9cc61db
commit 3d6fd30
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/ble_legacy_dfu_controller.py b/ble_legacy_dfu_controller.py
@@ -146,7 +146,7 @@ def start(self, verbose=False):
             # last_send_time = time.time()
 
             if (segment_count == segment_total):
-                print_progress(self.image_size, self.image_size, prefix = 'Progress:', suffix = 'Complete', barLength = 50)
+                print_progress(self.image_size, self.image_size, barLength = 50)
 
                 duration = time.time() - time_start
                 print("\nUpload complete in {} minutes and {} seconds".format(int(duration / 60), int(duration % 60)))
@@ -164,7 +164,7 @@ def start(self, verbose=False):
                 if res != Responses.SUCCESS:
                     raise Exception("bad notification status: {}".format(Responses.to_string(res)))
 
-                print_progress(pkts, self.image_size, prefix = 'Progress:', suffix = 'Complete', barLength = 50)
+                print_progress(pkts, self.image_size, barLength = 50)
 
         # Send Validate Command
         self._dfu_send_command(Procedures.VALIDATE_FIRMWARE)

diff --git a/ble_secure_dfu_controller.py b/ble_secure_dfu_controller.py
@@ -261,7 +261,7 @@ def _dfu_send_image(self):
             obj_offset += self._dfu_send_object(obj_offset, max_size)
 
         # Image uploaded successfully, update the progress bar
-        print_progress(self.image_size, self.image_size, prefix = 'Progress:', suffix = 'Complete', barLength = 50)
+        print_progress(self.image_size, self.image_size, barLength = 50)
 
         duration = time.time() - time_start
         print("\nUpload complete in {} minutes and {} seconds".format(int(duration / 60), int(duration % 60)))
@@ -306,7 +306,7 @@ def _dfu_send_object(self, offset, obj_max_size):
                         # Something went wrong, need to re-transmit this object
                         return 0
 
-                    print_progress(offset, self.image_size, prefix = 'Progress:', suffix = 'Complete', barLength = 50)
+                    print_progress(offset, self.image_size, barLength = 50)
 
             # Calculate CRC
             self._dfu_send_command(Procedures.CALC_CHECKSUM)

diff --git a/dfu.py b/dfu.py
@@ -19,17 +19,6 @@
 
 def main():
 
-    init_msg =  """
-    ================================
-    ==                            ==
-    ==         DFU Server         ==
-    ==                            ==
-    ================================
-    """
-
-    # print "DFU Server start"
-    print(init_msg)
-
     try:
         parser = optparse.OptionParser(usage='%prog -f <hex_file> -a <dfu_target_address>\n\nExample:\n\tdfu.py -f application.hex -d application.dat -a cd:e3:4a:47:1c:e4',
                                        version='0.5')
@@ -79,6 +68,11 @@ def main():
                   help='Use secure bootloader (Nordic SDK < 12)'
                   )
 
+        parser.add_option('-v', '--verbose',
+                  action='store_true',
+                  dest='verbose',
+                  help='Enable verbose mode'
+                  )
         options, args = parser.parse_args()
 
     except Exception as e:
@@ -132,6 +126,19 @@ def main():
 
         ''' Start of Device Firmware Update processing '''
 
+        if options.verbose:
+            init_msg = \
+"""
+    ================================
+    ==                            ==
+    ==         DFU Server         ==
+    ==                            ==
+    ================================
+"""
+            # print "DFU Server start"
+            print(init_msg)
+
+
         if options.secure_dfu:
             ble_dfu = BleDfuControllerSecure(options.address.upper(), hexfile, datfile)
         else:
@@ -173,7 +180,8 @@ def main():
     if unpacker != None:
        unpacker.delete()
 
-    print("DFU Server done")
+    if options.verbose:
+        print("DFU Server done")
 
 """
 ------------------------------------------------------------------------------

diff --git a/util.py b/util.py
@@ -63,8 +63,10 @@ def print_progress(iteration, total, prefix = '', suffix = '', decimals = 1, bar
     formatStr       = "{0:." + str(decimals) + "f}"
     percents        = formatStr.format(100 * (iteration / float(total)))
     filledLength    = int(round(barLength * iteration / float(total)))
-    bar             = 'x' * filledLength + '-' * (barLength - filledLength)
-    sys.stdout.write('\r%s |%s| %s%s %s (%d of %d bytes)' % (prefix, bar, percents, '%', suffix, iteration, total)),
+    bar             = '#' * filledLength + '.' * (barLength - filledLength)
+    if len(prefix):
+        prefix = prefix + ' '
+    sys.stdout.write('\r%s[%s] %s%s %s (%d of %d kb)' % (prefix, bar, percents, '%', suffix, iteration/1024, total/1024)),
     if iteration == total:
         sys.stdout.write('\n')
     sys.stdout.flush()