From ca20b282299aebf66f0033d1c79e4fe7fe7067b8 Mon Sep 17 00:00:00 2001 From: Tilman Adler Date: Fri, 20 Jan 2017 16:32:16 +0100 Subject: [PATCH 1/2] add a progress bar for writing index files --- sigal/gallery.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sigal/gallery.py b/sigal/gallery.py index 99dadf7..d1d5b0e 100644 --- a/sigal/gallery.py +++ b/sigal/gallery.py @@ -676,12 +676,15 @@ class Gallery(object): if failed_files: self.remove_files(failed_files) - print('') if self.settings['write_html']: writer = Writer(self.settings, index_title=self.title) - for album in self.albums.values(): - writer.write(album) + with progressbar(self.albums.values(), label="Writing indices", + item_show_func=log_func, show_eta=False, + file=self.progressbar_target) as albums: + for album in albums: + writer.write(album) + print('') signals.gallery_build.send(self) From bc59af6673af2359d68b57be679cc0ef348112c8 Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Wed, 3 Jan 2018 12:40:00 +0100 Subject: [PATCH 2/2] Align labels --- sigal/gallery.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sigal/gallery.py b/sigal/gallery.py index d1d5b0e..cfdd746 100644 --- a/sigal/gallery.py +++ b/sigal/gallery.py @@ -568,12 +568,12 @@ class Gallery(object): album.create_output_directories() albums[relpath] = album - with progressbar(albums.values(), label="Sorting albums", + with progressbar(albums.values(), label="%16s" % "Sorting albums", file=self.progressbar_target) as progress_albums: for album in progress_albums: album.sort_subdirs(settings['albums_sort_attr']) - with progressbar(albums.values(), label="Sorting media", + with progressbar(albums.values(), label="%16s" % "Sorting media", file=self.progressbar_target) as progress_albums: for album in progress_albums: album.sort_medias(settings['medias_sort_attr']) @@ -679,7 +679,8 @@ class Gallery(object): if self.settings['write_html']: writer = Writer(self.settings, index_title=self.title) - with progressbar(self.albums.values(), label="Writing indices", + with progressbar(self.albums.values(), + label="%16s" % "Writing files", item_show_func=log_func, show_eta=False, file=self.progressbar_target) as albums: for album in albums: