From 9560f84ce465d528518690e062a239e1dc06e8cc Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Sun, 12 Mar 2017 00:32:41 +0100 Subject: [PATCH] Show progress for "Collecting albums" only for terminal output --- sigal/gallery.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sigal/gallery.py b/sigal/gallery.py index 5f47065..ace661e 100644 --- a/sigal/gallery.py +++ b/sigal/gallery.py @@ -528,14 +528,13 @@ class Gallery(object): ignore_files = settings['ignore_files'] progressChars = cycle(["/", "-", "\\", "|"]) - if self.logger.getEffectiveLevel() >= logging.WARNING: - self.progressbar_target = None - else: - self.progressbar_target = Devnull() + show_progress = (self.logger.getEffectiveLevel() >= logging.WARNING and + os.isatty(sys.stdout.fileno())) + self.progressbar_target = None if show_progress else Devnull() for path, dirs, files in os.walk(src_path, followlinks=True, topdown=False): - if self.logger.getEffectiveLevel() >= logging.WARNING: + if show_progress: print("\rCollecting albums " + next(progressChars), end="") relpath = os.path.relpath(path, src_path)