From d6515ed163fdeeef36b0d47baeed5281a14a09b6 Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Tue, 11 Jun 2013 23:46:39 +0200 Subject: [PATCH] Better logging --- sigal/__init__.py | 4 ++-- sigal/gallery.py | 4 ++-- sigal/settings.py | 2 +- sigal/writer.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sigal/__init__.py b/sigal/__init__.py index 5b57292..ee186d7 100644 --- a/sigal/__init__.py +++ b/sigal/__init__.py @@ -105,13 +105,13 @@ def build(source, destination, debug=False, verbose=False, force=False, if destination: settings['destination'] = os.path.abspath(destination) - logger.debug("Input directory: '%s'", settings['source']) + logger.info("Input : %s", settings['source']) if not settings['source'] or not os.path.isdir(settings['source']): logger.error("Input directory '%s' does not exist.", settings['source']) sys.exit(1) - logger.debug("Output directory: '%s'", settings['destination']) + logger.info("Output : %s", settings['destination']) if not os.path.relpath(settings['destination'], settings['source']).startswith('..'): logger.error("Output directory should be outside of the input " diff --git a/sigal/gallery.py b/sigal/gallery.py index 734c906..be8e761 100644 --- a/sigal/gallery.py +++ b/sigal/gallery.py @@ -159,8 +159,6 @@ class Gallery(object): def build(self): "Create the image gallery" - self.logger.info("Generate gallery in %s ...", - self.settings['destination']) check_or_create_dir(self.settings['destination']) # Compute the label with for the progress bar. The max value is 48 @@ -201,8 +199,10 @@ class Gallery(object): img_iterator = progress.bar(imglist, label=label) else: img_iterator = iter(imglist) + self.logger.info("") self.logger.info(":: Processing '%s' [%i images]", colored.green(dirname), len(imglist)) + self.logger.info("") try: # loop on images diff --git a/sigal/settings.py b/sigal/settings.py index d03375a..583f15c 100644 --- a/sigal/settings.py +++ b/sigal/settings.py @@ -89,7 +89,7 @@ def read_settings(filename=None): if path and not os.path.isabs(path): settings[p] = os.path.abspath(os.path.normpath(os.path.join( settings_path, path))) - logger.debug("%s : %s -> %s", p, path, settings[p]) + logger.debug("Rewrite %s : %s -> %s", p, path, settings[p]) for key in ('img_size', 'thumb_size'): w, h = settings[key] diff --git a/sigal/writer.py b/sigal/writer.py index fd2a5aa..ebd201d 100644 --- a/sigal/writer.py +++ b/sigal/writer.py @@ -62,7 +62,7 @@ class Writer(object): if not os.path.exists(self.theme): raise Exception("Impossible to find the theme %s" % self.theme) - self.logger.info("Theme path : %s", self.theme) + self.logger.info("Theme : %s", self.theme) theme_relpath = os.path.join(self.theme, 'templates') default_loader = FileSystemLoader( os.path.join(THEMES_PATH, 'default', 'templates'))