From 373839cf03a3be1c2e7687c60efceb0af916c457 Mon Sep 17 00:00:00 2001
From: AIIrondev <iron.ai.dev@gmail.com>
Date: Tue, 4 Aug 2026 22:17:16 +0200
Subject: [PATCH] fix of the json upload format

---
 Web/templates/upload_batch.html | 114 ++++++++++++++++----------------
 1 file changed, 56 insertions(+), 58 deletions(-)

diff --git a/Web/templates/upload_batch.html b/Web/templates/upload_batch.html
index ae9d119..8ae00c1 100644
--- a/Web/templates/upload_batch.html
+++ b/Web/templates/upload_batch.html
@@ -48,7 +48,7 @@
 </div>
 
 <script>
-// 1. Ein echter CSV-Parser, der Zeilenumbrüche und Kommas in Texten korrekt ignoriert
+// 1. Robuster CSV-Parser, der Zeilenumbrüche und Kommas in Texten korrekt ignoriert
 function parseCSV(csvString) {
     const rows = [];
     let currentRow = [];
@@ -70,7 +70,6 @@ function parseCSV(csvString) {
         } else if ((char === '\n' || char === '\r') && !insideQuotes) {
             if (char === '\r' && nextChar === '\n') i++; // Windows Umbrüche überspringen
             currentRow.push(currentCell);
-            // Leere Zeilen ignorieren
             if (currentRow.length > 1 || currentRow[0] !== '') {
                 rows.push(currentRow);
             }
@@ -94,7 +93,6 @@ function rowToCSV(rowArray) {
     return rowArray.map(cell => {
         if (cell === null || cell === undefined) return '';
         let cellStr = String(cell);
-        // Wenn kritische Zeichen drin sind, sauber in Anführungszeichen verpacken
         if (cellStr.includes(',') || cellStr.includes('"') || cellStr.includes('\n') || cellStr.includes('\r')) {
             return '"' + cellStr.replace(/"/g, '""') + '"';
         }
@@ -102,7 +100,7 @@ function rowToCSV(rowArray) {
     }).join(',');
 }
 
-// 3. Bildnamen extrahieren (bleibt wie es war)
+// 3. Bildnamen extrahieren
 function extractImageNames(cellValue) {
     if (!cellValue) return [];
     let raw = String(cellValue).replace(/^["']|["']$/g, '').trim();
@@ -159,7 +157,6 @@ document.getElementById('batchUploadForm').addEventListener('submit', async func
 
     try {
         const csvText = await csvFile.text();
-        // Hier rufen wir jetzt unseren sicheren Parser auf!
         const allRows = parseCSV(csvText);
 
         if (allRows.length <= 1) {
@@ -171,10 +168,8 @@ document.getElementById('batchUploadForm').addEventListener('submit', async func
 
         log(`${dataRows.length} Einträge gefunden. Bereite Batches vor...`);
 
-        // Spalten-Index von "Images" sicher ermitteln
         const imagesColIndex = headerRow.findIndex(h => h.toLowerCase().trim() === 'images');
 
-        // In Batches aufteilen
         const batches = [];
         for (let i = 0; i < dataRows.length; i += BATCH_SIZE) {
             batches.push(dataRows.slice(i, i + BATCH_SIZE));
@@ -183,74 +178,77 @@ document.getElementById('batchUploadForm').addEventListener('submit', async func
         progressBar.max = batches.length;
         progressBar.value = 0;
 
+        // Sequenzieller Upload mit Fehlertoleranz pro Batch
         for (let b = 0; b < batches.length; b++) {
             const batchRows = batches[b];
             progressText.textContent = `Lade Batch ${b + 1} von ${batches.length} hoch...`;
 
-            const requiredImagesForBatch = new Set();
+            try {
+                const requiredImagesForBatch = new Set();
 
-            if (imagesColIndex !== -1) {
-                batchRows.forEach(rowCols => {
-                    if (rowCols[imagesColIndex]) {
-                        const imgNames = extractImageNames(rowCols[imagesColIndex]);
-                        imgNames.forEach(name => {
-                            const fileMatch = imageMap.get(name.toLowerCase());
-                            if (fileMatch) {
-                                requiredImagesForBatch.add(fileMatch);
-                            }
-                        });
+                if (imagesColIndex !== -1) {
+                    batchRows.forEach(rowCols => {
+                        if (rowCols[imagesColIndex]) {
+                            const imgNames = extractImageNames(rowCols[imagesColIndex]);
+                            imgNames.forEach(name => {
+                                const fileMatch = imageMap.get(name.toLowerCase());
+                                if (fileMatch) {
+                                    requiredImagesForBatch.add(fileMatch);
+                                }
+                            });
+                        }
+                    });
+                }
+
+                const batchCsvArray = [headerRow, ...batchRows];
+                const batchCsvText = batchCsvArray.map(rowToCSV).join('\n');
+                const batchCsvBlob = new Blob([batchCsvText], { type: 'text/csv' });
+
+                const formData = new FormData();
+                formData.append('csv_file', batchCsvBlob, `batch_${b + 1}.csv`);
+
+                if (csrfToken) {
+                    formData.append('csrf_token', csrfToken);
+                }
+
+                requiredImagesForBatch.forEach(imgFile => {
+                    formData.append('images', imgFile);
+                });
+
+                log(`Batch ${b + 1}: ${batchRows.length} Items & ${requiredImagesForBatch.size} zugehörige Bilder.`);
+
+                const response = await fetch('/upload_csv_batch', {
+                    method: 'POST',
+                    body: formData,
+                    headers: {
+                        'X-CSRFToken': csrfToken || ''
                     }
                 });
-            }
 
-            // Sicherer Zusammenbau des CSV-Batches
-            const batchCsvArray = [headerRow, ...batchRows];
-            const batchCsvText = batchCsvArray.map(rowToCSV).join('\n');
-            const batchCsvBlob = new Blob([batchCsvText], { type: 'text/csv' });
+                const responseText = await response.text();
+                let result;
 
-            const formData = new FormData();
-            formData.append('csv_file', batchCsvBlob, `batch_${b + 1}.csv`);
-
-            if (csrfToken) {
-                formData.append('csrf_token', csrfToken);
-            }
-
-            requiredImagesForBatch.forEach(imgFile => {
-                formData.append('images', imgFile);
-            });
-
-            log(`Batch ${b + 1}: ${batchRows.length} Items & ${requiredImagesForBatch.size} zugehörige Bilder.`);
-
-            // Request absenden
-            const response = await fetch('/upload_csv_batch', {
-                method: 'POST',
-                body: formData,
-                headers: {
-                    'X-CSRFToken': csrfToken || ''
+                try {
+                    result = JSON.parse(responseText);
+                } catch (parseErr) {
+                    throw new Error(`Server-Fehler (Status ${response.status}). HTML statt JSON erhalten.`);
                 }
-            });
 
-            // 1. Antwort als rohen Text auslesen (verhindert den JSON.parse Crash)
-            const responseText = await response.text();
-            let result;
+                if (!response.ok || !result.success) {
+                    throw new Error(result.message || `Server-Fehler ${response.status}`);
+                }
 
-            try {
-                result = JSON.parse(responseText);
-            } catch (parseErr) {
-                // Wenn der Server kein JSON schickt (z.B. Python 500 Error als HTML-Seite)
-                console.error("Server-Antwort war kein JSON:", responseText);
-                throw new Error(`Server-Fehler (Status ${response.status}). Der Server hat ein HTML-Dokument statt JSON zurückgegeben. Prüfe die Flask-Konsole!`);
+                log(`Batch ${b + 1} erfolgreich abgeschlossen.`);
+
+            } catch (batchErr) {
+                log(`⚠️ FEHLER in Batch ${b + 1}: ${batchErr.message}. Überspringe und fahre fort...`);
+                console.error(`Batch ${b + 1} fehlgeschlagen:`, batchErr);
             }
 
-            if (!response.ok || !result.success) {
-                throw new Error(result.message || `Server-Fehler ${response.status}`);
-            }
-
-            log(`Batch ${b + 1} abgeschlossen: ${result.message}`);
             progressBar.value = b + 1;
         }
 
-        progressText.textContent = "Upload erfolgreich beendet! Keine verschobenen Spalten mehr.";
+        progressText.textContent = "Upload-Prozess beendet!";
         uploadBtn.disabled = false;
 
     } catch (err) {