From 42436fabd39fb4be37d8e902d7afb0d24060bb0c Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Thu, 3 Nov 2022 21:25:10 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20"=D0=9D=D0=B5=20=D0=BA?= =?UTF-8?q?=D0=B0=D1=87=D0=B0=D0=B5=D1=82=20=D0=BA=D0=BD=D0=B8=D0=B3=D0=B8?= =?UTF-8?q?=20#1",=20fixed=20#1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/core/InpxParser.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/core/InpxParser.js b/server/core/InpxParser.js index 68dc179..b4c6b21 100644 --- a/server/core/InpxParser.js +++ b/server/core/InpxParser.js @@ -72,7 +72,7 @@ class InpxParser { await readFileCallback({fileName: inpFile, current: ++current}); const buf = await zipReader.extractToBuf(inpFile); - await this.parseInp(buf, structure, parsedCallback); + await this.parseInp(buf, structure, inpFile, parsedCallback); } if (this.chunk.length) { @@ -84,9 +84,10 @@ class InpxParser { } } - async parseInp(inpBuf, structure, parsedCallback) { + async parseInp(inpBuf, structure, inpFile, parsedCallback) { const structLen = structure.length; const rows = inpBuf.toString().split('\n'); + const defaultFolder = `${path.basename(inpFile, '.inp')}.zip`; for (const row of rows) { let line = row; @@ -115,6 +116,9 @@ class InpxParser { rec.genre = rec.genre.split(':').filter(s => s).join(','); } + if (!rec.folder) + rec.folder = defaultFolder; + rec.serno = parseInt(rec.serno, 10) || 0; rec.size = parseInt(rec.size, 10) || 0; rec.del = parseInt(rec.del, 10) || 0; From 94bec6ed42711cf53a57c4789452526713b15810 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Thu, 3 Nov 2022 21:26:45 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=D0=92=D0=B5=D1=80=D0=B8=D1=8F=201.1.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a6d583a..4e8f525 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "inpx-web", - "version": "1.1.2", + "version": "1.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "inpx-web", - "version": "1.1.2", + "version": "1.1.3", "hasInstallScript": true, "license": "CC0-1.0", "dependencies": { diff --git a/package.json b/package.json index b2bb4bc..57cb452 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "inpx-web", - "version": "1.1.2", + "version": "1.1.3", "author": "Book Pauk ", "license": "CC0-1.0", "repository": "bookpauk/inpx-web",