Работа над opds

server/core/opds/AuthorPage.js

@@ -8,12 +8,66 @@ class AuthorPage extends BasePage {
         this.title = 'Авторы';
     }
 
-    async body() {
+    bookAuthor(author) {
+        if (author) {
+            let a = author.split(',');
+            return a.slice(0, 3).join(', ') + (a.length > 3 ? ' и др.' : '');
+        }
+
+        return '';
+    }
+
+    async body(req) {
         const result = {};
 
-        result.entry = [
-        ];
+        const query = {author: '', depth: 1, del: 0, limit: 100};
+        if (req.query.author) {
+            query.author = req.query.author;
+            query.depth = query.author.length + 1;
+        }
 
+        if (req.query.author == '___others') {
+            query.author = '';
+            query.depth = 1;
+            query.others = true;
+        }
+
+        const entry = [];
+        if (query.author && query.author[0] == '=') {
+            //книги по автору
+            const bookList = await this.webWorker.getAuthorBookList(0, query.author.substring(1));
+
+            if (bookList.books) {
+                const books = JSON.parse(bookList.books);
+
+                for (const book of books) {
+                    const title = book.title || 'Без названия';
+                    entry.push(
+                        this.makeEntry({
+                            id: book._uid,
+                            title,
+                            link: this.navLink({rel: 'subsection', href: `/${this.id}?book=${book._uid}`}),
+                        })
+                    );
+                }
+            }
+        } else {
+            //поиск по каталогу
+            const queryRes = await this.opdsQuery('author', query);
+
+            for (const rec of queryRes) {
+console.log(rec);                
+                entry.push(
+                    this.makeEntry({
+                        id: rec.id,
+                        title: this.bookAuthor(rec.title),//${(query.depth > 1 && rec.count ? ` (${rec.count})` : '')}
+                        link: this.navLink({rel: 'subsection', href: `/${this.id}?author=${rec.q}`}),
+                    })
+                );
+            }
+        }
+
+        result.entry = entry;
         return this.makeBody(result);
     }
 }

server/core/opds/BasePage.js

@@ -1,6 +1,14 @@
+const he = require('he');
+
 const WebWorker = require('../WebWorker');//singleton
 const XmlParser = require('../xml/XmlParser');
 
+const spaceChar = String.fromCodePoint(0x00B7);
+const ruAlphabet = 'абвгдеёжзийклмнопрстуфхцчшщъыьэюя';
+const enAlphabet = 'abcdefghijklmnopqrstuvwxyz';
+const enruArr = (ruAlphabet + enAlphabet).split('');
+const enru = new Set(enruArr);
+
 class BasePage {
     constructor(config) {        
         this.config = config;
@@ -16,6 +24,8 @@ class BasePage {
         if (!entry.title)
             throw new Error('makeEntry: no title');
 
+        entry.title = he.escape(entry.title);
+
         const result = {
             updated: (new Date()).toISOString().substring(0, 19) + 'Z',
         };
@@ -73,6 +83,62 @@ class BasePage {
     async body() {
         throw new Error('Body not implemented');
     }
+
+    // -- stuff -------------------------------------------
+    async search(from, query) {
+        const result = [];
+        const queryRes = await this.webWorker.search(from, query);
+
+        for (const row of queryRes.found) {
+            const rec = {
+                id: row.id,
+                title: '=' + (row[from] || 'Без имени'),
+                q: `=${encodeURIComponent(row[from])}`,
+            };
+
+            result.push(rec);
+        }
+
+        return result;
+    }
+
+    async opdsQuery(from, query) {
+        const result = [];
+
+        const queryRes = await this.webWorker.opdsQuery(from, query);
+        let count = 0;
+        for (const row of queryRes.found)
+            count += row.count;
+
+        if (count <= query.limit)
+            return await this.search(from, query);
+
+        const names = new Set();
+        const others = [];
+        for (const row of queryRes.found) {
+            const name = row.name.toUpperCase();
+
+            if (!names.has(name)) {
+                const rec = {
+                    id: row.id,
+                    title: name.replace(/ /g, spaceChar),
+                    q: encodeURIComponent(row.name.toLowerCase()),
+                    count: row.count,
+                };
+                if (query.depth > 1 || enru.has(row.name[0].toLowerCase())) {
+                    result.push(rec);
+                } else {
+                    others.push(rec);
+                }
+                names.add(name);
+            }
+        }
+
+        if (!query.others && query.depth == 1)
+            result.push({id: 'other', title: 'Все остальные', q: '___others'});
+
+        return (!query.others ? result : others);
+    }
 }
 
 module.exports = BasePage;

server/core/opds/RootPage.js

@@ -13,10 +13,9 @@ class RootPage extends BasePage {
 
     async body() {
         const result = {};
-        const ww = this.webWorker;
 
         if (!this.title) {
-            const dbConfig = await ww.dbConfig();
+            const dbConfig = await this.webWorker.dbConfig();
             const collection = dbConfig.inpxInfo.collection.split('\n');
             this.title = collection[0].trim();
             if (!this.title)