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

Make sure zip_gallery is set correctly (fix #477)

Browse Source
This commit is contained in:
Simon Conseil
2022-08-15 17:07:42 +02:00
parent 5ee967bf9e
commit 272f33266d
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sigal/plugins/zip_gallery.py
View File

@@ -111,5 +111,12 @@ def nozip_gallery_file(album, settings=None):
Album.zip.__set_name__(Album, 'zip')
def check_settings(gallery):
if gallery.settings['zip_gallery'] and not isinstance(gallery.settings['zip_gallery'], str):
logger.error("'zip_gallery' should be set to a filename")
gallery.settings['zip_gallery'] = False
def register(settings):
signals.album_initialized.connect(nozip_gallery_file)
signals.gallery_initialized.connect(check_settings)

11
tests/test_zip.py
View File

@@ -61,3 +61,14 @@ def test_no_archive(tmpdir):
assert not os.path.isfile(os.path.join(outpath, 'test1', 'archive.zip'))
assert not os.path.isfile(os.path.join(outpath, 'test2', 'archive.zip'))
def test_correct_filename(tmpdir, caplog):
caplog.set_level('ERROR')
outpath = str(tmpdir)
gallery = make_gallery(destination=outpath, zip_gallery=True)
gallery.build()
assert caplog.records[0].message == "'zip_gallery' should be set to a filename"
assert not os.path.isfile(os.path.join(outpath, 'test1', 'archive.zip'))
assert not os.path.isfile(os.path.join(outpath, 'test2', 'archive.zip'))