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-04 19:36:27 +07:00
parent c2e1d062e8
commit fd66034ba9
6 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/DbSearcher.js
View File

@@ -672,10 +672,11 @@ class DbSearcher {
const s = row.value.substring(0, depth); const s = row.value.substring(0, depth);
let g = group.get(s); let g = group.get(s);
if (!g) { if (!g) {
g = {id: row.id, name: row.name, value: s, count: 0}; g = {id: row.id, name: row.name, value: s, count: 0, bookCount: 0};
group.set(s, g); group.set(s, g);
} }
g.count++; g.count++;
g.bookCount += row.bookCount;
} }
const result = Array.from(group.values()); const result = Array.from(group.values());

27
server/core/opds/AuthorPage.js
View File

@@ -12,17 +12,22 @@ class AuthorPage extends BasePage {
sortBooks(bookList) { sortBooks(bookList) {
//схлопывание серий //схлопывание серий
const books = []; const books = [];
const seriesSet = new Set(); const seriesMap = new Map();
for (const book of bookList) { for (const book of bookList) {
if (book.series) { if (book.series) {
if (!seriesSet.has(book.series)) { let seriesIndex = seriesMap.get(book.series);
if (seriesIndex === undefined) {
seriesIndex = books.length;
books.push({ books.push({
type: 'series', type: 'series',
book book,
bookCount: 0,
}); });
seriesSet.add(book.series); seriesMap.set(book.series, seriesIndex);
} }
books[seriesIndex].bookCount++;
} else { } else {
books.push({ books.push({
type: 'book', type: 'book',
@@ -135,6 +140,10 @@ class AuthorPage extends BasePage {
link: this.navLink({ link: this.navLink({
href: `/${this.id}?author=${encodeURIComponent(query.author)}` + href: `/${this.id}?author=${encodeURIComponent(query.author)}` +
`&series=${encodeURIComponent(b.book.series)}&genre=${encodeURIComponent(query.genre)}`}), `&series=${encodeURIComponent(b.book.series)}&genre=${encodeURIComponent(query.genre)}`}),
content: {
'*ATTRS': {type: 'text'},
'*TEXT': `${b.bookCount} книг${utils.wordEnding(b.bookCount, 8)} по автору${(query.genre ? ' (в выбранном жанре)' : '')}`,
},
}) })
); );
} else { } else {
@@ -170,10 +179,16 @@ class AuthorPage extends BasePage {
link: this.navLink({href: `/${this.id}?author=${rec.q}&genre=${encodeURIComponent(query.genre)}`}), link: this.navLink({href: `/${this.id}?author=${rec.q}&genre=${encodeURIComponent(query.genre)}`}),
}; };
if (rec.count) { let countStr = '';
if (rec.count)
countStr = `${rec.count} автор${utils.wordEnding(rec.count, 0)}${(query.genre ? ' (в выбранном жанре)' : '')}`;
if (!countStr && rec.bookCount && !query.genre)
countStr = `${rec.bookCount} книг${utils.wordEnding(rec.bookCount, 8)}`;
if (countStr) {
e.content = { e.content = {
'*ATTRS': {type: 'text'}, '*ATTRS': {type: 'text'},
'*TEXT': `${rec.count} автор${utils.wordEnding(rec.count, 0)}`, '*TEXT': countStr,
}; };
} }

2
server/core/opds/BasePage.js
View File

@@ -140,6 +140,7 @@ class BasePage {
id: row.id, id: row.id,
title: (row[from] || 'Без автора'), title: (row[from] || 'Без автора'),
q: `=${encodeURIComponent(row[from])}`, q: `=${encodeURIComponent(row[from])}`,
bookCount: row.bookCount,
}; };
result.push(rec); result.push(rec);
@@ -171,6 +172,7 @@ class BasePage {
id: row.id, id: row.id,
title: row.name, title: row.name,
q: `=${encodeURIComponent(row.name)}`, q: `=${encodeURIComponent(row.name)}`,
bookCount: row.bookCount,
}; };
} else { } else {
rec = { rec = {

10
server/core/opds/SeriesPage.js
View File

@@ -103,10 +103,16 @@ class SeriesPage extends BasePage {
link: this.navLink({href: `/${this.id}?series=${rec.q}&genre=${encodeURIComponent(query.genre)}`}), link: this.navLink({href: `/${this.id}?series=${rec.q}&genre=${encodeURIComponent(query.genre)}`}),
}; };
if (rec.count) { let countStr = '';
if (rec.count)
countStr = `${rec.count} сери${utils.wordEnding(rec.count, 1)}${(query.genre ? ' (в выбранном жанре)' : '')}`;
if (!countStr && rec.bookCount && !query.genre)
countStr = `${rec.bookCount} книг${utils.wordEnding(rec.bookCount, 8)}`;
if (countStr) {
e.content = { e.content = {
'*ATTRS': {type: 'text'}, '*ATTRS': {type: 'text'},
'*TEXT': `${rec.count} сери${utils.wordEnding(rec.count, 1)}`, '*TEXT': countStr,
}; };
} }

10
server/core/opds/TitlePage.js
View File

@@ -73,10 +73,16 @@ class TitlePage extends BasePage {
link: this.navLink({href: `/${this.id}?title=${rec.q}&genre=${encodeURIComponent(query.genre)}`}), link: this.navLink({href: `/${this.id}?title=${rec.q}&genre=${encodeURIComponent(query.genre)}`}),
}; };
if (rec.count) { let countStr = '';
if (rec.count)
countStr = `${rec.count} назван${utils.wordEnding(rec.count, 3)}${(query.genre ? ' (в выбранном жанре)' : '')}`;
if (!countStr && rec.bookCount && !query.genre)
countStr = `${rec.bookCount} книг${utils.wordEnding(rec.bookCount, 8)}`;
if (countStr) {
e.content = { e.content = {
'*ATTRS': {type: 'text'}, '*ATTRS': {type: 'text'},
'*TEXT': `${rec.count} назван${utils.wordEnding(rec.count, 3)}`, '*TEXT': countStr,
}; };
} }

1
server/core/utils.js
View File

@@ -184,6 +184,7 @@ function wordEnding(num, type = 0) {
['ок', 'ка', 'ки', 'ки', 'ки', 'ок', 'ок', 'ок', 'ок', 'ок'],//5 ['ок', 'ка', 'ки', 'ки', 'ки', 'ок', 'ок', 'ок', 'ок', 'ок'],//5
['ых', 'ое', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых'],//6 ['ых', 'ое', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых'],//6
['о', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о'],//7 ['о', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о'],//7
['', 'а', 'и', 'и', 'и', '', '', '', '', ''],//8
]; ];
const deci = num % 100; const deci = num % 100;
if (deci > 10 && deci < 20) { if (deci > 10 && deci < 20) {