CAMP/camp
1
0
Fork 0
Code Issues 3 Pull requests 1 Releases Wiki Activity

merge photolog subfolder patch

Browse source
This commit is contained in:
j 2025-03-24 11:50:53 +00:00
parent 31cac27ece
commit 93c4e2a0b9
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
photologue/forms.py
View file

@ -166,14 +166,6 @@ def upload_photos_to_site(site: Site, zip: zipfile.ZipFile, gallery: Gallery, ph
logger.debug(f'Ignoring file "{filename}".') logger.debug(f'Ignoring file "{filename}".')
continue continue
if os.path.dirname(filename):
logger.warning('Ignoring file "{}" as it is in a subfolder; all images should be in the top '
'folder of the zip.'.format(filename))
upload_messages.append(UploadMessage.warning(
_('Ignoring file "{filename}" as it is in a subfolder; all images should be in the top folder of the '
'zip.').format(filename=filename)))
continue
data = zip.read(filename) data = zip.read(filename)
if not len(data): if not len(data):
@ -213,7 +205,7 @@ def upload_photos_to_site(site: Site, zip: zipfile.ZipFile, gallery: Gallery, ph
continue continue
contentfile = ContentFile(data) contentfile = ContentFile(data)
photo.image.save(filename, contentfile) photo.image.save(os.path.basename(filename), contentfile)
photo.save() photo.save()
photo.sites.add(site) photo.sites.add(site)
gallery.photos.add(photo) gallery.photos.add(photo)