forks/sigal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pr/234'

Browse Source
This commit is contained in:
Simon Conseil
2018-01-03 12:41:15 +01:00
parent 7e35d1fa40 bc59af6673
commit f4ef6ce5fa
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sigal/gallery.py
View File

@@ -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'])
@@ -676,12 +676,16 @@ 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="%16s" % "Writing files",
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)