From ee4cebb5bb7ae869716c03188b88954007204c7d Mon Sep 17 00:00:00 2001 From: Place Jean-Marie Date: Fri, 5 Nov 2021 09:54:28 +0100 Subject: [PATCH] adapt pe_tools --- app/pe/pe_tools.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/pe/pe_tools.py b/app/pe/pe_tools.py index 46e706ee..76b9e46b 100644 --- a/app/pe/pe_tools.py +++ b/app/pe/pe_tools.py @@ -44,6 +44,7 @@ import unicodedata import app.scodoc.sco_utils as scu from app import log +from app.scodoc.sco_logos import find_logo PE_DEBUG = 0 @@ -202,10 +203,10 @@ def add_pe_stuff_to_zip(zipfile, ziproot): # Logos: (add to logos/ directory in zip) logos_names = ["logo_header.jpg", "logo_footer.jpg"] - for f in logos_names: - logo = os.path.join(scu.SCODOC_LOGOS_DIR, f) - if os.path.isfile(logo): - add_local_file_to_zip(zipfile, ziproot, logo, "avis/logos/" + f) + for name in logos_names: + logo = find_logo(logoname=name, dept_id=g.scodoc_dept) + if logo is not None: + add_local_file_to_zip(zipfile, ziproot, logo, "avis/logos/" + logo.filename) # ----------------------------------------------------------------------------------------