From 4c1c5d1e1c3a1156d444fb36d3f3ad0c70feda33 Mon Sep 17 00:00:00 2001
From: Marcel Blijleven <marcelblijleven@gmail.com>
Date: Fri, 30 Jun 2023 13:54:11 +0200
Subject: [PATCH] fix: parse zipped brew and bean data correctly

---
 src/lib/upload/utils.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/lib/upload/utils.ts b/src/lib/upload/utils.ts
index 400d762..a3a68d4 100644
--- a/src/lib/upload/utils.ts
+++ b/src/lib/upload/utils.ts
@@ -31,7 +31,7 @@ export async function readZipFile(file: File, callback: (data: any) => void) {
     const blobReader = new BlobReader(file);
     const reader = new ZipReader(blobReader);
     const entries: Entry[] = await reader.getEntries();
-    console.log(entries)
+
     if (!entries.length) {
         throw new Error("Empty zip file uploaded");
     }
@@ -51,16 +51,17 @@ export async function readZipFile(file: File, callback: (data: any) => void) {
         const data = await readEntryToJSON(entry);
 
         if (!!entry.filename.match(BEANCONQUEROR_BEANS_RE)) {
-            additionalBeans.push(data.BEANS);
+            additionalBeans.push(...data);
             continue;
         }
 
         if (!!entry.filename.match(BEANCONQUEROR_BREWS_RE)) {
-            additionalBrews.push(data.BREWS);
+            additionalBrews.push(...data);
         }
     }
-    baseData.BEANS = baseData.BEANS.concat(...additionalBeans);
-    baseData.BREWS = baseData.BREWS.concat(...additionalBrews);
+
+    baseData.BEANS = baseData.BEANS.concat(additionalBeans);
+    baseData.BREWS = baseData.BREWS.concat(additionalBrews);
 
     await callback(baseData);
     await reader.close();