Update app.py

app.py

@@ -4,7 +4,7 @@ import io
 import re
 import traceback
 
-def process_files(phase, objecten_file_dict, template_files_data):
+def process_files(phase, objecten_file_dict, templates_zip_file_dict):
     try:
         # Read and process the 'objecten.txt' file
         content = objecten_file_dict['data'].decode('utf-8')
@@ -30,9 +30,14 @@ def process_files(phase, objecten_file_dict, template_files_data):
         for k in objs:
             objs[k] = [re.search(regObject, o).group(0) for o in objs[k] if re.search(regObject, o)]
 
-        # Create an in-memory ZIP file
-        zip_buffer = io.BytesIO()
-        with zipfile.ZipFile(zip_buffer, 'w') as zf:
+        # Read template files from the uploaded ZIP file
+        templates_zip_data = templates_zip_file_dict['data']
+        with zipfile.ZipFile(io.BytesIO(templates_zip_data), 'r') as zip_ref:
+            template_files = {info.filename: zip_ref.read(info.filename) for info in zip_ref.infolist()}
+
+        # Create an in-memory ZIP file for the output
+        output_zip_buffer = io.BytesIO()
+        with zipfile.ZipFile(output_zip_buffer, 'w') as zf:
             for k in objs:
                 regPhase = ''
                 if k == '(i)SAT':
@@ -42,10 +47,9 @@ def process_files(phase, objecten_file_dict, template_files_data):
 
                 # Filter template files for this phase
                 phase_templates = []
-                for file_dict in template_files_data:
-                    filename = file_dict['name']
+                for filename, file_data in template_files.items():
                     if re.search(regPhase, filename, re.IGNORECASE):
-                        phase_templates.append(file_dict)
+                        phase_templates.append((filename, file_data))
 
                 if not phase_templates:
                     error_msg = f"Phase {k} has no templates."
@@ -53,19 +57,17 @@ def process_files(phase, objecten_file_dict, template_files_data):
 
                 for o in objs[k]:
                     folder_path = f"{o}/"
-                    for file_dict in phase_templates:
-                        template_filename = file_dict['name']
+                    for template_filename, file_content in phase_templates:
                         # Adjust filename if needed
                         if re.search(r"hut_\d{4}[a-zA-Z]{2}", template_filename, re.IGNORECASE):
                             adjusted_filename = template_filename[:4] + o + template_filename[10:]
                         else:
                             adjusted_filename = template_filename
 
-                        file_content = file_dict['data']
                         file_path = folder_path + adjusted_filename
                         zf.writestr(file_path, file_content)
-        zip_buffer.seek(0)
-        return zip_buffer, None
+        output_zip_buffer.seek(0)
+        return output_zip_buffer, None
     except Exception as e:
         # Capture the full traceback
         error_msg = traceback.format_exc()
@@ -78,14 +80,14 @@ interface = gr.Interface(
     inputs=[
         gr.Dropdown(choices=phase_options, label="Select Phase"),
         gr.File(label="Upload 'objecten.txt' File", type='binary'),
-        gr.File(label="Upload Template Files", type='binary', multiple=True)
+        gr.File(label="Upload Templates ZIP File", type='binary')
     ],
     outputs=[
         gr.File(label="Download ZIP File"),
-        gr.Textbox(label="Error Log", lines=15)
+        gr.Code(label="Error Log", language="python")
     ],
     title="Template Folder Generator",
-    description="Upload 'objecten.txt' and template files to generate folders and files."
+    description="Upload 'objecten.txt' and a ZIP file containing template files to generate folders and files."
 )
 
 interface.launch()