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

Merge branch 'release/1.2.3'

Browse Source
This commit is contained in:
Book Pauk
2022-11-13 02:04:01 +07:00
parent a0e4651607 dd11e8c5ad
commit ed5dc25d94
12 changed files with 61 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -231,12 +231,12 @@ class Api {
return await this.request({action: 'get-genre-tree'});
}
async getBookLink(bookId) {
return await this.request({action: 'get-book-link', bookId}, 120);
async getBookLink(bookUid) {
return await this.request({action: 'get-book-link', bookUid}, 120);
}
async getBookInfo(bookId) {
return await this.request({action: 'get-book-info', bookId}, 120);
async getBookInfo(bookUid) {
return await this.request({action: 'get-book-info', bookUid}, 120);
}
async getConfig() {

12
client/components/Search/AuthorList/AuthorList.vue
View File

@@ -238,6 +238,13 @@ class AuthorList extends BaseList {
const booksToFilter = await this.loadAuthorBooks(item.key);
const filtered = this.filterBooks(booksToFilter);
if (!filtered.length && this.list.totalFound == 1) {
this.list.queryFound = 0;
this.list.totalFound = 0;
this.searchResult.found = [];
return false;
}
const prepareBook = (book) => {
return Object.assign(
{
@@ -345,7 +352,10 @@ class AuthorList extends BaseList {
if (authors.length > 1 || item.count > this.maxItemCount)
this.getAuthorBooks(item);//no await
else
await this.getAuthorBooks(item);
if (await this.getAuthorBooks(item) === false) {
this.tableData = [];
return;
}
}
result.push(item);

4
client/components/Search/BaseList.js
View File

@@ -130,7 +130,7 @@ export default class BaseList {
try {
//подготовка
const response = await this.api.getBookLink(book.id);
const response = await this.api.getBookLink(book._uid);
const link = response.link;
const href = `${window.location.origin}${link}`;
@@ -164,7 +164,7 @@ export default class BaseList {
}
} else if (action == 'bookInfo') {
//информация о книге
const response = await this.api.getBookInfo(book.id);
const response = await this.api.getBookInfo(book._uid);
this.$emit('listEvent', {action: 'bookInfo', data: response.bookInfo});
}
} catch(e) {

5
client/components/Search/BookInfoDialog/BookInfoDialog.vue
View File

@@ -185,7 +185,10 @@ class BookInfoDialog {
return utils.sqlDateFormat(value);
if (nodePath == 'fileInfo/del')
return (value ? 'Да' : '');
return (value ? 'Да' : null);
if (nodePath == 'fileInfo/insno')
return (value ? value : null);
if (nodePath == 'titleInfo/author')
return value.split(',').join(', ');

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "inpx-web",
"version": "1.2.2",
"version": "1.2.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "inpx-web",
"version": "1.2.2",
"version": "1.2.3",
"hasInstallScript": true,
"license": "CC0-1.0",
"dependencies": {

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "inpx-web",
"version": "1.2.2",
"version": "1.2.3",
"author": "Book Pauk <bookpauk@gmail.com>",
"license": "CC0-1.0",
"repository": "bookpauk/inpx-web",

2
server/config/base.js
View File

@@ -16,7 +16,7 @@ module.exports = {
//поправить в случае, если были критические изменения в DbCreator или InpxParser
//иначе будет рассинхронизация между сервером и клиентом на уровне БД
dbVersion: '6',
dbVersion: '7',
dbCacheSize: 5,
maxPayloadSize: 500,//in MB

12
server/controllers/WebSocketController.js
View File

@@ -165,19 +165,19 @@ class WebSocketController {
}
async getBookLink(req, ws) {
if (!utils.hasProp(req, 'bookId'))
throw new Error(`bookId is empty`);
if (!utils.hasProp(req, 'bookUid'))
throw new Error(`bookUid is empty`);
const result = await this.webWorker.getBookLink(req.bookId);
const result = await this.webWorker.getBookLink(req.bookUid);
this.send(result, req, ws);
}
async getBookInfo(req, ws) {
if (!utils.hasProp(req, 'bookId'))
throw new Error(`bookId is empty`);
if (!utils.hasProp(req, 'bookUid'))
throw new Error(`bookUid is empty`);
const result = await this.webWorker.getBookInfo(req.bookId);
const result = await this.webWorker.getBookInfo(req.bookUid);
this.send(result, req, ws);
}

12
server/core/DbCreator.js
View File

@@ -65,6 +65,8 @@ class DbCreator {
let librateMap = new Map();//оценка
let librateArr = [];
let uidSet = new Set();//уникальные идентификаторы
//stats
let authorCount = 0;
let bookCount = 0;
@@ -221,13 +223,14 @@ class DbCreator {
let filtered = false;
for (const rec of chunk) {
//сначала фильтр
if (!filter(rec)) {
if (!filter(rec) || uidSet.has(rec._uid)) {
rec.id = 0;
filtered = true;
continue;
}
rec.id = ++id;
uidSet.add(rec._uid);
if (!rec.del) {
bookCount++;
@@ -269,6 +272,7 @@ class DbCreator {
delMap = null;
dateMap = null;
librateMap = null;
uidSet = null;
await db.close({table: 'book'});
await db.freeMemory();
@@ -624,6 +628,12 @@ class DbCreator {
stats.filesDelCount = res.filesDelCount;
}
//заодно добавим нужный индекс
await db.create({
in: 'book',
hash: {field: '_uid', type: 'string', depth: 100, unique: true},
});
countDone = true;
}
}

7
server/core/InpxParser.js
View File

@@ -1,4 +1,5 @@
const path = require('path');
const crypto = require('crypto');
const ZipReader = require('./ZipReader');
const collectionInfo = 'collection.info';
@@ -98,9 +99,13 @@ class InpxParser {
if (line[line.length - 1] == '\x0D')
line = line.substring(0, line.length - 1);
const rec = {};
//уникальный идентификатор записи
const sha256 = crypto.createHash('sha256');
rec._uid = sha256.update(line).digest('base64');
//парсим запись
const parts = line.split('\x04');
const rec = {};
const len = (parts.length > structLen ? structLen : parts.length);
for (let i = 0; i < len; i++) {

4
server/core/RemoteLib.js
View File

@@ -58,9 +58,9 @@ class RemoteLib {
}
}
async downloadBook(bookId) {
async downloadBook(bookUid) {
try {
const response = await await this.wsRequest({action: 'get-book-link', bookId});
const response = await await this.wsRequest({action: 'get-book-link', bookUid});
const link = response.link;
const buf = await this.down.load(`${this.remoteHost}${link}`, {decompress: false});

20
server/core/WebWorker.js
View File

@@ -354,7 +354,7 @@ class WebWorker {
}
}
async restoreBook(bookId, bookPath, downFileName) {
async restoreBook(bookUid, bookPath, downFileName) {
const db = this.db;
let extractedFile = '';
@@ -364,7 +364,7 @@ class WebWorker {
extractedFile = await this.extractBook(bookPath);
hash = await utils.getFileHash(extractedFile, 'sha256', 'hex');
} else {
hash = await this.remoteLib.downloadBook(bookId);
hash = await this.remoteLib.downloadBook(bookUid);
}
const link = `${this.config.filesPathStatic}/${hash}`;
@@ -402,7 +402,7 @@ class WebWorker {
return link;
}
async getBookLink(bookId) {
async getBookLink(bookUid) {
this.checkMyState();
try {
@@ -410,11 +410,11 @@ class WebWorker {
let link = '';
//найдем bookPath и downFileName
let rows = await db.select({table: 'book', where: `@@id(${db.esc(bookId)})`});
let rows = await db.select({table: 'book', where: `@@hash('_uid', ${db.esc(bookUid)})`});
if (!rows.length)
throw new Error('404 Файл не найден');
const book = rows[0];
const book = rows[0];
let downFileName = book.file;
const author = book.author.split(',');
const at = [author[0], book.title];
@@ -443,7 +443,7 @@ class WebWorker {
}
if (!link) {
link = await this.restoreBook(bookId, bookPath, downFileName)
link = await this.restoreBook(bookUid, bookPath, downFileName)
}
if (!link)
@@ -458,13 +458,13 @@ class WebWorker {
}
}
async getBookInfo(bookId) {
async getBookInfo(bookUid) {
this.checkMyState();
try {
const db = this.db;
let bookInfo = await this.getBookLink(bookId);
let bookInfo = await this.getBookLink(bookUid);
const hash = path.basename(bookInfo.link);
const bookFile = `${this.config.filesDir}/${hash}`;
const bookFileInfo = `${bookFile}.i.json`;
@@ -472,7 +472,9 @@ class WebWorker {
const restoreBookInfo = async(info) => {
const result = {};
const rows = await db.select({table: 'book', where: `@@id(${db.esc(bookId)})`});
let rows = await db.select({table: 'book', where: `@@hash('_uid', ${db.esc(bookUid)})`});
if (!rows.length)
throw new Error('404 Файл не найден');
const book = rows[0];
result.book = book;