From 51862ad3eddcde2417f7dec075fc663a6d6b505f Mon Sep 17 00:00:00 2001 From: Guido Longoni Date: Mon, 15 Jul 2024 19:19:29 +0200 Subject: [PATCH] logo e/o favicon potrebbero mancare! --- admin_interface/import_tema/admin.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/admin_interface/import_tema/admin.py b/admin_interface/import_tema/admin.py index 1813918..f99cb40 100644 --- a/admin_interface/import_tema/admin.py +++ b/admin_interface/import_tema/admin.py @@ -109,14 +109,18 @@ class ImportMixin(admin.ModelAdmin): allowed_extensions=[".gif", ".jpg", ".jpeg", ".png", ".svg"] try: tema_json = [s for s in os.listdir(f'{tempdir}/{lst[0]}') if '.json' in s][0] - logo = [s for s in os.listdir(f'{tempdir}/{lst[0]}/logo') if any(ele in s for ele in allowed_extensions)][0] + logo = [s for s in os.listdir(f'{tempdir}/{lst[0]}/logo') if any(ele in s for ele in allowed_extensions)] + logo = logo[0] if logo else None favicon = [s for s in os.listdir(f'{tempdir}/{lst[0]}/favicon') if any(ele in s for ele in allowed_extensions)][0] + favicon = favicon[0] if favicon else None with open(f'{tempdir}/{lst[0]}/{tema_json}', 'r') as temporary_file: result = json.loads(temporary_file.read()) - with open(f'{tempdir}/{lst[0]}/logo/{logo}', 'rb') as temporary_file: - default_storage.save(f"admin-interface/logo/{temporary_file.name.split('/')[-1]}", temporary_file) - with open(f'{tempdir}/{lst[0]}/favicon/{favicon}', 'rb') as temporary_file: - default_storage.save(f"admin-interface/favicon/{temporary_file.name.split('/')[-1]}", temporary_file) + if logo: + with open(f'{tempdir}/{lst[0]}/logo/{logo}', 'rb') as temporary_file: + default_storage.save(f"admin-interface/logo/{temporary_file.name.split('/')[-1]}", temporary_file) + if favicon: + with open(f'{tempdir}/{lst[0]}/favicon/{favicon}', 'rb') as temporary_file: + default_storage.save(f"admin-interface/favicon/{temporary_file.name.split('/')[-1]}", temporary_file) skip_result = False except FileNotFoundError as e: messages.error(request, 'Struttura del file .zip errata.')