From a382bef336cb6ba076abc2dcf7269db4cf6d13d5 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Mon, 28 Oct 2019 16:02:44 +0700 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20AdmZip?= =?UTF-8?q?=20=D0=BD=D0=B0=20ZipStreamer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/core/FileDecompressor.js | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/server/core/FileDecompressor.js b/server/core/FileDecompressor.js index 86b74335..ad4cf7b8 100644 --- a/server/core/FileDecompressor.js +++ b/server/core/FileDecompressor.js @@ -3,7 +3,7 @@ const zlib = require('zlib'); const path = require('path'); const unbzip2Stream = require('unbzip2-stream'); const tar = require('tar-fs'); -const AdmZip = require('adm-zip'); +const ZipStreamer = require('./ZipStreamer'); const utils = require('./utils'); const FileDetector = require('./FileDetector'); @@ -111,18 +111,8 @@ class FileDecompressor { } async unZip(filename, outputDir) { - return new Promise((resolve) => { - const files = []; - const zip = new AdmZip(filename); - - zip.getEntries().forEach(function(zipEntry) { - files.push({path: zipEntry.entryName, size: zipEntry.header.size}); - }); - - zip.extractAllTo(outputDir, true); - - resolve(files); - }); + const zip = new ZipStreamer(); + return await await zip.unpack(filename, outputDir); } unBz2(filename, outputDir) {