From c904990eed46ea0f21f5c7ae8c4e89f62f906d65 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 30 Oct 2022 16:04:57 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=B4=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=BC=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=BE=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Api/Api.vue | 21 +++++++++------------
 server/core/DbCreator.js      | 27 ++++++++++++---------------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/client/components/Api/Api.vue b/client/components/Api/Api.vue
index 02e139b..98daf9b 100644
--- a/client/components/Api/Api.vue
+++ b/client/components/Api/Api.vue
@@ -42,18 +42,15 @@ const rotor = '|/-\\';
 const stepBound = [
     0,
     0,// jobStep = 1
-    18,// jobStep = 2
-    20,// jobStep = 3
-    50,// jobStep = 4
-    62,// jobStep = 5
-    62,// jobStep = 6
-    64,// jobStep = 7
-    65,// jobStep = 8
-    69,// jobStep = 9
-    69,// jobStep = 10
-    70,// jobStep = 11
-    95,// jobStep = 12
-    100,// jobStep = 13
+    40,// jobStep = 2
+    50,// jobStep = 3
+    54,// jobStep = 4
+    58,// jobStep = 5
+    69,// jobStep = 6
+    69,// jobStep = 7
+    70,// jobStep = 8
+    95,// jobStep = 9
+    100,// jobStep = 10
 ];
 
 const componentOptions = {
diff --git a/server/core/DbCreator.js b/server/core/DbCreator.js
index 873dc92..ef54dc7 100644
--- a/server/core/DbCreator.js
+++ b/server/core/DbCreator.js
@@ -369,22 +369,22 @@ class DbCreator {
         };
 
         //author
-        callback({job: 'author save', jobMessage: 'Сохранение индекса авторов', jobStep: 6, progress: 0});
+        callback({job: 'author save', jobMessage: 'Сохранение индекса авторов', jobStep: 3, progress: 0});
         await saveTable('author', authorArr, () => {authorArr = null});
 
         //series
-        callback({job: 'series save', jobMessage: 'Сохранение индекса серий', jobStep: 7, progress: 0});
+        callback({job: 'series save', jobMessage: 'Сохранение индекса серий', jobStep: 4, progress: 0});
         await saveTable('series', seriesArr, () => {seriesArr = null});
 
         //title
-        callback({job: 'title save', jobMessage: 'Сохранение индекса названий', jobStep: 8, progress: 0});
+        callback({job: 'title save', jobMessage: 'Сохранение индекса названий', jobStep: 5, progress: 0});
         await saveTable('title', titleArr, () => {titleArr = null});
 
         //genre
-        callback({job: 'genre save', jobMessage: 'Сохранение индекса жанров', jobStep: 9, progress: 0});
+        callback({job: 'genre save', jobMessage: 'Сохранение индекса жанров', jobStep: 6, progress: 0});
         await saveTable('genre', genreArr, () => {genreArr = null});
 
-        callback({job: 'others save', jobMessage: 'Сохранение остальных индексов', jobStep: 10, progress: 0});
+        callback({job: 'others save', jobMessage: 'Сохранение остальных индексов', jobStep: 7, progress: 0});
         //lang
         await saveTable('lang', langArr, () => {langArr = null});
 
@@ -405,14 +405,12 @@ class DbCreator {
         await db.create({table: 'file_hash'});
 
         //-- завершающие шаги --------------------------------
-        if (config.fullOptimization) {
-            await db.open({
-                table: 'book',
-                cacheSize: (config.lowMemoryMode ? 5 : 500),
-            });
-        }
+        await db.open({
+            table: 'book',
+            cacheSize: (config.lowMemoryMode ? 5 : 500),
+        });
 
-        callback({job: 'optimization', jobMessage: 'Оптимизация', jobStep: 11, progress: 0});
+        callback({job: 'optimization', jobMessage: 'Оптимизация', jobStep: 8, progress: 0});
         await this.optimizeTable('author', db, (p) => {
             if (p.progress)
                 p.progress = 0.3*p.progress;
@@ -429,12 +427,11 @@ class DbCreator {
             callback(p);
         });
 
-        callback({job: 'stats count', jobMessage: 'Подсчет статистики', jobStep: 12, progress: 0});
+        callback({job: 'stats count', jobMessage: 'Подсчет статистики', jobStep: 9, progress: 0});
         await this.countStats(db, callback, stats);
 
         //чистка памяти, ибо жрет как не в себя
-        if (config.fullOptimization)
-            await db.close({table: 'book'});
+        await db.close({table: 'book'});
         await db.freeMemory();
         utils.freeMemory();