From a4aa4ae2f0cb90ed37aabf9070751af092320213 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Thu, 3 Nov 2022 21:50:08 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/core/InpxParser.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/server/core/InpxParser.js b/server/core/InpxParser.js index b4c6b21..919e6c3 100644 --- a/server/core/InpxParser.js +++ b/server/core/InpxParser.js @@ -70,9 +70,8 @@ class InpxParser { this.chunk = []; for (const inpFile of inpFiles) { await readFileCallback({fileName: inpFile, current: ++current}); - const buf = await zipReader.extractToBuf(inpFile); - await this.parseInp(buf, structure, inpFile, parsedCallback); + await this.parseInp(zipReader, inpFile, structure, parsedCallback); } if (this.chunk.length) { @@ -84,10 +83,12 @@ class InpxParser { } } - async parseInp(inpBuf, structure, inpFile, parsedCallback) { - const structLen = structure.length; + async parseInp(zipReader, inpFile, structure, parsedCallback) { + const inpBuf = await zipReader.extractToBuf(inpFile); const rows = inpBuf.toString().split('\n'); + const defaultFolder = `${path.basename(inpFile, '.inp')}.zip`; + const structLen = structure.length; for (const row of rows) { let line = row;