deadcxap/inpx-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Работа над новым поиском

Browse Source
This commit is contained in:
Book Pauk
2022-10-30 16:04:57 +07:00
parent 75cb5444b2
commit c904990eed
2 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
client/components/Api/Api.vue
View File

@@ -42,18 +42,15 @@ const rotor = '|/-\\';
const stepBound = [ const stepBound = [
0, 0,
0,// jobStep = 1 0,// jobStep = 1
18,// jobStep = 2 40,// jobStep = 2
20,// jobStep = 3 50,// jobStep = 3
50,// jobStep = 4 54,// jobStep = 4
62,// jobStep = 5 58,// jobStep = 5
62,// jobStep = 6 69,// jobStep = 6
64,// jobStep = 7 69,// jobStep = 7
65,// jobStep = 8 70,// jobStep = 8
69,// jobStep = 9 95,// jobStep = 9
69,// jobStep = 10 100,// jobStep = 10
70,// jobStep = 11
95,// jobStep = 12
100,// jobStep = 13
]; ];
const componentOptions = { const componentOptions = {

27
server/core/DbCreator.js
View File

@@ -369,22 +369,22 @@ class DbCreator {
}; };
//author //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}); await saveTable('author', authorArr, () => {authorArr = null});
//series //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}); await saveTable('series', seriesArr, () => {seriesArr = null});
//title //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}); await saveTable('title', titleArr, () => {titleArr = null});
//genre //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}); 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 //lang
await saveTable('lang', langArr, () => {langArr = null}); await saveTable('lang', langArr, () => {langArr = null});
@@ -405,14 +405,12 @@ class DbCreator {
await db.create({table: 'file_hash'}); await db.create({table: 'file_hash'});
//-- завершающие шаги -------------------------------- //-- завершающие шаги --------------------------------
if (config.fullOptimization) { await db.open({
await db.open({ table: 'book',
table: 'book', cacheSize: (config.lowMemoryMode ? 5 : 500),
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) => { await this.optimizeTable('author', db, (p) => {
if (p.progress) if (p.progress)
p.progress = 0.3*p.progress; p.progress = 0.3*p.progress;
@@ -429,12 +427,11 @@ class DbCreator {
callback(p); 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); await this.countStats(db, callback, stats);
//чистка памяти, ибо жрет как не в себя //чистка памяти, ибо жрет как не в себя
if (config.fullOptimization) await db.close({table: 'book'});
await db.close({table: 'book'});
await db.freeMemory(); await db.freeMemory();
utils.freeMemory(); utils.freeMemory();