diff --git a/package-lock.json b/package-lock.json index 4e8f525..52bb9f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "inpx-web", - "version": "1.1.3", + "version": "1.1.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "inpx-web", - "version": "1.1.3", + "version": "1.1.4", "hasInstallScript": true, "license": "CC0-1.0", "dependencies": { diff --git a/package.json b/package.json index 57cb452..263460f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "inpx-web", - "version": "1.1.3", + "version": "1.1.4", "author": "Book Pauk ", "license": "CC0-1.0", "repository": "bookpauk/inpx-web", diff --git a/server/config/base.js b/server/config/base.js index 30cba44..ced76b7 100644 --- a/server/config/base.js +++ b/server/config/base.js @@ -14,9 +14,9 @@ module.exports = { bookReadLink: '', loggingEnabled: true, - //поправить в случае, если были критические изменения в DbCreator + //поправить в случае, если были критические изменения в DbCreator или InpxParser //иначе будет рассинхронизация между сервером и клиентом на уровне БД - dbVersion: '5', + dbVersion: '6', dbCacheSize: 5, maxPayloadSize: 500,//in MB 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;