From 857c01d075dcddee20e7b4d2fa2157101751df37 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Tue, 26 Nov 2019 21:29:24 +0000 Subject: [PATCH 1/3] lengthen bars unless nested/threaded Partially fixes #2487 --- dvc/progress.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dvc/progress.py b/dvc/progress.py index 65288acef8..6e340303cc 100644 --- a/dvc/progress.py +++ b/dvc/progress.py @@ -20,7 +20,7 @@ class Tqdm(tqdm): """ BAR_FMT_DEFAULT = ( - "{percentage:3.0f}%|{bar:10}|" + "{percentage:3.0f}%|{bar}|" "{desc:{ncols_desc}.{ncols_desc}}{n_fmt}/{total_fmt}" " [{elapsed}<{remaining}, {rate_fmt:>11}{postfix}]" ) @@ -84,6 +84,11 @@ def __init__( if bar_format is None: if self.__len__(): self.bar_format = self.BAR_FMT_DEFAULT + # nested bars should have fixed bar widths to align nicely + if self.pos: + self.bar_format = self.bar_format.replace( + "{bar}", "{bar:10}" + ) else: self.bar_format = self.BAR_FMT_NOTOTAL else: From 78c9e323124ccf95bb91485e7cd3c98335944519 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Tue, 26 Nov 2019 21:56:25 +0000 Subject: [PATCH 2/3] reorder desc & bar --- dvc/progress.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dvc/progress.py b/dvc/progress.py index 6e340303cc..fd8d3b88a8 100644 --- a/dvc/progress.py +++ b/dvc/progress.py @@ -20,8 +20,14 @@ class Tqdm(tqdm): """ BAR_FMT_DEFAULT = ( - "{percentage:3.0f}%|{bar}|" - "{desc:{ncols_desc}.{ncols_desc}}{n_fmt}/{total_fmt}" + "{percentage:3.0f}% {desc}|{bar}|" + "{n_fmt}/{total_fmt}" + " [{elapsed}<{remaining}, {rate_fmt:>11}{postfix}]" + ) + # nested bars should have fixed bar widths to align nicely + BAR_FMT_DEFAULT_NESTED = ( + "{percentage:3.0f}% {desc:{ncols_desc}.{ncols_desc}}|{bar:10}|" + "{n_fmt}/{total_fmt}" " [{elapsed}<{remaining}, {rate_fmt:>11}{postfix}]" ) BAR_FMT_NOTOTAL = ( @@ -83,12 +89,11 @@ def __init__( ) if bar_format is None: if self.__len__(): - self.bar_format = self.BAR_FMT_DEFAULT - # nested bars should have fixed bar widths to align nicely - if self.pos: - self.bar_format = self.bar_format.replace( - "{bar}", "{bar:10}" - ) + self.bar_format = ( + self.BAR_FMT_DEFAULT_NESTED + if self.pos + else self.BAR_FMT_DEFAULT + ) else: self.bar_format = self.BAR_FMT_NOTOTAL else: From 36fc2b05adb278f0dbd0e7fde69411ccbefb3734 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Tue, 26 Nov 2019 21:59:44 +0000 Subject: [PATCH 3/3] partiallundo reorder --- dvc/progress.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dvc/progress.py b/dvc/progress.py index fd8d3b88a8..b11fb34f3f 100644 --- a/dvc/progress.py +++ b/dvc/progress.py @@ -26,7 +26,7 @@ class Tqdm(tqdm): ) # nested bars should have fixed bar widths to align nicely BAR_FMT_DEFAULT_NESTED = ( - "{percentage:3.0f}% {desc:{ncols_desc}.{ncols_desc}}|{bar:10}|" + "{percentage:3.0f}%|{bar:10}|{desc:{ncols_desc}.{ncols_desc}}" "{n_fmt}/{total_fmt}" " [{elapsed}<{remaining}, {rate_fmt:>11}{postfix}]" )