From 6d682d09250ec8af676b0c79a452f1b10523b2e7 Mon Sep 17 00:00:00 2001 From: mozbugbox Date: Sun, 23 Feb 2014 15:01:30 +0800 Subject: [PATCH] Simplify progess speed formatting --- src/you_get/common.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/you_get/common.py b/src/you_get/common.py index ac5a1dfa..afcd2393 100644 --- a/src/you_get/common.py +++ b/src/you_get/common.py @@ -433,14 +433,13 @@ def url_save_chunked(url, filepath, bar, refer = None, is_part = False, faker = def num2human(num, unit=1024): """Convert integer to human readable units""" units = ["K", "M", "G", "T"] - ret_fmt = "{:>6.2f}" - ret = ret_fmt.format(num) + ret = "{}".format(num) num = float(num) for i in range(len(units)-1, -1, -1): div = unit**(i+1) if (num/div) > 1: - ret = ret_fmt.format(num/div, units[i]) + ret = "{:.2f}{}".format(num/div, units[i]) break return ret @@ -487,7 +486,7 @@ class BaseProgressBar: speed = delta_size / delta_time self.last_time = now self.last_speed = speed - ret = "{}B/s".format(num2human(speed)) + ret = "{:>7}B/s".format(num2human(speed)) return ret def update(self):