Mirror/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2024-09-29 23:11:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change ZipWorker to use Dish.get()

Browse Source
This commit is contained in:
j433866 2019-07-03 10:34:02 +01:00
parent 3a197379d5
commit 160e4a0479
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/web/workers/ZipWorker.mjs
View File

@ -8,6 +8,7 @@
import zip from "zlibjs/bin/zip.min"; import zip from "zlibjs/bin/zip.min";
import Utils from "../../core/Utils"; import Utils from "../../core/Utils";
import Dish from "../../core/Dish";
import {detectFileType} from "../../core/lib/FileType"; import {detectFileType} from "../../core/lib/FileType";
const Zlib = zip.Zlib; const Zlib = zip.Zlib;
@ -43,7 +44,7 @@ self.setOption = function(...args) {};
* @param {string} filename * @param {string} filename
* @param {string} fileExtension * @param {string} fileExtension
*/ */
self.zipFiles = function(outputs, filename, fileExtension) { self.zipFiles = async function(outputs, filename, fileExtension) {
const zip = new Zlib.Zip(); const zip = new Zlib.Zip();
const inputNums = Object.keys(outputs); const inputNums = Object.keys(outputs);
@ -51,14 +52,8 @@ self.zipFiles = function(outputs, filename, fileExtension) {
const iNum = inputNums[i]; const iNum = inputNums[i];
let ext = fileExtension; let ext = fileExtension;
let output; const cloned = new Dish(outputs[iNum].data.dish);
if (outputs[iNum].data === null) { const output = new Uint8Array(await cloned.get(Dish.ARRAY_BUFFER));
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);
}
if (fileExtension === "") { if (fileExtension === "") {
// Detect automatically // Detect automatically