diff --git a/dvc/progress.py b/dvc/progress.py index 65288acef8..b11fb34f3f 100644 --- a/dvc/progress.py +++ b/dvc/progress.py @@ -20,8 +20,14 @@ class Tqdm(tqdm): """ BAR_FMT_DEFAULT = ( - "{percentage:3.0f}%|{bar:10}|" - "{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}%|{bar:10}|{desc:{ncols_desc}.{ncols_desc}}" + "{n_fmt}/{total_fmt}" " [{elapsed}<{remaining}, {rate_fmt:>11}{postfix}]" ) BAR_FMT_NOTOTAL = ( @@ -83,7 +89,11 @@ def __init__( ) if bar_format is None: if self.__len__(): - self.bar_format = self.BAR_FMT_DEFAULT + 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: