From 320e5aec2a41c1a60d0381dd67d0b1223a921f3d Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Thu, 4 Apr 2024 18:27:11 +0700 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c325110..c8ed351 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ Options: // пустая строка: использовать значение по умолчанию - inpx-файл, что найдется в директории библиотеки "inpx": "", - // конфигурационный файл для фильра по авторам и книгам (см. ниже) + // конфигурационный файл для фильтра по авторам и книгам (см. ниже) // пустая строка: использовать значение по умолчанию - файл filter.json в директории файла конфигурации "inpxFilterFile": "", From e17053141de1a1fc8462e4accf29cd5976ec1496 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Thu, 4 Apr 2024 18:38:01 +0700 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/config/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/config/index.js b/server/config/index.js index fc170e1..3f21777 100644 --- a/server/config/index.js +++ b/server/config/index.js @@ -52,7 +52,7 @@ class ConfigManager { return instance; } - async init(tempDataDir, configFile) { + async init(defaultDataDir, configFile) { if (this.inited) throw new Error('already inited'); @@ -69,14 +69,14 @@ class ConfigManager { this.branchConfigFile = __dirname + `/${this.branch}.js`; const config = require(this.branchConfigFile); - if (!tempDataDir) { - tempDataDir = `${config.execDir}/.${config.name}`; + if (!defaultDataDir) { + defaultDataDir = `${config.execDir}/.${config.name}`; } if (configFile) { config.configFile = path.resolve(configFile); } else { - config.configFile = `${tempDataDir}/config.json`; + config.configFile = `${defaultDataDir}/config.json`; } this._config = config; From 9a3ce1e184231ecc3d7e74a3e860e2b8c998259f Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 4 Jun 2024 20:07:08 +0700 Subject: [PATCH 3/4] =?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=B2=D0=B5=D1=80=D1=81?= =?UTF-8?q?=D0=B8=D1=8F=201.5.7=20=D0=BD=D0=B5=20=D1=81=D0=BE=D0=B7=D0=B4?= =?UTF-8?q?=D0=B0=D0=B5=D1=82=20=D1=84=D0=B0=D0=B9=D0=BB=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20?= =?UTF-8?q?(#32)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/config/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server/config/index.js b/server/config/index.js index 3f21777..307ac66 100644 --- a/server/config/index.js +++ b/server/config/index.js @@ -76,6 +76,7 @@ class ConfigManager { if (configFile) { config.configFile = path.resolve(configFile); } else { + await fs.ensureDir(defaultDataDir); config.configFile = `${defaultDataDir}/config.json`; } From ac074c4c008f5313cdca431040d2fb6aa2db393f Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 4 Jun 2024 20:08:04 +0700 Subject: [PATCH 4/4] v1.5.8 --- 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 94eead9..b940eec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "inpx-web", - "version": "1.5.7", + "version": "1.5.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "inpx-web", - "version": "1.5.7", + "version": "1.5.8", "hasInstallScript": true, "license": "CC0-1.0", "dependencies": { diff --git a/package.json b/package.json index 0b78227..74fc7f3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "inpx-web", - "version": "1.5.7", + "version": "1.5.8", "author": "Book Pauk ", "license": "CC0-1.0", "repository": "bookpauk/inpx-web",