From 7a58b5a3ba1bac77af4ed6c7ec5131734f7a62ca Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Thu, 20 Oct 2022 21:57:10 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B9=20=D1=80?= =?UTF-8?q?=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=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/DbCreator.js | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/server/core/DbCreator.js b/server/core/DbCreator.js index 3ffdcff..998bc61 100644 --- a/server/core/DbCreator.js +++ b/server/core/DbCreator.js @@ -462,11 +462,7 @@ class DbCreator { titleRec.id = ++id; } - //config - await db.create({ - table: 'config' - }); - + //stats const stats = { filesCount: 0, recsLoaded, @@ -483,14 +479,6 @@ class DbCreator { }; //console.log(stats); - const inpxHashCreator = new InpxHashCreator(config); - - await db.insert({table: 'config', rows: [ - {id: 'inpxInfo', value: (inpxFilter && inpxFilter.info ? inpxFilter.info : parser.info)}, - {id: 'stats', value: stats}, - {id: 'inpxHash', value: await inpxHashCreator.getHash()}, - ]}); - //сохраним поисковые таблицы const chunkSize = 10000; @@ -577,6 +565,19 @@ class DbCreator { await db.freeMemory(); utils.freeMemory(); + //config сохраняем в самом конце, нет конфига - с базой что-то не так + const inpxHashCreator = new InpxHashCreator(config); + + await db.create({ + table: 'config' + }); + + await db.insert({table: 'config', rows: [ + {id: 'inpxInfo', value: (inpxFilter && inpxFilter.info ? inpxFilter.info : parser.info)}, + {id: 'stats', value: stats}, + {id: 'inpxHash', value: await inpxHashCreator.getHash()}, + ]}); + callback({job: 'done', jobMessage: ''}); } @@ -689,12 +690,9 @@ class DbCreator { }); `}); - if (countRes.length) { + if (countRes.length) stats.filesCount = countRes[0].count; - await db.insert({table: 'config', replace: true, rows: [ - {id: 'stats', value: stats}, - ]}); - } + countDone = true; } }