From 160e4a04796d4bb62ef4775545e2bd5301404c0e Mon Sep 17 00:00:00 2001
From: j433866 <j433866@gmail.com>
Date: Wed, 3 Jul 2019 10:34:02 +0100
Subject: [PATCH] Change ZipWorker to use Dish.get()

---
 src/web/workers/ZipWorker.mjs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/web/workers/ZipWorker.mjs b/src/web/workers/ZipWorker.mjs
index fa020290..61956a66 100644
--- a/src/web/workers/ZipWorker.mjs
+++ b/src/web/workers/ZipWorker.mjs
@@ -8,6 +8,7 @@
 
 import zip from "zlibjs/bin/zip.min";
 import Utils from "../../core/Utils";
+import Dish from "../../core/Dish";
 import {detectFileType} from "../../core/lib/FileType";
 
 const Zlib = zip.Zlib;
@@ -43,7 +44,7 @@ self.setOption = function(...args) {};
  * @param {string} filename
  * @param {string} fileExtension
  */
-self.zipFiles = function(outputs, filename, fileExtension) {
+self.zipFiles = async function(outputs, filename, fileExtension) {
     const zip = new Zlib.Zip();
     const inputNums = Object.keys(outputs);
 
@@ -51,14 +52,8 @@ self.zipFiles = function(outputs, filename, fileExtension) {
         const iNum = inputNums[i];
         let ext = fileExtension;
 
-        let output;
-        if (outputs[iNum].data === null) {
-            output = new Uint8Array(0);
-        } else if (typeof outputs[iNum].data.dish.value === "string") {
-            output = new Uint8Array(Utils.strToArrayBuffer(outputs[iNum].data.dish.value));
-        } else {
-            output = new Uint8Array(outputs[iNum].data.dish.value);
-        }
+        const cloned = new Dish(outputs[iNum].data.dish);
+        const output = new Uint8Array(await cloned.get(Dish.ARRAY_BUFFER));
 
         if (fileExtension === "") {
             // Detect automatically