From a556a88ee53952e5cf8c2287a6e153c2c06dbae6 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 19 Oct 2022 18:09:58 +0700
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=BF=D0=BE=D0=B4=D1=81=D1=87=D0=B5=D1=82=20=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D1=82=D0=B8=D1=81=D1=82=D0=B8=D0=BA=D0=B8,=20?=
 =?UTF-8?q?=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D1=81=D0=B5=D1=80=D0=B8=D0=B9=20=D0=B8=20=D0=BD=D0=B0=D0=B7?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Api/Api.vue |  3 +-
 server/core/DbCreator.js      | 72 +++++++++++++++++++++++++++++------
 2 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/client/components/Api/Api.vue b/client/components/Api/Api.vue
index b0b7df0..38edf02 100644
--- a/client/components/Api/Api.vue
+++ b/client/components/Api/Api.vue
@@ -52,7 +52,8 @@ const stepBound = [
     79,// jobStep = 9
     79,// jobStep = 10
     80,// jobStep = 11
-    100,// jobStep = 12
+    95,// jobStep = 12
+    100,// jobStep = 13
 ];
 
 const componentOptions = {
diff --git a/server/core/DbCreator.js b/server/core/DbCreator.js
index b4f41da..6391843 100644
--- a/server/core/DbCreator.js
+++ b/server/core/DbCreator.js
@@ -60,14 +60,11 @@ class DbCreator {
         let langArr = [];
 
         //stats
-        let filesCount = 0;
         let authorCount = 0;
         let bookCount = 0;
         let noAuthorBookCount = 0;
         let bookDelCount = 0;
 
-        let filesSet = new Set();
-
         //stuff
         let recsLoaded = 0;
         callback({recsLoaded});
@@ -148,8 +145,6 @@ class DbCreator {
 
                 rec.id = ++id;
 
-                filesSet.add(`${rec.folder}/${rec.file}.${rec.ext}`);
-
                 if (!rec.del) {
                     bookCount++;
                     if (!rec.author)
@@ -214,9 +209,6 @@ class DbCreator {
         const parser = new InpxParser();
         await parser.parse(config.inpxFile, readFileCallback, parsedCallback);
 
-        filesCount = filesSet.size;
-        filesSet = null;
-
         utils.freeMemory();
 
         //отсортируем авторов и выдадим им правильные id
@@ -448,14 +440,35 @@ class DbCreator {
 
         utils.freeMemory();
 
+        //сортировка серий
+        callback({job: 'series sort', jobMessage: 'Сортировка серий', jobStep: 5, progress: 0});
+        await utils.sleep(100);
+        seriesArr.sort((a, b) => a.value.localeCompare(b.value));
+        await utils.sleep(100);
+        callback({progress: 0.3});
+        id = 0;
+        for (const seriesRec of seriesArr) {
+            seriesRec.id = ++id;
+        }
+
+        await utils.sleep(100);
+        callback({progress: 0.5});
+        //заодно и названия
+        titleArr.sort((a, b) => a.value.localeCompare(b.value));
+        await utils.sleep(100);
+        callback({progress: 0.7});
+        id = 0;
+        for (const titleRec of titleArr) {
+            titleRec.id = ++id;
+        }
+
         //config
-        callback({job: 'config save', jobMessage: 'Сохранение конфигурации', jobStep: 5, progress: 0});
         await db.create({
             table: 'config'
         });
 
         const stats = {
-            filesCount,
+            filesCount: 0,
             recsLoaded,
             authorCount,
             authorCountAll: authorArr.length,
@@ -625,10 +638,47 @@ class DbCreator {
             aChunk = null;
         }
 
+        //статистика по количеству файлов
+        callback({job: 'files count', jobMessage: 'Подсчет статистики', jobStep: 12, progress: 0});
+
+        //эмуляция прогресса
+        let countDone = false;
+        (async() => {
+            let i = 0;
+            while (!countDone) {
+                callback({progress: i/100});
+                i = (i < 100 ? i + 5 : 100);
+                await utils.sleep(1000);
+            }
+        })();
+
+        //подчсет
+        const countRes = await db.select({table: 'book', count: true, where: `
+            const filesSet = new Set();
+
+            @@iter(@all(), (r) => {
+                const file = ${"`${r.folder}/${r.file}.${r.ext}`"};
+                if (filesSet.has(file)) {
+                    return false;
+                } else {
+                    filesSet.add(file);
+                    return true;
+                }
+            });
+        `});
+
+        if (countRes.length) {
+            stats.filesCount = countRes[0].count;
+            await db.insert({table: 'config', replace: true, rows: [
+                {id: 'stats', value: stats},
+            ]});
+        }
+        countDone = true;
+
         //чистка памяти, ибо жрет как не в себя
-        await db.drop({table: 'book'});//таблица больше не понадобится
         await db.drop({table: 'series_temporary'});//таблица больше не понадобится        
 
+        await db.close({table: 'book'});
         await db.close({table: 'series'});
         await db.freeMemory();
         utils.freeMemory();