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-12-09 16:49:47 +07:00
parent c17b696d61
commit 48b973d384
1 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
server/core/opds/SearchPage.js
View File

@@ -21,40 +21,50 @@ class SearchPage extends BasePage {
let entry = []; let entry = [];
if (query.type) { if (query.type) {
if (['author', 'series', 'title'].includes(query.type)) { if (['author', 'series', 'title'].includes(query.type)) {
const from = query.type; try {
const page = query.page; const from = query.type;
const page = query.page;
const limit = 100; const limit = 100;
const offset = (page - 1)*limit; const offset = (page - 1)*limit;
const queryRes = await this.webWorker.search(from, {[from]: query.term, del: 0, offset, limit}); const queryRes = await this.webWorker.search(from, {[from]: query.term, del: 0, offset, limit});
const found = queryRes.found; const found = queryRes.found;
for (let i = 0; i < found.length; i++) { for (let i = 0; i < found.length; i++) {
const row = found[i]; const row = found[i];
if (!row.bookCount) if (!row.bookCount)
continue; continue;
entry.push(
this.makeEntry({
id: row.id,
title: `${(from === 'series' ? 'Серия: ': '')}${from === 'author' ? this.bookAuthor(row[from]) : row[from]}`,
link: this.navLink({href: `/${from}?${from}==${encodeURIComponent(row[from])}`}),
content: {
'*ATTRS': {type: 'text'},
'*TEXT': `${row.bookCount} книг${utils.wordEnding(row.bookCount, 8)}`,
},
}),
);
}
if (queryRes.totalFound > offset + found.length) {
entry.push(
this.makeEntry({
id: 'next_page',
title: '[Следующая страница]',
link: this.navLink({href: `/${this.id}?type=${from}&term=${encodeURIComponent(query.term)}&page=${page + 1}`}),
})
);
}
} catch(e) {
entry.push( entry.push(
this.makeEntry({ this.makeEntry({
id: row.id, id: 'error',
title: `${(from === 'series' ? 'Серия: ': '')}${from === 'author' ? this.bookAuthor(row[from]) : row[from]}`, title: `Ошибка: ${e.message}`,
link: this.navLink({href: `/${from}?${from}==${encodeURIComponent(row[from])}`}), link: this.navLink({href: `/fake-error-link`}),
content: { })
'*ATTRS': {type: 'text'},
'*TEXT': `${row.bookCount} книг${utils.wordEnding(row.bookCount, 8)}`,
},
}),
);
}
if (queryRes.totalFound > offset + found.length) {
entry.push(
this.makeEntry({
id: 'next_page',
title: '[Следующая страница]',
link: this.navLink({href: `/${this.id}?type=${from}&term=${encodeURIComponent(query.term)}&page=${page + 1}`}),
}),
); );
} }
} }