From 0360098b5338a5fdbbba52b5621299514d1a751e Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 6 Nov 2022 14:49:27 +0700
Subject: [PATCH 01/42] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=D0=BA=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=BB=D0=B8=D0=BD=D0=B3=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Search/Search.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/components/Search/Search.vue b/client/components/Search/Search.vue
index 6143a0f..23ae330 100644
--- a/client/components/Search/Search.vue
+++ b/client/components/Search/Search.vue
@@ -786,6 +786,8 @@ class Search {
 
         if (this.ignoreScrolling) {
             this.lastScrollTop = curScrollTop;
+            if (this.$refs.toolPanel.offsetTop > curScrollTop)
+                this.$refs.toolPanel.style.top = `${curScrollTop}px`;
             return;
         }
 

From ba5d7b10b8031044de8e6df52bb28426bbac08b6 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 6 Nov 2022 15:47:42 +0700
Subject: [PATCH 02/42] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BB=D0=BE=D0=B6=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=8D=D0=BB=D0=B5=D0=BC=D0=B5=D0=BD=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9?=
 =?UTF-8?q?=D1=81=D0=B0,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20"=D0=9A?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=BD=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B8=D1=81=D0=BA"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Search/Search.vue | 81 ++++++++++++++++++-----------
 1 file changed, 51 insertions(+), 30 deletions(-)

diff --git a/client/components/Search/Search.vue b/client/components/Search/Search.vue
index 23ae330..bd66a47 100644
--- a/client/components/Search/Search.vue
+++ b/client/components/Search/Search.vue
@@ -3,12 +3,23 @@
         <div ref="scroller" class="col fit column no-wrap" style="overflow: auto; position: relative" @scroll="onScroll">
             <div ref="toolPanel" class="tool-panel q-pb-xs column bg-cyan-2" style="position: sticky; top: 0; z-index: 10;">
                 <div class="header q-mx-md q-mb-xs q-mt-sm row items-center">
-                    <a :href="newSearchLink" style="height: 33px">
+                    <a :href="newSearchLink" style="height: 33px; width: 34px">
                         <img src="./assets/logo.png" />
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
                             Новый поиск
                         </q-tooltip>
                     </a>
+                    
+                    <q-btn-toggle
+                        v-model="selectedList"
+                        class="q-ml-sm"
+                        toggle-color="primary"
+                        :options="listOptions"
+                        push
+                        no-caps
+                        rounded
+                    />
+
                     <div class="row items-center q-ml-sm" style="font-size: 150%;">
                         <div class="q-mr-xs">
                             Коллекция
@@ -17,26 +28,10 @@
                             {{ collection }}
                         </div>
                     </div>
-                    
-                    <q-btn-toggle
-                        v-model="selectedList"
-                        class="q-ml-md"
-                        toggle-color="primary"
-                        :options="listOptions"
-                        push
-                        no-caps
-                        rounded
-                    />
 
-                    <DivBtn class="q-ml-md text-white bg-secondary" :size="30" :icon-size="24" :imt="1" icon="la la-cog" round @click="settingsDialogVisible = true">
-                        <template #tooltip>
-                            <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                                Настройки
-                            </q-tooltip>
-                        </template>
-                    </DivBtn>
+                    <div class="col"></div>
 
-                    <DivBtn class="q-ml-sm text-white bg-secondary" :size="30" :icon-size="24" icon="la la-question" round @click="showSearchHelp">
+                    <DivBtn class="q-ml-md text-white bg-secondary" :size="30" :icon-size="24" icon="la la-question" round @click="showSearchHelp">
                         <template #tooltip>
                             <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
                                 Памятка
@@ -44,12 +39,27 @@
                         </template>
                     </DivBtn>
 
-                    <div class="col"></div>
-                    <div class="q-px-sm q-py-xs bg-green-12 clickable2" style="border: 1px solid #aaaaaa; border-radius: 6px" @click="openReleasePage">
-                        {{ projectName }}
-                    </div>
+                    <DivBtn class="q-ml-sm text-white bg-secondary" :size="30" :icon-size="24" :imt="1" icon="la la-cog" round @click="settingsDialogVisible = true">
+                        <template #tooltip>
+                            <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                Настройки
+                            </q-tooltip>
+                        </template>
+                    </DivBtn>
                 </div>
                 <div class="row q-mx-md q-mb-xs items-center">
+                    <DivBtn
+                        class="text-grey-5 bg-yellow-1 q-mt-xs" :size="34" :icon-size="24" round
+                        :icon="(extendedParams ? 'la la-angle-double-up' : 'la la-angle-double-down')"
+                        @click="extendedParams = !extendedParams"
+                    >
+                        <template #tooltip>
+                            <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                {{ `${(extendedParams ? 'Скрыть' : 'Показать')} дополнительные критерии поиска` }}
+                            </q-tooltip>
+                        </template>
+                    </DivBtn>
+                    <div class="q-mx-xs" />
                     <q-input
                         ref="authorInput" v-model="search.author" :maxlength="5000" :debounce="inputDebounce"
                         class="q-mt-xs" :bg-color="inputBgColor('author')" style="width: 200px;" label="Автор" stack-label outlined dense clearable
@@ -79,7 +89,7 @@
                     <div class="q-mx-xs" />
                     <q-input
                         v-model="search.lang" :maxlength="inputMaxLength" :debounce="inputDebounce"
-                        class="q-mt-xs" :bg-color="inputBgColor()" input-style="cursor: pointer" style="width: 100px;" label="Язык" stack-label outlined dense clearable readonly
+                        class="q-mt-xs" :bg-color="inputBgColor()" input-style="cursor: pointer" style="width: 90px;" label="Язык" stack-label outlined dense clearable readonly
                         @click="selectLang"
                     >
                         <template v-if="search.lang" #append>
@@ -90,21 +100,22 @@
                             {{ search.lang }}
                         </q-tooltip>
                     </q-input>
-
                     <div class="q-mx-xs" />
                     <DivBtn
-                        class="text-grey-5 bg-yellow-1 q-mt-xs" :size="34" :icon-size="24" round
-                        :icon="(extendedParams ? 'la la-angle-double-up' : 'la la-angle-double-down')"
-                        @click="extendedParams = !extendedParams"
+                        class="text-grey-8 bg-yellow-1 q-mt-xs" :size="34" :icon-size="24" round
+                        icon="la la-level-up-alt"
+                        @click="cloneSearch"
                     >
                         <template #tooltip>
                             <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                                {{ `${(extendedParams ? 'Скрыть' : 'Показать')} дополнительные критерии поиска` }}
+                                Клонировать поиск
                             </q-tooltip>
                         </template>
                     </DivBtn>
                 </div>
                 <div v-show="extendedParams" class="row q-mx-md q-mb-xs items-center">
+                    <div style="width: 34px" />
+                    <div class="q-mx-xs" />
                     <q-input
                         v-model="genreNames" :maxlength="inputMaxLength" :debounce="inputDebounce"
                         class="q-mt-xs" :bg-color="inputBgColor()" input-style="cursor: pointer" style="width: 200px;" label="Жанр" stack-label outlined dense clearable readonly
@@ -153,7 +164,7 @@
                     <div class="q-mx-xs" />
                     <q-input
                         v-model="librateNames" :maxlength="inputMaxLength" :debounce="inputDebounce"
-                        class="q-mt-xs" :bg-color="inputBgColor()" input-style="cursor: pointer" style="width: 100px;" label="Оценка" stack-label outlined dense clearable readonly
+                        class="q-mt-xs" :bg-color="inputBgColor()" input-style="cursor: pointer" style="width: 90px;" label="Оценка" stack-label outlined dense clearable readonly
                         @click="selectLibRate"
                     >
                         <template v-if="librateNames" #append>
@@ -191,6 +202,12 @@
             <div class="row q-ml-lg q-mb-sm">
                 <PageScroller v-show="pageCount > 1" v-model="search.page" :page-count="pageCount" />
             </div>
+
+            <div class="row justify-center">
+                <div class="q-mb-sm q-px-sm q-py-xs bg-cyan-2 clickable2" style="border: 1px solid #aaaaaa; border-radius: 6px; white-space: nowrap;" @click="openReleasePage">
+                    {{ projectName }}
+                </div>
+            </div>
         </div>
 
         <Dialog v-model="settingsDialogVisible">
@@ -1018,6 +1035,10 @@ class Search {
             this.selectDateDialogVisible = true
         }
     }
+
+    cloneSearch() {
+        window.open(window.location.href, '_blank');
+    }
 }
 
 export default vueComponent(Search);

From 4cde00b33757df47b1ef995f8a50c3d56d53ac4d Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 6 Nov 2022 16:38:01 +0700
Subject: [PATCH 03/42] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9?=
 =?UTF-8?q?=D1=81=D0=B0,=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=B4=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B5=D0=B9=20=D0=BE=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Search/BookView/BookView.vue   | 46 +++++++------------
 client/components/Search/Search.vue           | 12 +++--
 .../SelectGenreDialog/SelectGenreDialog.vue   |  2 +-
 .../SelectLangDialog/SelectLangDialog.vue     |  2 +-
 .../SelectLibRateDialog.vue                   |  2 +-
 client/store/root.js                          |  1 +
 6 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/client/components/Search/BookView/BookView.vue b/client/components/Search/BookView/BookView.vue
index 7baebb7..463bbef 100644
--- a/client/components/Search/BookView/BookView.vue
+++ b/client/components/Search/BookView/BookView.vue
@@ -33,18 +33,20 @@
         </div>
 
         <div class="q-ml-sm column">
-            <div v-if="(mode == 'series' || mode == 'title') && bookAuthor" class="row items-center clickable2 text-green-10" @click="selectAuthor">
-                {{ bookAuthor }}
+            <div v-if="(mode == 'series' || mode == 'title') && bookAuthor" class="row">
+                <div class="clickable2 text-green-10" @click="emit('authorClick')">
+                    {{ bookAuthor }}
+                </div>
             </div>
 
             <div class="row items-center">
                 <div v-if="book.serno" class="q-mr-xs">
                     {{ book.serno }}.
                 </div>
-                <div class="clickable2" :class="titleColor" @click="selectTitle">
+                <div class="clickable2" :class="titleColor" @click="emit('titleClick')">
                     {{ book.title }}
                 </div>
-                <div v-if="mode == 'title' && bookSeries" class="q-ml-xs clickable2" @click="selectSeries">
+                <div v-if="mode == 'title' && bookSeries" class="q-ml-xs clickable2" @click="emit('seriesClick')">
                     {{ bookSeries }}
                 </div>
 
@@ -53,15 +55,19 @@
                     {{ bookSize }}, {{ book.ext }}
                 </div>
 
-                <div class="q-ml-sm clickable" @click="download">
+                <div v-if="showInfo" class="row items-center q-ml-sm clickable" @click="emit('info')">
+                    [ . . . ]
+                </div>
+
+                <div class="q-ml-sm clickable" @click="emit('download')">
                     (скачать)
                 </div>
 
-                <div class="q-ml-sm clickable" @click="copyLink">
+                <div class="q-ml-sm clickable" @click="emit('copyLink')">
                     <q-icon name="la la-copy" size="20px" />
                 </div>
 
-                <div v-if="showReadLink" class="q-ml-sm clickable" @click="readBook">
+                <div v-if="showReadLink" class="q-ml-sm clickable" @click="emit('readBook')">
                     (читать)
                 </div>
 
@@ -107,6 +113,7 @@ class BookView {
     };
 
     showRates = true;
+    showInfo = true;
     showGenres = true;
     showDeleted = false;
     showDates = false;
@@ -119,6 +126,7 @@ class BookView {
         const settings = this.settings;
 
         this.showRates = settings.showRates;
+        this.showInfo = settings.showInfo;
         this.showGenres = settings.showGenres;
         this.showDates = settings.showDates;
         this.showDeleted = settings.showDeleted;
@@ -183,28 +191,8 @@ class BookView {
         return utils.sqlDateFormat(this.book.date);
     }
 
-    selectAuthor() {
-        this.$emit('bookEvent', {action: 'authorClick', book: this.book});
-    }
-
-    selectSeries() {
-        this.$emit('bookEvent', {action: 'seriesClick', book: this.book});
-    }
-
-    selectTitle() {
-        this.$emit('bookEvent', {action: 'titleClick', book: this.book});
-    }
-
-    download() {
-        this.$emit('bookEvent', {action: 'download', book: this.book});
-    }
-
-    copyLink() {
-        this.$emit('bookEvent', {action: 'copyLink', book: this.book});
-    }
-
-    readBook() {
-        this.$emit('bookEvent', {action: 'readBook', book: this.book});
+    emit(action) {
+        this.$emit('bookEvent', {action, book: this.book});
     }
 }
 
diff --git a/client/components/Search/Search.vue b/client/components/Search/Search.vue
index bd66a47..fe70ec7 100644
--- a/client/components/Search/Search.vue
+++ b/client/components/Search/Search.vue
@@ -9,7 +9,7 @@
                             Новый поиск
                         </q-tooltip>
                     </a>
-                    
+
                     <q-btn-toggle
                         v-model="selectedList"
                         class="q-ml-sm"
@@ -212,8 +212,8 @@
 
         <Dialog v-model="settingsDialogVisible">
             <template #header>
-                <div class="row items-center" style="font-size: 130%">
-                    <q-icon class="q-mr-sm" name="la la-cog" size="28px"></q-icon>
+                <div class="row items-center" style="font-size: 110%">
+                    <q-icon class="q-mr-sm text-green" name="la la-cog" size="28px"></q-icon>
                     Настройки
                 </div>
             </template>
@@ -232,6 +232,7 @@
 
                 <q-checkbox v-model="showCounts" size="36px" label="Показывать количество" />                
                 <q-checkbox v-model="showRates" size="36px" label="Показывать оценки" />
+                <q-checkbox v-model="showInfo" size="36px" label="Показывать кнопку 'инфо'" />
                 <q-checkbox v-model="showGenres" size="36px" label="Показывать жанры" />
                 <q-checkbox v-model="showDates" size="36px" label="Показывать даты поступления" />
                 <q-checkbox v-model="showDeleted" size="36px" label="Показывать удаленные" />
@@ -330,6 +331,9 @@ const componentOptions = {
         showRates(newValue) {
             this.setSetting('showRates', newValue);
         },
+        showInfo(newValue) {
+            this.setSetting('showInfo', newValue);
+        },
         showGenres(newValue) {
             this.setSetting('showGenres', newValue);
         },
@@ -430,6 +434,7 @@ class Search {
     //settings
     showCounts = true;
     showRates = true;
+    showInfo = true;
     showGenres = true;
     showDates = true;
     showDeleted = false;
@@ -521,6 +526,7 @@ class Search {
         this.expandedSeries = _.cloneDeep(settings.expandedSeries);
         this.showCounts = settings.showCounts;
         this.showRates = settings.showRates;
+        this.showInfo = settings.showInfo;
         this.showGenres = settings.showGenres;
         this.showDates = settings.showDates;
         this.showDeleted = settings.showDeleted;
diff --git a/client/components/Search/SelectGenreDialog/SelectGenreDialog.vue b/client/components/Search/SelectGenreDialog/SelectGenreDialog.vue
index 66037d1..8c558c5 100644
--- a/client/components/Search/SelectGenreDialog/SelectGenreDialog.vue
+++ b/client/components/Search/SelectGenreDialog/SelectGenreDialog.vue
@@ -2,7 +2,7 @@
     <Dialog ref="dialog" v-model="dialogVisible">
         <template #header>
             <div class="row items-center">
-                <div style="font-size: 130%">
+                <div style="font-size: 110%">
                     Выбрать жанры
                 </div>
             </div>
diff --git a/client/components/Search/SelectLangDialog/SelectLangDialog.vue b/client/components/Search/SelectLangDialog/SelectLangDialog.vue
index 41fa09a..d995a27 100644
--- a/client/components/Search/SelectLangDialog/SelectLangDialog.vue
+++ b/client/components/Search/SelectLangDialog/SelectLangDialog.vue
@@ -2,7 +2,7 @@
     <Dialog ref="dialog" v-model="dialogVisible">
         <template #header>
             <div class="row items-center">
-                <div style="font-size: 130%">
+                <div style="font-size: 110%">
                     Выбрать языки
                 </div>
             </div>
diff --git a/client/components/Search/SelectLibRateDialog/SelectLibRateDialog.vue b/client/components/Search/SelectLibRateDialog/SelectLibRateDialog.vue
index ca9bed0..88c8cb4 100644
--- a/client/components/Search/SelectLibRateDialog/SelectLibRateDialog.vue
+++ b/client/components/Search/SelectLibRateDialog/SelectLibRateDialog.vue
@@ -2,7 +2,7 @@
     <Dialog ref="dialog" v-model="dialogVisible">
         <template #header>
             <div class="row items-center">
-                <div style="font-size: 130%">
+                <div style="font-size: 110%">
                     Выбрать оценки
                 </div>
             </div>
diff --git a/client/store/root.js b/client/store/root.js
index eb89ec2..6187bbe 100644
--- a/client/store/root.js
+++ b/client/store/root.js
@@ -9,6 +9,7 @@ const state = {
         expandedSeries: [],
         showCounts: true,
         showRates: true,
+        showInfo: true,
         showGenres: true,
         showDates: false,
         showDeleted: false,

From 351abe9401ee6a21c7e69f953a758afba1a28edb Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 6 Nov 2022 16:39:39 +0700
Subject: [PATCH 04/42] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=D0=B0=20?=
 =?UTF-8?q?=D1=88=D1=80=D0=B8=D1=84=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Search/SelectDateDialog/SelectDateDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/Search/SelectDateDialog/SelectDateDialog.vue b/client/components/Search/SelectDateDialog/SelectDateDialog.vue
index c480cc5..01bdb7e 100644
--- a/client/components/Search/SelectDateDialog/SelectDateDialog.vue
+++ b/client/components/Search/SelectDateDialog/SelectDateDialog.vue
@@ -2,7 +2,7 @@
     <Dialog ref="dialog" v-model="dialogVisible">
         <template #header>
             <div class="row items-center">
-                <div style="font-size: 130%">
+                <div style="font-size: 110%">
                     Выбрать даты
                 </div>
             </div>

From d9f1912ea2a10060b7d2b6669769afd3a708c3d5 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 6 Nov 2022 17:15:45 +0700
Subject: [PATCH 05/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20BookInfoDialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Api/Api.vue                 |  4 ++
 client/components/Search/BaseList.js          |  5 ++
 .../Search/BookInfoDialog/BookInfoDialog.vue  | 66 +++++++++++++++++++
 .../components/Search/BookView/BookView.vue   |  2 +-
 client/components/Search/Search.vue           | 10 +++
 server/controllers/WebSocketController.js     | 13 ++++
 server/core/WebWorker.js                      | 20 ++++++
 7 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 client/components/Search/BookInfoDialog/BookInfoDialog.vue

diff --git a/client/components/Api/Api.vue b/client/components/Api/Api.vue
index b37c478..3ad07a8 100644
--- a/client/components/Api/Api.vue
+++ b/client/components/Api/Api.vue
@@ -235,6 +235,10 @@ class Api {
         return await this.request(Object.assign({action: 'get-book-link'}, params), 120);
     }
 
+    async getBookInfo(params) {
+        return await this.request(Object.assign({action: 'get-book-info'}, params), 120);
+    }
+
     async getConfig() {
         return await this.request({action: 'get-config'});
     }
diff --git a/client/components/Search/BaseList.js b/client/components/Search/BaseList.js
index 0a5d23e..0118659 100644
--- a/client/components/Search/BaseList.js
+++ b/client/components/Search/BaseList.js
@@ -185,6 +185,10 @@ export default class BaseList {
                     const url = this.config.bookReadLink.replace('${DOWNLOAD_LINK}', href);
                     window.open(url, '_blank');
                 }
+            } else if (action == 'bookInfo') {
+                //информация о книге
+                const response = await this.api.getBookInfo({bookPath, downFileName});
+                this.$emit('listEvent', {action: 'bookInfo', data: response.bookInfo});
             }
         } catch(e) {
             this.$root.stdDialog.alert(e.message, 'Ошибка');
@@ -208,6 +212,7 @@ export default class BaseList {
             case 'download':
             case 'copyLink':
             case 'readBook':
+            case 'bookInfo':
                 this.download(event.book, event.action);//no await
                 break;
         }
diff --git a/client/components/Search/BookInfoDialog/BookInfoDialog.vue b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
new file mode 100644
index 0000000..2c3ce57
--- /dev/null
+++ b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
@@ -0,0 +1,66 @@
+<template>
+    <Dialog ref="dialog" v-model="dialogVisible">
+        <template #header>
+            <div class="row items-center">
+                <div style="font-size: 110%">
+                    Информация о книге
+                </div>
+            </div>
+        </template>
+
+        <div ref="box" class="column q-mt-xs overflow-auto no-wrap" style="width: 200px; padding: 0px 10px 10px 10px;">
+        </div>
+
+        <template #footer>
+            <q-btn class="q-px-md q-ml-sm" color="primary" dense no-caps @click="okClick">
+                OK
+            </q-btn>
+        </template>
+    </Dialog>
+</template>
+
+<script>
+//-----------------------------------------------------------------------------
+import vueComponent from '../../vueComponent.js';
+
+import Dialog from '../../share/Dialog.vue';
+
+const componentOptions = {
+    components: {
+        Dialog
+    },
+    watch: {
+        modelValue(newValue) {
+            this.dialogVisible = newValue;
+        },
+        dialogVisible(newValue) {
+            this.$emit('update:modelValue', newValue);
+        },
+    }
+};
+class BookInfoDialog {
+    _options = componentOptions;
+    _props = {
+        modelValue: Boolean,
+    };
+
+    dialogVisible = false;
+
+    created() {
+        this.commit = this.$store.commit;
+    }
+
+    mounted() {
+    }
+
+    okClick() {
+        this.dialogVisible = false;
+    }
+}
+
+export default vueComponent(BookInfoDialog);
+//-----------------------------------------------------------------------------
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/client/components/Search/BookView/BookView.vue b/client/components/Search/BookView/BookView.vue
index 463bbef..688d656 100644
--- a/client/components/Search/BookView/BookView.vue
+++ b/client/components/Search/BookView/BookView.vue
@@ -55,7 +55,7 @@
                     {{ bookSize }}, {{ book.ext }}
                 </div>
 
-                <div v-if="showInfo" class="row items-center q-ml-sm clickable" @click="emit('info')">
+                <div v-if="showInfo" class="row items-center q-ml-sm clickable" @click="emit('bookInfo')">
                     [ . . . ]
                 </div>
 
diff --git a/client/components/Search/Search.vue b/client/components/Search/Search.vue
index fe70ec7..bed5d14 100644
--- a/client/components/Search/Search.vue
+++ b/client/components/Search/Search.vue
@@ -250,6 +250,7 @@
         <SelectLangDialog v-model="selectLangDialogVisible" v-model:lang="search.lang" :lang-list="langList" :lang-default="langDefault" />        
         <SelectLibRateDialog v-model="selectLibRateDialogVisible" v-model:librate="search.librate" />
         <SelectDateDialog v-model="selectDateDialogVisible" v-model:date="search.date" />
+        <BookInfoDialog v-model="bookInfoDialogVisible" book-info="bookInfo" />
     </div>
 </template>
 
@@ -266,6 +267,7 @@ import SelectGenreDialog from './SelectGenreDialog/SelectGenreDialog.vue';
 import SelectLangDialog from './SelectLangDialog/SelectLangDialog.vue';
 import SelectLibRateDialog from './SelectLibRateDialog/SelectLibRateDialog.vue';
 import SelectDateDialog from './SelectDateDialog/SelectDateDialog.vue';
+import BookInfoDialog from './BookInfoDialog/BookInfoDialog.vue';
 
 import authorBooksStorage from './authorBooksStorage';
 import DivBtn from '../share/DivBtn.vue';
@@ -292,6 +294,7 @@ const componentOptions = {
         SelectLangDialog,
         SelectLibRateDialog,
         SelectDateDialog,
+        BookInfoDialog,
         Dialog,
         DivBtn
     },
@@ -404,6 +407,7 @@ class Search {
     selectLangDialogVisible = false;
     selectLibRateDialogVisible = false;
     selectDateDialogVisible = false;
+    bookInfoDialogVisible = false;
 
     pageCount = 1;    
 
@@ -458,6 +462,8 @@ class Search {
     genreTreeInpxHash = '';
     showTooltips = true;
 
+    bookInfo = {};
+
     limitOptions = [
         {label: '10', value: 10},
         {label: '20', value: 20},
@@ -879,6 +885,10 @@ class Search {
             case 'submitUrl':
                 this.sendMessage({type: 'submitUrl', data: event.data});
                 break;
+            case 'bookInfo':
+                this.bookInfo = event.data;
+                this.bookInfoDialogVisible = true;
+                break;
         }
     }
 
diff --git a/server/controllers/WebSocketController.js b/server/controllers/WebSocketController.js
index 0dac9f6..07ce0ee 100644
--- a/server/controllers/WebSocketController.js
+++ b/server/controllers/WebSocketController.js
@@ -84,6 +84,8 @@ class WebSocketController {
                     await this.getGenreTree(req, ws); break;
                 case 'get-book-link':
                     await this.getBookLink(req, ws); break;
+                case 'get-book-info':
+                    await this.getBookInfo(req, ws); break;
 
                 case 'get-inpx-file':
                     await this.getInpxFile(req, ws); break;
@@ -173,6 +175,17 @@ class WebSocketController {
         this.send(result, req, ws);
     }
 
+    async getBookInfo(req, ws) {
+        if (!utils.hasProp(req, 'bookPath'))
+            throw new Error(`bookPath is empty`);
+        if (!utils.hasProp(req, 'downFileName'))
+            throw new Error(`downFileName is empty`);    
+
+        const result = await this.webWorker.getBookInfo({bookPath: req.bookPath, downFileName: req.downFileName});
+
+        this.send(result, req, ws);
+    }
+
     async getInpxFile(req, ws) {
         if (!this.config.allowRemoteLib)
             throw new Error('Remote lib access disabled');
diff --git a/server/core/WebWorker.js b/server/core/WebWorker.js
index 05ee501..b2079e5 100644
--- a/server/core/WebWorker.js
+++ b/server/core/WebWorker.js
@@ -437,6 +437,26 @@ class WebWorker {
         }
     }
 
+    async getBookInfo(params) {
+        this.checkMyState();
+
+        try {
+            //const db = this.db;
+            let link = await this.getBookLink(params);
+            const hash = path.basename(link.link);
+
+            /*const bookFile = `${this.config.filesDir}/${hash}`;
+            const bookInfo = await fb2parser*/
+
+            return {hash};
+        } catch(e) {
+            log(LM_ERR, `getBookInfo error: ${e.message}`);
+            if (e.message.indexOf('ENOENT') >= 0)
+                throw new Error('404 Файл не найден');
+            throw e;
+        }
+    }
+
     /*
     async restoreBookFile(publicPath) {
         this.checkMyState();

From 55239159bac6540bd234f4cf6dc0f66e8e4a9b3f Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 6 Nov 2022 18:03:03 +0700
Subject: [PATCH 06/42] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=20=D0=BD=D0=B0=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D1=81=20=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=D0=BC=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=BF=D1=80=D0=B8=20=D1=81=D0=BA=D0=B0=D1=87=D0=B8?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Api/Api.vue             |  8 +--
 client/components/Search/BaseList.js      | 29 +-------
 client/share/utils.js                     | 12 ----
 server/controllers/WebSocketController.js | 16 ++---
 server/core/WebWorker.js                  | 87 +++++++++--------------
 server/core/utils.js                      | 23 ++++++
 6 files changed, 69 insertions(+), 106 deletions(-)

diff --git a/client/components/Api/Api.vue b/client/components/Api/Api.vue
index 3ad07a8..a4703c0 100644
--- a/client/components/Api/Api.vue
+++ b/client/components/Api/Api.vue
@@ -231,12 +231,12 @@ class Api {
         return await this.request({action: 'get-genre-tree'});
     }    
 
-    async getBookLink(params) {
-        return await this.request(Object.assign({action: 'get-book-link'}, params), 120);
+    async getBookLink(bookId) {
+        return await this.request({action: 'get-book-link', bookId}, 120);
     }
 
-    async getBookInfo(params) {
-        return await this.request(Object.assign({action: 'get-book-info'}, params), 120);
+    async getBookInfo(bookId) {
+        return await this.request({action: 'get-book-info', bookId}, 120);
     }
 
     async getConfig() {
diff --git a/client/components/Search/BaseList.js b/client/components/Search/BaseList.js
index 0118659..a9fc857 100644
--- a/client/components/Search/BaseList.js
+++ b/client/components/Search/BaseList.js
@@ -129,31 +129,8 @@ export default class BaseList {
         })();
 
         try {
-            const makeValidFilenameOrEmpty = (s) => {
-                try {
-                    return utils.makeValidFilename(s);
-                } catch(e) {
-                    return '';
-                }
-            };
-
-            //имя файла
-            let downFileName = 'default-name';
-            const author = book.author.split(',');
-            const at = [author[0], book.title];
-            downFileName = makeValidFilenameOrEmpty(at.filter(r => r).join(' - '))
-                || makeValidFilenameOrEmpty(at[0])
-                || makeValidFilenameOrEmpty(at[1])
-                || downFileName;
-            downFileName = downFileName.substring(0, 100);
-
-            const ext = `.${book.ext}`;
-            if (downFileName.substring(downFileName.length - ext.length) != ext)
-                downFileName += ext;
-
-            const bookPath = `${book.folder}/${book.file}${ext}`;
             //подготовка
-            const response = await this.api.getBookLink({bookPath, downFileName});
+            const response = await this.api.getBookLink(book.id);
             
             const link = response.link;
             const href = `${window.location.origin}${link}`;
@@ -162,7 +139,7 @@ export default class BaseList {
                 //скачивание
                 const d = this.$refs.download;
                 d.href = href;
-                d.download = downFileName;
+                d.download = response.downFileName;
 
                 d.click();
             } else if (action == 'copyLink') {
@@ -187,7 +164,7 @@ export default class BaseList {
                 }
             } else if (action == 'bookInfo') {
                 //информация о книге
-                const response = await this.api.getBookInfo({bookPath, downFileName});
+                const response = await this.api.getBookInfo(book.id);
                 this.$emit('listEvent', {action: 'bookInfo', data: response.bookInfo});
             }
         } catch(e) {
diff --git a/client/share/utils.js b/client/share/utils.js
index f48aeb1..573cb6f 100644
--- a/client/share/utils.js
+++ b/client/share/utils.js
@@ -87,18 +87,6 @@ export async function copyTextToClipboard(text) {
     return result;
 }
 
-export function makeValidFilename(filename, repl = '_') {
-    let f = filename.replace(/[\x00\\/:*"<>|]/g, repl); // eslint-disable-line no-control-regex
-    f = f.trim();
-    while (f.length && (f[f.length - 1] == '.' || f[f.length - 1] == '_')) {
-        f = f.substring(0, f.length - 1);
-    }
-
-    if (f)
-        return f;
-    else
-        throw new Error('Invalid filename');
-}
 /*
 export function formatDate(d, format = 'normal') {
     switch (format) {
diff --git a/server/controllers/WebSocketController.js b/server/controllers/WebSocketController.js
index 07ce0ee..8f9ed44 100644
--- a/server/controllers/WebSocketController.js
+++ b/server/controllers/WebSocketController.js
@@ -165,23 +165,19 @@ class WebSocketController {
     }
 
     async getBookLink(req, ws) {
-        if (!utils.hasProp(req, 'bookPath'))
-            throw new Error(`bookPath is empty`);
-        if (!utils.hasProp(req, 'downFileName'))
-            throw new Error(`downFileName is empty`);    
+        if (!utils.hasProp(req, 'bookId'))
+            throw new Error(`bookId is empty`);
 
-        const result = await this.webWorker.getBookLink({bookPath: req.bookPath, downFileName: req.downFileName});
+        const result = await this.webWorker.getBookLink(req.bookId);
 
         this.send(result, req, ws);
     }
 
     async getBookInfo(req, ws) {
-        if (!utils.hasProp(req, 'bookPath'))
-            throw new Error(`bookPath is empty`);
-        if (!utils.hasProp(req, 'downFileName'))
-            throw new Error(`downFileName is empty`);    
+        if (!utils.hasProp(req, 'bookId'))
+            throw new Error(`bookId is empty`);
 
-        const result = await this.webWorker.getBookInfo({bookPath: req.bookPath, downFileName: req.downFileName});
+        const result = await this.webWorker.getBookInfo(req.bookId);
 
         this.send(result, req, ws);
     }
diff --git a/server/core/WebWorker.js b/server/core/WebWorker.js
index b2079e5..28459e2 100644
--- a/server/core/WebWorker.js
+++ b/server/core/WebWorker.js
@@ -400,17 +400,36 @@ class WebWorker {
         return link;
     }
 
-    async getBookLink(params) {
+    async getBookLink(bookId) {
         this.checkMyState();
 
-        const {bookPath, downFileName} = params;
-
         try {
             const db = this.db;
             let link = '';
 
+            //найдем bookPath и downFileName
+            let rows = await db.select({table: 'book', where: `@@id(${db.esc(bookId)})`});
+            if (!rows.length)
+                throw new Error('404 Файл не найден');
+
+            const book = rows[0];            
+            let downFileName = book.file;
+            const author = book.author.split(',');
+            const at = [author[0], book.title];
+            downFileName = utils.makeValidFileNameOrEmpty(at.filter(r => r).join(' - '))
+                || utils.makeValidFileNameOrEmpty(at[0])
+                || utils.makeValidFileNameOrEmpty(at[1])
+                || downFileName;
+            downFileName = downFileName.substring(0, 100);
+
+            const ext = `.${book.ext}`;
+            if (downFileName.substring(downFileName.length - ext.length) != ext)
+                downFileName += ext;
+
+            const bookPath = `${book.folder}/${book.file}${ext}`;
+
             //найдем хеш
-            const rows = await db.select({table: 'file_hash', where: `@@id(${db.esc(bookPath)})`});
+            rows = await db.select({table: 'file_hash', where: `@@id(${db.esc(bookPath)})`});
             if (rows.length) {//хеш найден по bookPath
                 const hash = rows[0].hash;
                 const bookFile = `${this.config.filesDir}/${hash}`;
@@ -428,7 +447,7 @@ class WebWorker {
             if (!link)
                 throw new Error('404 Файл не найден');
 
-            return {link};
+            return {link, bookPath, downFileName};
         } catch(e) {
             log(LM_ERR, `getBookLink error: ${e.message}`);
             if (e.message.indexOf('ENOENT') >= 0)
@@ -437,18 +456,20 @@ class WebWorker {
         }
     }
 
-    async getBookInfo(params) {
+    async getBookInfo(bookId) {
         this.checkMyState();
 
         try {
-            //const db = this.db;
-            let link = await this.getBookLink(params);
-            const hash = path.basename(link.link);
+            const db = this.db;
 
-            /*const bookFile = `${this.config.filesDir}/${hash}`;
-            const bookInfo = await fb2parser*/
+            const bookInfo = await this.getBookLink(bookId);
 
-            return {hash};
+            const rows = await db.select({table: 'book', where: `@@id(${db.esc(bookId)})`});
+            bookInfo.book = rows[0];
+            bookInfo.fb2 = {};
+            bookInfo.cover = '';
+
+            return {bookInfo};
         } catch(e) {
             log(LM_ERR, `getBookInfo error: ${e.message}`);
             if (e.message.indexOf('ENOENT') >= 0)
@@ -457,48 +478,6 @@ class WebWorker {
         }
     }
 
-    /*
-    async restoreBookFile(publicPath) {
-        this.checkMyState();
-
-        try {
-            const db = this.db;
-            const hash = path.basename(publicPath);
-
-            //найдем bookPath и downFileName
-            const rows = await db.select({table: 'file_hash', where: `@@id(${db.esc(hash)})`});        
-            if (rows.length) {//нашли по хешу
-                const rec = rows[0];
-                await this.restoreBook(rec.bookPath, rec.downFileName);
-
-                return rec.downFileName;
-            } else {//bookPath не найден
-                throw new Error('404 Файл не найден');
-            }
-        } catch(e) {
-            log(LM_ERR, `restoreBookFile error: ${e.message}`);
-            if (e.message.indexOf('ENOENT') >= 0)
-                throw new Error('404 Файл не найден');
-            throw e;
-        }
-    }
-
-    async getDownFileName(publicPath) {
-        this.checkMyState();
-
-        const db = this.db;
-        const hash = path.basename(publicPath);
-
-        //найдем downFileName
-        const rows = await db.select({table: 'file_hash', where: `@@id(${db.esc(hash)})`});        
-        if (rows.length) {//downFileName найден по хешу
-            return rows[0].downFileName;
-        } else {//bookPath не найден
-            throw new Error('404 Файл не найден');
-        }
-    }
-    */
-
     async getInpxFile(params) {
         let data = null;
         if (params.inpxFileHash && this.inpxFileHash && params.inpxFileHash === this.inpxFileHash) {
diff --git a/server/core/utils.js b/server/core/utils.js
index 747b524..2b81ab6 100644
--- a/server/core/utils.js
+++ b/server/core/utils.js
@@ -119,6 +119,27 @@ function toUnixPath(dir) {
     return dir.replace(/\\/g, '/');
 }
 
+function makeValidFileName(fileName, repl = '_') {
+    let f = fileName.replace(/[\x00\\/:*"<>|]/g, repl); // eslint-disable-line no-control-regex
+    f = f.trim();
+    while (f.length && (f[f.length - 1] == '.' || f[f.length - 1] == '_')) {
+        f = f.substring(0, f.length - 1);
+    }
+
+    if (f)
+        return f;
+    else
+        throw new Error('Invalid filename');
+}
+
+function makeValidFileNameOrEmpty(fileName) {
+    try {
+        return makeValidFileName(fileName);
+    } catch(e) {
+        return '';
+    }
+}
+
 module.exports = {
     sleep,
     processLoop,
@@ -133,4 +154,6 @@ module.exports = {
     randomHexString,
     gzipFile,
     toUnixPath,
+    makeValidFileName,
+    makeValidFileNameOrEmpty,
 };
\ No newline at end of file

From 2ae7f21bc839ed1f6fe9730269c4d0f55d21c99b Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 7 Nov 2022 16:24:07 +0700
Subject: [PATCH 07/42] =?UTF-8?q?=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BA=D0=B5=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json | 66 +++++++++++++++++++++++++++++++++++++++++------
 package.json      |  2 ++
 2 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 52bb9f2..8fd934d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,8 +12,10 @@
       "dependencies": {
         "@quasar/extras": "^1.15.0",
         "axios": "^0.27.2",
+        "chardet": "^1.5.0",
         "express": "^4.18.1",
         "fs-extra": "^10.1.0",
+        "iconv-lite": "^0.6.3",
         "jembadb": "^5.0.2",
         "localforage": "^1.10.0",
         "lodash": "^4.17.21",
@@ -2645,6 +2647,17 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/body-parser/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/body-parser/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -2809,6 +2822,11 @@
         "node": ">=4"
       }
     },
+    "node_modules/chardet": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-1.5.0.tgz",
+      "integrity": "sha512-Nj3VehbbFs/1ZnJJJaL3ztEf3Nu5Fs6YV/NBs6lyz/iDDHUU+X9QNk5QgPy1/5Rjtb/cGVf+NyazP7kVEJqKRg=="
+    },
     "node_modules/chownr": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
@@ -4781,11 +4799,11 @@
       }
     },
     "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -7011,6 +7029,17 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/raw-body/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/rc": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -10718,6 +10747,14 @@
             "ms": "2.0.0"
           }
         },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -10832,6 +10869,11 @@
         "supports-color": "^5.3.0"
       }
     },
+    "chardet": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-1.5.0.tgz",
+      "integrity": "sha512-Nj3VehbbFs/1ZnJJJaL3ztEf3Nu5Fs6YV/NBs6lyz/iDDHUU+X9QNk5QgPy1/5Rjtb/cGVf+NyazP7kVEJqKRg=="
+    },
     "chownr": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
@@ -12311,11 +12353,11 @@
       }
     },
     "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
       }
     },
     "icss-utils": {
@@ -13869,6 +13911,14 @@
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
           "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
         }
       }
     },
diff --git a/package.json b/package.json
index 263460f..43da394 100644
--- a/package.json
+++ b/package.json
@@ -51,8 +51,10 @@
   "dependencies": {
     "@quasar/extras": "^1.15.0",
     "axios": "^0.27.2",
+    "chardet": "^1.5.0",
     "express": "^4.18.1",
     "fs-extra": "^10.1.0",
+    "iconv-lite": "^0.6.3",
     "jembadb": "^5.0.2",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",

From 02f276ca6b81b4fe2d3b2d305fb7c9fed3c08d96 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 7 Nov 2022 16:24:52 +0700
Subject: [PATCH 08/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20=D0=BA=D0=B0=D1=80=D1=82=D0=BE=D1=87=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B9=20"=D0=98=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=BE=20=D0=BA=D0=BD=D0=B8=D0=B3=D0=B5"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/WebWorker.js | 31 ++++++++++++++++++++++++++-----
 server/core/utils.js     | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/server/core/WebWorker.js b/server/core/WebWorker.js
index 28459e2..0cb502f 100644
--- a/server/core/WebWorker.js
+++ b/server/core/WebWorker.js
@@ -15,6 +15,7 @@ const ayncExit = new (require('./AsyncExit'))();
 const log = new (require('./AppLogger'))().log;//singleton
 const utils = require('./utils');
 const genreTree = require('./genres');
+const Fb2Parser = require('./xml/Fb2Parser');
 
 //server states
 const ssNormal = 'normal';
@@ -44,6 +45,7 @@ class WebWorker {
             }
             
             this.inpxHashCreator = new InpxHashCreator(config);
+            this.fb2Parser = new Fb2Parser();
             this.inpxFileHash = '';
 
             this.wState = this.workerState.getControl('server_state');
@@ -462,12 +464,31 @@ class WebWorker {
         try {
             const db = this.db;
 
-            const bookInfo = await this.getBookLink(bookId);
+            let bookInfo = await this.getBookLink(bookId);
+            const hash = path.basename(bookInfo.link);
+            const bookFile = `${this.config.filesDir}/${hash}`;
+            const bookFileInfo = `${bookFile}.info`;
 
-            const rows = await db.select({table: 'book', where: `@@id(${db.esc(bookId)})`});
-            bookInfo.book = rows[0];
-            bookInfo.fb2 = {};
-            bookInfo.cover = '';
+            if (!await fs.pathExists(bookFileInfo)) {
+                const rows = await db.select({table: 'book', where: `@@id(${db.esc(bookId)})`});
+                const book = rows[0];
+
+                let fb2 = false;
+                if (book.ext == 'fb2') {
+                    const parsedFb2 = await this.fb2Parser.getDescAndCover(bookFile);
+                    fb2 = parsedFb2;
+                }
+
+                bookInfo.book = book;
+                bookInfo.fb2 = fb2;
+                bookInfo.cover = '';
+
+                await fs.writeFile(bookFileInfo, JSON.stringify(bookInfo, null, 2));
+            } else {
+                await utils.touchFile(bookFileInfo);
+                const info = fs.readFile(bookFileInfo, 'utf-8');
+                bookInfo = JSON.parse(info);
+            }
 
             return {bookInfo};
         } catch(e) {
diff --git a/server/core/utils.js b/server/core/utils.js
index 2b81ab6..856d334 100644
--- a/server/core/utils.js
+++ b/server/core/utils.js
@@ -115,6 +115,40 @@ function gzipFile(inputFile, outputFile, level = 1) {
     });
 }
 
+function gunzipFile(inputFile, outputFile) {
+    return new Promise((resolve, reject) => {
+        const gzip = zlib.createGunzip();
+        const input = fs.createReadStream(inputFile);
+        const output = fs.createWriteStream(outputFile);
+
+        input.on('error', reject)
+            .pipe(gzip).on('error', reject)
+            .pipe(output).on('error', reject)
+            .on('finish', (err) => {
+            if (err) reject(err);
+            else resolve();
+        });
+    });
+}
+
+function gzipBuffer(buf) {
+    return new Promise((resolve, reject) => {
+        zlib.gzip(buf, {level: 1}, (err, result) => {
+            if (err) reject(err);
+            resolve(result);
+        });
+    });
+}
+
+function gunzipBuffer(buf) {
+    return new Promise((resolve, reject) => {
+        zlib.gunzip(buf, (err, result) => {
+            if (err) reject(err);
+            resolve(result);
+        });
+    });
+}
+
 function toUnixPath(dir) {
     return dir.replace(/\\/g, '/');
 }
@@ -153,6 +187,9 @@ module.exports = {
     intersectSet,
     randomHexString,
     gzipFile,
+    gunzipFile,
+    gzipBuffer,
+    gunzipBuffer,
     toUnixPath,
     makeValidFileName,
     makeValidFileNameOrEmpty,

From a40d9e25b04b70263bc8ed5283d7ab4ccf2868c0 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 7 Nov 2022 19:52:29 +0700
Subject: [PATCH 09/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20XmlParser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/Fb2Parser.js |  67 +++++++
 server/core/xml/XmlParser.js | 342 ++++++++++++++++++++++++++++++++
 server/core/xml/sax.js       | 366 +++++++++++++++++++++++++++++++++++
 server/core/xml/textUtils.js | 130 +++++++++++++
 4 files changed, 905 insertions(+)
 create mode 100644 server/core/xml/Fb2Parser.js
 create mode 100644 server/core/xml/XmlParser.js
 create mode 100644 server/core/xml/sax.js
 create mode 100644 server/core/xml/textUtils.js

diff --git a/server/core/xml/Fb2Parser.js b/server/core/xml/Fb2Parser.js
new file mode 100644
index 0000000..05383e9
--- /dev/null
+++ b/server/core/xml/Fb2Parser.js
@@ -0,0 +1,67 @@
+const fs = require('fs-extra');
+const iconv = require('iconv-lite');
+const textUtils = require('./textUtils');
+
+const xmlParser = require('./xmlParser');
+const utils = require('../utils');
+
+class Fb2Parser {
+    checkEncoding(data) {
+        //Корректируем кодировку UTF-16
+        let encoding = textUtils.getEncoding(data);
+        if (encoding.indexOf('UTF-16') == 0) {
+            data = Buffer.from(iconv.decode(data, encoding));
+            encoding = 'utf-8';
+        }
+
+        //Корректируем пробелы, всякие файлы попадаются :(
+        if (data[0] == 32) {
+            data = Buffer.from(data.toString().trim());
+        }
+
+        //Окончательно корректируем кодировку
+        let result = data;
+
+        let left = data.indexOf('<?xml version="1.0"');
+        if (left < 0) {
+            left = data.indexOf('<?xml version=\'1.0\'');
+        }
+
+        if (left >= 0) {
+            const right = data.indexOf('?>', left);
+            if (right >= 0) {
+                const head = data.slice(left, right + 2).toString();
+                const m = head.match(/encoding=['"](.*?)['"]/);
+                if (m) {
+                    let enc = m[1].toLowerCase();
+                    if (enc != 'utf-8') {
+                        //enc может не соответсвовать реальной кодировке файла, поэтому:
+                        if (encoding.indexOf('ISO-8859') >= 0) {
+                            encoding = enc;
+                        }
+
+                        result = iconv.decode(data, encoding);
+                        result = Buffer.from(result.toString().replace(m[0], `encoding="utf-8"`));
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
+    async getDescAndCover(bookFile) {
+        let data = await fs.readFile(bookFile);
+        data = await utils.gunzipBuffer(data);
+        //data = this.checkEncoding(data);
+
+        const result = xmlParser.parseXml(data.toString(), true, (route) => {
+            console.log(route);
+            return true;
+        });
+
+        return xmlParser.simplifyXmlParsed(result);
+    }
+}
+
+module.exports = Fb2Parser;
\ No newline at end of file
diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
new file mode 100644
index 0000000..e1c3a0d
--- /dev/null
+++ b/server/core/xml/XmlParser.js
@@ -0,0 +1,342 @@
+//node types
+const NODE = 1;
+const TEXT = 2;
+const CDATA = 3;
+const COMMENT = 4;
+
+const name2type = {
+    'NODE': NODE,
+    'TEXT': TEXT,
+    'CDATA': CDATA,
+    'COMMENT': COMMENT,
+};
+
+const type2name = {
+    [NODE]: 'NODE',
+    [TEXT]: 'TEXT',
+    [CDATA]: 'CDATA',
+    [COMMENT]: 'COMMENT',
+};
+
+class NodeBase {
+    makeSelectorObj(selectorString) {
+        const result = {all: false, before: false, type: 0, name: ''};
+
+        if (selectorString === '') {
+            result.before = true;
+        } else if (selectorString === '*') {
+            result.all = true;        
+        } else if (selectorString[0] === '*') {
+            const typeName = selectorString.substring(1);
+            result.type = name2type[typeName];
+            if (!result.type)
+                throw new Error(`Unknown selector type: ${typeName}`);
+        } else {
+            result.name = selectorString;
+        }
+
+        return result;
+    }
+
+    checkNode(rawNode, selectorObj) {
+        return selectorObj.all || selectorObj.before
+            || (selectorObj.type && rawNode[0] === selectorObj.type)
+            || (rawNode[0] === NODE && rawNode[1] === selectorObj.name);
+    }
+
+    findNodeIndex(nodes, selectorObj) {
+        for (let i = 0; i < nodes.length; i++)
+            if (this.checkNode(nodes[i], selectorObj))
+                return i;
+    }
+
+    rawAdd(nodes, rawNode, selectorObj) {
+        if (selectorObj.all) {
+            nodes.push(rawNode);
+        } else if (selectorObj.before) {
+            nodes.unshift(rawNode);
+        } else {
+            const index = this.findNodeIndex(nodes, selectorObj);
+            if (index >= 0)
+                nodes.splice(index, 0, rawNode);
+            else 
+                nodes.push(rawNode);
+        }
+    }
+
+    rawRemove(nodes, selectorObj) {
+        if (selectorObj.before)
+            return;
+
+        for (let i = nodes.length - 1; i >= 0; i--) {
+            if (this.checkNode(nodes[i], selectorObj))
+                nodes.splice(i, 1);
+        }
+    }
+}
+
+class NodeObject extends NodeBase {
+    constructor(rawNode) {
+        super();
+
+        if (rawNode)
+            this.raw = rawNode;
+        else
+            this.raw = [];
+    }
+
+    get type() {
+        return this.raw[0] || null;
+    }
+
+    get name() {
+        if (this.type === NODE)
+            return this.raw[1] || null;
+
+        return null;
+    }
+
+    set name(value) {
+        if (this.type === NODE)
+            this.raw[1] = value;
+    }
+
+    get attrs() {
+        if (this.type === NODE && Array.isArray(this.raw[2]))
+            return new Map(this.raw[2]);
+
+        return null;
+    }
+
+    set attrs(value) {
+        if (this.type === NODE)
+            if (value && value.size)
+                this.raw[2] = Array.from(value);
+            else
+                this.raw[2] = null;
+    }
+
+    get value() {
+        switch (this.type) {
+            case NODE:
+                return this.raw[3] || null;
+            case TEXT:
+            case CDATA:
+            case COMMENT:
+                return this.raw[1] || null;
+        }
+
+        return null;
+    }
+
+    add(node, after = '*') {
+        if (this.type !== NODE)
+            return;
+
+        const selectorObj = this.makeSelectorObj(after);
+
+        if (!Array.isArray(this.raw[3]))
+            this.raw[3] = [];
+        this.rawAdd(this.raw[3], node.raw, selectorObj);
+    }
+
+    remove(selector = '') {
+        if (this.type !== NODE || !this.raw[3])
+            return;
+
+        const selectorObj = this.makeSelectorObj(selector);
+
+        this.rawRemove(this.raw[3], selectorObj);
+        if (!this.raw[3].length)
+            this.raw[3] = null;
+    }
+
+    each(callback) {
+        if (this.type !== NODE || !this.raw[3])
+            return;
+
+        for (const n of this.raw[3]) {
+            callback(new NodeObject(n));
+        }
+    }
+}
+
+class XmlParser extends NodeBase {
+    constructor(rawNodes = []) {
+        super();
+
+        this.NODE = NODE;
+        this.TEXT = TEXT;
+        this.CDATA = CDATA;
+        this.COMMENT = COMMENT;
+
+        this.rawNodes = rawNodes;
+    }
+
+    get count() {
+        return this.rawNodes.length;
+    }
+
+    toObject(node) {
+        return new NodeObject(node);
+    }
+
+    newParser(nodes) {
+        return new XmlParser(nodes);
+    }
+
+    checkType(type) {
+        if (!type2name[type])
+            throw new Error(`Invalid type: ${type}`);
+    }
+
+    createTypedNode(type, nameOrValue, attrs = null, value = null) {
+        this.checkType(type);
+        switch (type) {
+            case NODE:
+                if (!nameOrValue || typeof(nameOrValue) !== 'string')
+                    throw new Error('Node name must be non-empty string');
+                return new NodeObject([type, nameOrValue, attrs, value]);
+            case TEXT:
+            case CDATA:
+            case COMMENT:
+                if (typeof(nameOrValue) !== 'string')
+                    throw new Error('Node value must be of type string');
+                return new NodeObject([type, nameOrValue]);
+        }
+    }
+
+    createNode(name, attrs = null, value = null) {
+        return this.createTypedNode(NODE, name, attrs, value);
+    }
+
+    createText(value = null) {
+        return this.createTypedNode(TEXT, value);
+    }
+
+    createCdata(value = null) {
+        return this.createTypedNode(CDATA, value);
+    }
+
+    createComment(value = null) {
+        return this.createTypedNode(COMMENT, value);
+    }
+
+    add(node, after = '*') {
+        const selectorObj = this.makeSelectorObj(after);
+
+        for (const n of this.rawNodes) {
+            if (n && n[0] === NODE) {
+                if (!Array.isArray(n[3]))
+                    n[3] = [];
+                this.rawAdd(n[3], node.raw, selectorObj);
+            }
+        }
+    }
+
+    addRoot(node, after = '*') {
+        const selectorObj = this.makeSelectorObj(after);
+
+        this.rawAdd(this.rawNodes, node.raw, selectorObj);
+    }
+
+    remove(selector = '') {
+        const selectorObj = this.makeSelectorObj(selector);
+
+        for (const n of this.rawNodes) {
+            if (n && n[0] === NODE && Array.isArray(n[3])) {
+                this.rawRemove(n[3], selectorObj);
+                if (!n[3].length)
+                    n[3] = null;
+            }
+        }
+    }
+
+    removeRoot(selector = '') {
+        const selectorObj = this.makeSelectorObj(selector);
+
+        this.rawRemove(this.rawNodes, selectorObj);
+    }
+
+    each(callback) {
+        for (const n of this.rawNodes) {
+            callback(new NodeObject(n));
+        }
+    }
+
+    rawSelect(nodes, selectorObj, callback) {
+        for (const n of nodes)
+            if (this.checkNode(n, selectorObj))
+                callback(n);
+    }
+
+    select(selector = '', self = false) {
+        let newRawNodes = [];
+
+        if (selector.indexOf('/') >= 0) {
+            const selectors = selector.split('/');
+            let res = this;
+            for (const sel of selectors) {
+                res = res.select(sel, self);
+                self = false;
+            }
+
+            newRawNodes = res.rawNodes;
+        } else {
+            const selectorObj = this.makeSelectorObj(selector);
+
+            if (self) {
+                this.rawSelect(this.rawNodes, selectorObj, (node) => {
+                    newRawNodes.push(node);
+                })
+            } else {
+                for (const n of this.rawNodes) {
+                    if (n && n[0] === NODE && Array.isArray(n[3])) {
+                        this.rawSelect(n[3], selectorObj, (node) => {
+                            newRawNodes.push(node);
+                        })
+                    }
+                }
+            }
+        }
+
+        return new XmlParser(newRawNodes);
+    }
+
+    s(selector, self) {
+        return this.select(selector, self);
+    }
+
+    selectFirst(selector, self) {
+        const result = this.select(selector, self);
+        const node = (result.count ? result.rawNodes[0] : null);
+        return this.toObject(node);
+    }
+
+    sf(selector, self) {
+        return this.selectFirst(selector, self);
+    }
+
+    toJson(format = false) {
+        if (format)
+            return JSON.stringify(this.rawNodes, null, 2);
+        else
+            return JSON.stringify(this.rawNodes);
+    }
+
+    fromJson(jsonString) {
+        const parsed = JSON.parse(jsonString);
+        if (!Array.isArray(parsed))
+            throw new Error('JSON parse error: root element must be array');
+
+        this.rawNodes = parsed;
+    }
+
+    toString() {
+    }
+
+    fromSrtring() {
+    }
+}
+
+module.exports = XmlParser;
\ No newline at end of file
diff --git a/server/core/xml/sax.js b/server/core/xml/sax.js
new file mode 100644
index 0000000..07b5a55
--- /dev/null
+++ b/server/core/xml/sax.js
@@ -0,0 +1,366 @@
+function parseSync(xstr, options) {
+    const dummy = () => {};
+    let {onStartNode: _onStartNode = dummy,
+        onEndNode: _onEndNode = dummy,
+        onTextNode: _onTextNode = dummy,
+        onCdata: _onCdata = dummy,
+        onComment: _onComment = dummy,
+        onProgress: _onProgress = dummy,
+        innerCut = new Set(),
+        lowerCase = true,
+    } = options;
+
+    let i = 0;
+    const len = xstr.length;
+    const progStep = len/20;
+    let nextProg = 0;
+
+    let cutCounter = 0;
+    let cutTag = '';
+    let inCdata;
+    let inComment;
+    let leftData = 0;
+    while (i < len) {
+        inCdata = false;
+        inComment = false;
+        let singleTag = false;
+
+        let left = xstr.indexOf('<', i);
+        if (left < 0)
+            break;
+        leftData = left;
+
+        if (left < len - 2 && xstr[left + 1] == '!') {
+            if (xstr[left + 2] == '-') {
+                const leftComment = xstr.indexOf('<!--', left);
+                if (leftComment == left) {
+                    inComment = true;
+                    leftData = left + 3;
+                }
+            }
+
+            if (!inComment && xstr[left + 2] == '[') {
+                const leftCdata = xstr.indexOf('<![CDATA[', left);
+                if (leftCdata == left) {
+                    inCdata = true;
+                    leftData = left + 8;
+                }
+            }
+        }
+
+        if (left != i) {
+            const text = xstr.substr(i, left - i);
+            _onTextNode(text, cutCounter, cutTag);
+        }
+
+        let right = null;
+        let rightData = null;
+        if (inCdata) {
+            rightData = xstr.indexOf(']]>', leftData + 1);
+            if (rightData < 0)
+                break;
+            right = rightData + 2;
+        } else if (inComment) {
+            rightData = xstr.indexOf('-->', leftData + 1);
+            if (rightData < 0)
+                break;
+            right = rightData + 2;
+        } else {
+            rightData = xstr.indexOf('>', leftData + 1);
+            if (rightData < 0)
+                break;
+            right = rightData;
+            if (xstr[right - 1] === '/') {
+                singleTag = true;
+                rightData--;
+            }
+        }
+
+        let tagData = xstr.substr(leftData + 1, rightData - leftData - 1);
+
+        if (inCdata) {
+            _onCdata(tagData, cutCounter, cutTag);
+        } else if (inComment) {
+            _onComment(tagData, cutCounter, cutTag);
+        } else {
+            let tag = '';
+            let tail = '';
+            const firstSpace = tagData.indexOf(' ');
+            if (firstSpace >= 0) {
+                tail = tagData.substr(firstSpace);
+                tag = tagData.substr(0, firstSpace);
+            } else {
+                tag = tagData;
+            }
+            if (lowerCase)
+                tag = tag.toLowerCase();
+
+            if (innerCut.has(tag) && (!cutCounter || cutTag === tag)) {
+                if (!cutCounter)
+                    cutTag = tag;
+                cutCounter++;
+            }
+
+            let endTag = (singleTag ? tag : '');
+            if (tag === '' || tag[0] !== '/') {
+                _onStartNode(tag, tail, singleTag, cutCounter, cutTag);
+            } else {
+                endTag = tag.substr(1);
+            }
+
+            if (endTag)
+                _onEndNode(endTag, tail, singleTag, cutCounter, cutTag);
+
+            if (cutTag === endTag) {
+                cutCounter = (cutCounter > 0 ? cutCounter - 1 : 0);
+                if (!cutCounter)
+                    cutTag = '';
+            }
+        }
+
+        if (right >= nextProg) {
+            _onProgress(Math.round(right/(len + 1)*100));
+            nextProg += progStep;
+        }
+        i = right + 1;
+    }
+
+    if (i < len) {
+        if (inCdata) {
+            _onCdata(xstr.substr(leftData + 1, len - leftData - 1), cutCounter, cutTag);
+        } else if (inComment) {
+            _onComment(xstr.substr(leftData + 1, len - leftData - 1), cutCounter, cutTag);
+        } else {
+            _onTextNode(xstr.substr(i, len - i), cutCounter, cutTag);
+        }
+    }
+
+    _onProgress(100);
+}
+
+//асинхронная копия parseSync
+//делается заменой "_on" => "await _on" после while
+async function parse(xstr, options) {
+    const dummy = () => {};
+    let {onStartNode: _onStartNode = dummy,
+        onEndNode: _onEndNode = dummy,
+        onTextNode: _onTextNode = dummy,
+        onCdata: _onCdata = dummy,
+        onComment: _onComment = dummy,
+        onProgress: _onProgress = dummy,
+        innerCut = new Set(),
+        lowerCase = true,
+    } = options;
+
+    let i = 0;
+    const len = xstr.length;
+    const progStep = len/20;
+    let nextProg = 0;
+
+    let cutCounter = 0;
+    let cutTag = '';
+    let inCdata;
+    let inComment;
+    let leftData = 0;
+    while (i < len) {
+        inCdata = false;
+        inComment = false;
+        let singleTag = false;
+
+        let left = xstr.indexOf('<', i);
+        if (left < 0)
+            break;
+        leftData = left;
+
+        if (left < len - 2 && xstr[left + 1] == '!') {
+            if (xstr[left + 2] == '-') {
+                const leftComment = xstr.indexOf('<!--', left);
+                if (leftComment == left) {
+                    inComment = true;
+                    leftData = left + 3;
+                }
+            }
+
+            if (!inComment && xstr[left + 2] == '[') {
+                const leftCdata = xstr.indexOf('<![CDATA[', left);
+                if (leftCdata == left) {
+                    inCdata = true;
+                    leftData = left + 8;
+                }
+            }
+        }
+
+        if (left != i) {
+            const text = xstr.substr(i, left - i);
+            await _onTextNode(text, cutCounter, cutTag);
+        }
+
+        let right = null;
+        let rightData = null;
+        if (inCdata) {
+            rightData = xstr.indexOf(']]>', leftData + 1);
+            if (rightData < 0)
+                break;
+            right = rightData + 2;
+        } else if (inComment) {
+            rightData = xstr.indexOf('-->', leftData + 1);
+            if (rightData < 0)
+                break;
+            right = rightData + 2;
+        } else {
+            rightData = xstr.indexOf('>', leftData + 1);
+            if (rightData < 0)
+                break;
+            right = rightData;
+            if (xstr[right - 1] === '/') {
+                singleTag = true;
+                rightData--;
+            }
+        }
+
+        let tagData = xstr.substr(leftData + 1, rightData - leftData - 1);
+
+        if (inCdata) {
+            await _onCdata(tagData, cutCounter, cutTag);
+        } else if (inComment) {
+            await _onComment(tagData, cutCounter, cutTag);
+        } else {
+            let tag = '';
+            let tail = '';
+            const firstSpace = tagData.indexOf(' ');
+            if (firstSpace >= 0) {
+                tail = tagData.substr(firstSpace);
+                tag = tagData.substr(0, firstSpace);
+            } else {
+                tag = tagData;
+            }
+            if (lowerCase)
+                tag = tag.toLowerCase();
+
+            if (innerCut.has(tag) && (!cutCounter || cutTag === tag)) {
+                if (!cutCounter)
+                    cutTag = tag;
+                cutCounter++;
+            }
+
+            let endTag = (singleTag ? tag : '');
+            if (tag === '' || tag[0] !== '/') {
+                await _onStartNode(tag, tail, singleTag, cutCounter, cutTag);
+            } else {
+                endTag = tag.substr(1);
+            }
+
+            if (endTag)
+                await _onEndNode(endTag, tail, singleTag, cutCounter, cutTag);
+
+            if (cutTag === endTag) {
+                cutCounter = (cutCounter > 0 ? cutCounter - 1 : 0);
+                if (!cutCounter)
+                    cutTag = '';
+            }
+        }
+
+        if (right >= nextProg) {
+            await _onProgress(Math.round(right/(len + 1)*100));
+            nextProg += progStep;
+        }
+        i = right + 1;
+    }
+
+    if (i < len) {
+        if (inCdata) {
+            await _onCdata(xstr.substr(leftData + 1, len - leftData - 1), cutCounter, cutTag);
+        } else if (inComment) {
+            await _onComment(xstr.substr(leftData + 1, len - leftData - 1), cutCounter, cutTag);
+        } else {
+            await _onTextNode(xstr.substr(i, len - i), cutCounter, cutTag);
+        }
+    }
+
+    await _onProgress(100);
+}
+
+function getAttrsSync(tail, lowerCase = true) {
+    let result = {};
+    let name = '';    
+    let value = '';
+    let vOpen = '';
+    let inName = false;
+    let inValue = false;
+    let waitValue = false;
+    let waitEq = false;
+
+    const pushResult = () => {
+        if (lowerCase)
+            name = name.toLowerCase();
+        if (name != '') {
+            const fn = name;
+            let ns = '';
+            if (fn.indexOf(':') >= 0) {
+                [ns, name] = fn.split(':');
+            }
+
+            result[name] = {value, ns, fn};
+        }
+        name = '';
+        value = '';
+        vOpen = '';
+        inName = false;
+        inValue = false;
+        waitValue = false;
+        waitEq = false;
+    };
+
+    tail = tail.replace(/[\t\n\r]/g, ' ');
+    for (let i = 0; i < tail.length; i++) {
+        const c = tail.charAt(i);
+        if (c == ' ') {
+            if (inValue) {
+                if (vOpen == '"')
+                    value += c;
+                else
+                    pushResult();
+            } else if (inName) {
+                waitEq = true;
+                inName = false;
+            }
+        } else if (!inValue && c == '=') {
+            waitEq = false;
+            waitValue = true;
+            inName = false;
+        } else if (c == '"') {
+            if (inValue) {
+                pushResult();
+            } else if (waitValue) {
+                inValue = true;
+                vOpen = '"';
+            }
+        } else if (inValue) {
+            value += c;
+        } else if (inName) {
+            name += c;
+        } else if (waitEq) {
+            pushResult();
+            inName = true;
+            name = c;
+        } else if (waitValue) {
+            waitValue = false;
+            inValue = true;
+            vOpen = ' ';
+            value = c;
+        } else {
+            inName = true;
+            name = c;
+        }
+    }
+    if (name != '')
+        pushResult();
+
+    return result;
+}
+
+module.exports = {
+    parseSync,
+    getAttrsSync,
+    parse
+}
\ No newline at end of file
diff --git a/server/core/xml/textUtils.js b/server/core/xml/textUtils.js
new file mode 100644
index 0000000..ef05606
--- /dev/null
+++ b/server/core/xml/textUtils.js
@@ -0,0 +1,130 @@
+const chardet = require('chardet');
+
+function getEncoding(buf) {
+    let selected = getEncodingLite(buf);
+
+    if (selected == 'ISO-8859-5' && buf.length > 10) {
+        const charsetAll = chardet.analyse(buf.slice(0, 20000));
+        for (const charset of charsetAll) {
+            if (charset.name.indexOf('ISO-8859') < 0) {
+                selected = charset.name;
+                break;
+            }
+        }
+    }
+
+    return selected;
+}
+
+
+function getEncodingLite(buf, returnAll) {
+    const lowerCase = 3;
+    const upperCase = 1;
+
+    const codePage = {
+        'k': 'koi8-r',
+        'w': 'Windows-1251',
+        'd': 'cp866',
+        'i': 'ISO-8859-5',
+        'm': 'maccyrillic',
+        'u': 'utf-8',
+    };
+
+    let charsets = {
+        'k': 0,
+        'w': 0,
+        'd': 0,
+        'i': 0,
+        'm': 0,
+        'u': 0,
+    };
+
+    const len = buf.length;
+    const blockSize = (len > 5*3000 ? 3000 : len);
+    let counter = 0;
+    let i = 0;
+    let totalChecked = 0;
+    while (i < len) {
+        const char = buf[i];
+        const nextChar = (i < len - 1 ? buf[i + 1] : 0);
+        totalChecked++;
+        i++;
+        //non-russian characters
+        if (char < 128 || char > 256)
+            continue;
+        //UTF-8
+        if ((char == 208 || char == 209) && nextChar >= 128 && nextChar <= 190)
+            charsets['u'] += lowerCase;
+        else {
+            //CP866
+            if ((char > 159 && char < 176) || (char > 223 && char < 242)) charsets['d'] += lowerCase;
+            if ((char > 127 && char < 160)) charsets['d'] += upperCase;
+
+            //KOI8-R
+            if ((char > 191 && char < 223)) charsets['k'] += lowerCase;
+            if ((char > 222 && char < 256)) charsets['k'] += upperCase;
+
+            //WIN-1251
+            if (char > 223 && char < 256) charsets['w'] += lowerCase;
+            if (char > 191 && char < 224) charsets['w'] += upperCase;
+
+            //MAC
+            if (char > 221 && char < 255) charsets['m'] += lowerCase;
+            if (char > 127 && char < 160) charsets['m'] += upperCase;
+
+            //ISO-8859-5
+            if (char > 207 && char < 240) charsets['i'] += lowerCase;
+            if (char > 175 && char < 208) charsets['i'] += upperCase;
+        }
+
+        counter++;
+
+        if (counter > blockSize) {
+            counter = 0;
+            i += Math.round(len/2 - 2*blockSize);
+        }
+    }
+
+    let sorted = Object.keys(charsets).map(function(key) {
+        return { codePage: codePage[key], c: charsets[key], totalChecked };
+    });
+
+    sorted.sort((a, b) => b.c - a.c);
+
+    if (returnAll)
+        return sorted;
+    else if (sorted[0].c > 0 && sorted[0].c > sorted[0].totalChecked/2)
+        return sorted[0].codePage;
+    else
+        return 'ISO-8859-5';
+}
+
+function checkIfText(buf) {
+    const enc = getEncodingLite(buf, true);
+    if (enc[0].c > enc[0].totalChecked*0.9)
+        return true;
+
+    let spaceCount = 0;
+    let crCount = 0;
+    let lfCount = 0;
+    for (let i = 0; i < buf.length; i++) {
+        if (buf[i] == 32)
+            spaceCount++;
+        if (buf[i] == 13)
+            crCount++;
+        if (buf[i] == 10)
+            lfCount++;
+    }
+
+    const spaceFreq = spaceCount/(buf.length + 1);
+    const crFreq = crCount/(buf.length + 1);
+    const lfFreq = lfCount/(buf.length + 1);
+
+    return (buf.length < 1000 || spaceFreq > 0.1 || crFreq > 0.03 || lfFreq > 0.03);
+}
+
+module.exports = {
+    getEncoding,
+    getEncodingLite,
+    checkIfText,
+}
\ No newline at end of file

From e4571faf39ce644e39234c4044821dbeea7a7920 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 7 Nov 2022 21:13:15 +0700
Subject: [PATCH 10/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20XmlParser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/XmlParser.js | 96 +++++++++++++++++++++++++++++++++++-
 1 file changed, 95 insertions(+), 1 deletion(-)

diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
index e1c3a0d..38a3855 100644
--- a/server/core/xml/XmlParser.js
+++ b/server/core/xml/XmlParser.js
@@ -1,3 +1,5 @@
+const sax = require('./sax');
+
 //node types
 const NODE = 1;
 const TEXT = 2;
@@ -159,6 +161,24 @@ class NodeObject extends NodeBase {
             callback(new NodeObject(n));
         }
     }
+
+    eachDeep(callback) {
+        if (this.type !== NODE || !this.raw[3])
+            return;
+
+        const deep = (nodes, route = '') => {
+            for (const n of nodes) {
+                const node = new NodeObject(n);
+                callback(node, route);
+
+                if (node.type === NODE && node.value) {
+                    deep(node.value, route + `/${node.name}`);
+                }
+            }
+        }
+
+        deep(this.raw[3]);
+    }
 }
 
 class XmlParser extends NodeBase {
@@ -264,6 +284,21 @@ class XmlParser extends NodeBase {
         }
     }
 
+    eachDeep(callback) {
+        const deep = (nodes, route = '') => {
+            for (const n of nodes) {
+                const node = new NodeObject(n);
+                callback(node, route);
+
+                if (node.type === NODE && node.value) {
+                    deep(node.value, route + `/${node.name}`);
+                }
+            }
+        }
+
+        deep(this.rawNodes);
+    }
+
     rawSelect(nodes, selectorObj, callback) {
         for (const n of nodes)
             if (this.checkNode(n, selectorObj))
@@ -332,7 +367,66 @@ class XmlParser extends NodeBase {
         this.rawNodes = parsed;
     }
 
-    toString() {
+    toString(options = {}) {
+        const {encoding = 'utf-8', format = false} = options;
+
+        let deepType = 0;
+        let out = '';
+        if (this.count < 2)
+            out += `<?xml version="1.0" encoding="${encoding}"?>`;
+
+        const nodesToString = (nodes, depth = 0) => {
+            let result = '';
+            let lastType = 0;
+
+            for (const n of nodes) {
+                const node = new NodeObject(n);
+                lastType = node.type;
+
+                let open = '';
+                let body = '';
+                let close = '';
+
+                if (node.type === NODE) {
+                    if (!node.name)
+                        break;
+
+                    let attrs = '';
+
+                    if (node.attrs) {
+                        for (const [attrName, attrValue] of node.attrs) {
+                            attrs += ` ${attrName}="${attrValue}"`;
+                        }
+                    }
+
+                    open = `<${node.name}${attrs}>`;
+
+                    if (node.value)
+                        body = nodesToString(node.value, depth + 2);
+                    close = `</${node.name}>`;
+
+                    if (format) {
+                        open = '\n' + ' '.repeat(depth) + open;
+                        close = (deepType === NODE ? ' '.repeat(depth) : '') + close + '\n';
+                    }
+                } else if (node.type === TEXT) {
+                    body = node.value;
+                } else if (node.type === CDATA) {
+                    //
+                } else if (node.type === COMMENT) {
+                    //
+                }
+
+                result += `${open}${body}${close}`;
+            }
+
+            deepType = lastType;
+            return result;
+        }
+
+        out += nodesToString(this.rawNodes);
+
+        return out;
     }
 
     fromSrtring() {

From 8f4dec510c65ebbe70d92b6933f179f782e0b4cd Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 7 Nov 2022 21:50:38 +0700
Subject: [PATCH 11/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20XmlParser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/XmlParser.js | 100 ++++++++++++++++++++++++++++++++---
 server/core/xml/sax.js       |   4 +-
 2 files changed, 96 insertions(+), 8 deletions(-)

diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
index 38a3855..a0d9a01 100644
--- a/server/core/xml/XmlParser.js
+++ b/server/core/xml/XmlParser.js
@@ -352,7 +352,9 @@ class XmlParser extends NodeBase {
         return this.selectFirst(selector, self);
     }
 
-    toJson(format = false) {
+    toJson(options = {}) {
+        const {format = false} = options;
+
         if (format)
             return JSON.stringify(this.rawNodes, null, 2);
         else
@@ -395,7 +397,11 @@ class XmlParser extends NodeBase {
 
                     if (node.attrs) {
                         for (const [attrName, attrValue] of node.attrs) {
-                            attrs += ` ${attrName}="${attrValue}"`;
+                            if (typeof(attrValue) === 'string')
+                                attrs += ` ${attrName}="${attrValue}"`;
+                            else
+                                if (attrValue)
+                                    attrs += ` ${attrName}`;
                         }
                     }
 
@@ -410,11 +416,11 @@ class XmlParser extends NodeBase {
                         close = (deepType === NODE ? ' '.repeat(depth) : '') + close + '\n';
                     }
                 } else if (node.type === TEXT) {
-                    body = node.value;
+                    body = node.value || '';
                 } else if (node.type === CDATA) {
-                    //
+                    body = `<![CDATA[${node.value || ''}]]>`;
                 } else if (node.type === COMMENT) {
-                    //
+                    body = `<!--${node.value || ''}-->`;
                 }
 
                 result += `${open}${body}${close}`;
@@ -429,7 +435,89 @@ class XmlParser extends NodeBase {
         return out;
     }
 
-    fromSrtring() {
+    fromString(xmlString, options = {}, pickNode = () => true) {
+        const parsed = [];
+        const root = this.createNode(parsed);
+        let node = root;
+
+        let route = '';
+        let routeStack = [];
+        let ignoreNode = false;
+
+        const {lowerCase = false, whiteSpace = false} = options;
+
+        const onStartNode = (tag, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (tag == '?xml')
+                return;
+
+            route += `/${tag}`;
+            ignoreNode = !pickNode(route);
+
+            const newNode = this.createNode(tag);
+
+            routeStack.push({tag, route, ignoreNode, node: newNode});
+
+            if (ignoreNode)
+                return;
+
+            if (tail) {
+                const parsedAttrs = sax.getAttrsSync(tail, lowerCase);
+                const attrs = new Map();
+                for (const attr of parsedAttrs.values()) {
+                    attrs.set(attr.fn, attr.value);
+                }
+
+                if (attrs.size)
+                    newNode.attrs = attrs;
+            }
+
+            if (!node.value)
+                node.value = [];
+            node.value.push(newNode.raw);
+            node = newNode;
+        };
+
+        const onEndNode = (tag, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (routeStack.length && routeStack[routeStack.length - 1].tag === tag) {
+                routeStack.pop();
+
+                if (routeStack.length) {
+                    const last = routeStack[routeStack.length - 1];
+                    route = last.route;
+                    ignoreNode = last.ignoreNode;
+                    node = last.node;
+                } else {
+                    route = '';
+                    ignoreNode = false;
+                    node = root;
+                }
+            }
+        }
+
+        const onTextNode = (text, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (ignoreNode)
+                return;
+
+            if (!whiteSpace && text.trim() == '')
+                return;
+
+            if (!node.value)
+                node.value = [];
+
+            node.value.push(this.createText(text).raw);
+        };
+
+        const onCdata = (tagData, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+        }
+
+        const onComment = (tagData, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+        }
+
+        sax.parseSync(xmlString, {
+            onStartNode, onEndNode, onTextNode, onCdata, onComment, lowerCase
+        });
+
+        this.rawNodes = parsed;        
     }
 }
 
diff --git a/server/core/xml/sax.js b/server/core/xml/sax.js
index 07b5a55..1525ac7 100644
--- a/server/core/xml/sax.js
+++ b/server/core/xml/sax.js
@@ -281,7 +281,7 @@ async function parse(xstr, options) {
 }
 
 function getAttrsSync(tail, lowerCase = true) {
-    let result = {};
+    let result = new Map();
     let name = '';    
     let value = '';
     let vOpen = '';
@@ -300,7 +300,7 @@ function getAttrsSync(tail, lowerCase = true) {
                 [ns, name] = fn.split(':');
             }
 
-            result[name] = {value, ns, fn};
+            result.set(fn, {value, ns, name, fn});
         }
         name = '';
         value = '';

From d2484659e778564238ed5879d9a63e9dd86995e3 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 8 Nov 2022 02:21:34 +0700
Subject: [PATCH 12/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20XmlParser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/XmlParser.js | 34 +++++++++++++++++++++++++++-------
 server/core/xml/sax.js       |  7 ++++---
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
index a0d9a01..daaa52d 100644
--- a/server/core/xml/XmlParser.js
+++ b/server/core/xml/XmlParser.js
@@ -131,6 +131,18 @@ class NodeObject extends NodeBase {
         return null;
     }
 
+    set value(v) {
+        switch (this.type) {
+            case NODE:
+                this.raw[3] = v;
+                break;
+            case TEXT:
+            case CDATA:
+            case COMMENT:
+                this.raw[1] = v;
+        }
+    }
+
     add(node, after = '*') {
         if (this.type !== NODE)
             return;
@@ -338,20 +350,28 @@ class XmlParser extends NodeBase {
         return new XmlParser(newRawNodes);
     }
 
-    s(selector, self) {
+    $$(selector, self) {
         return this.select(selector, self);
     }
 
+    $$self(selector) {
+        return this.$$(selector, true);
+    }
+
     selectFirst(selector, self) {
         const result = this.select(selector, self);
         const node = (result.count ? result.rawNodes[0] : null);
         return this.toObject(node);
     }
 
-    sf(selector, self) {
+    $(selector, self) {
         return this.selectFirst(selector, self);
     }
 
+    $self(selector) {
+        return this.$(selector, true);
+    }
+
     toJson(options = {}) {
         const {format = false} = options;
 
@@ -383,7 +403,6 @@ class XmlParser extends NodeBase {
 
             for (const n of nodes) {
                 const node = new NodeObject(n);
-                lastType = node.type;
 
                 let open = '';
                 let body = '';
@@ -412,8 +431,8 @@ class XmlParser extends NodeBase {
                     close = `</${node.name}>`;
 
                     if (format) {
-                        open = '\n' + ' '.repeat(depth) + open;
-                        close = (deepType === NODE ? ' '.repeat(depth) : '') + close + '\n';
+                        open = (lastType !== TEXT ? '\n' + ' '.repeat(depth) : '') + open;
+                        close = (deepType === NODE ? '\n' + ' '.repeat(depth) : '') + close;
                     }
                 } else if (node.type === TEXT) {
                     body = node.value || '';
@@ -424,6 +443,7 @@ class XmlParser extends NodeBase {
                 }
 
                 result += `${open}${body}${close}`;
+                lastType = node.type;
             }
 
             deepType = lastType;
@@ -437,7 +457,7 @@ class XmlParser extends NodeBase {
 
     fromString(xmlString, options = {}, pickNode = () => true) {
         const parsed = [];
-        const root = this.createNode(parsed);
+        const root = this.createNode('root', null, parsed);//fake node
         let node = root;
 
         let route = '';
@@ -460,7 +480,7 @@ class XmlParser extends NodeBase {
             if (ignoreNode)
                 return;
 
-            if (tail) {
+            if (tail && tail.trim() !== '') {
                 const parsedAttrs = sax.getAttrsSync(tail, lowerCase);
                 const attrs = new Map();
                 for (const attr of parsedAttrs.values()) {
diff --git a/server/core/xml/sax.js b/server/core/xml/sax.js
index 1525ac7..d429368 100644
--- a/server/core/xml/sax.js
+++ b/server/core/xml/sax.js
@@ -288,9 +288,11 @@ function getAttrsSync(tail, lowerCase = true) {
     let inName = false;
     let inValue = false;
     let waitValue = false;
-    let waitEq = false;
+    let waitEq = true;
 
     const pushResult = () => {
+        if (waitEq)
+            value = true;
         if (lowerCase)
             name = name.toLowerCase();
         if (name != '') {
@@ -308,7 +310,7 @@ function getAttrsSync(tail, lowerCase = true) {
         inName = false;
         inValue = false;
         waitValue = false;
-        waitEq = false;
+        waitEq = true;
     };
 
     tail = tail.replace(/[\t\n\r]/g, ' ');
@@ -321,7 +323,6 @@ function getAttrsSync(tail, lowerCase = true) {
                 else
                     pushResult();
             } else if (inName) {
-                waitEq = true;
                 inName = false;
             }
         } else if (!inValue && c == '=') {

From 6a640ba2cd0db75b38d42a7a512981ad500df349 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 8 Nov 2022 02:42:11 +0700
Subject: [PATCH 13/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20XmlParser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/XmlParser.js | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
index daaa52d..1a89e58 100644
--- a/server/core/xml/XmlParser.js
+++ b/server/core/xml/XmlParser.js
@@ -399,6 +399,8 @@ class XmlParser extends NodeBase {
 
         const nodesToString = (nodes, depth = 0) => {
             let result = '';
+
+            const indent = '\n' + ' '.repeat(depth);
             let lastType = 0;
 
             for (const n of nodes) {
@@ -424,22 +426,23 @@ class XmlParser extends NodeBase {
                         }
                     }
 
-                    open = `<${node.name}${attrs}>`;
+
+                    open = (format && lastType !== TEXT ? indent : '');
+                    open += `<${node.name}${attrs}>`;
 
                     if (node.value)
                         body = nodesToString(node.value, depth + 2);
-                    close = `</${node.name}>`;
 
-                    if (format) {
-                        open = (lastType !== TEXT ? '\n' + ' '.repeat(depth) : '') + open;
-                        close = (deepType === NODE ? '\n' + ' '.repeat(depth) : '') + close;
-                    }
+                    close = (format && deepType && deepType !== TEXT ? indent : '');
+                    close += `</${node.name}>`;
                 } else if (node.type === TEXT) {
                     body = node.value || '';
                 } else if (node.type === CDATA) {
-                    body = `<![CDATA[${node.value || ''}]]>`;
+                    body = (format && lastType !== TEXT ? indent : '');
+                    body += `<![CDATA[${node.value || ''}]]>`;
                 } else if (node.type === COMMENT) {
-                    body = `<!--${node.value || ''}-->`;
+                    body = (format && lastType !== TEXT ? indent : '');
+                    body += `<!--${node.value || ''}-->`;
                 }
 
                 result += `${open}${body}${close}`;
@@ -528,9 +531,23 @@ class XmlParser extends NodeBase {
         };
 
         const onCdata = (tagData, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (ignoreNode)
+                return;
+
+            if (!node.value)
+                node.value = [];
+
+            node.value.push(this.createCdata(tagData).raw);
         }
 
         const onComment = (tagData, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (ignoreNode)
+                return;
+
+            if (!node.value)
+                node.value = [];
+
+            node.value.push(this.createComment(tagData).raw);
         }
 
         sax.parseSync(xmlString, {

From b5c7219e09a0dd650ef82f1bfe3b50d4441583fd Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 8 Nov 2022 03:52:00 +0700
Subject: [PATCH 14/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20XmlParser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/XmlParser.js | 52 ++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
index 1a89e58..af1af12 100644
--- a/server/core/xml/XmlParser.js
+++ b/server/core/xml/XmlParser.js
@@ -152,6 +152,8 @@ class NodeObject extends NodeBase {
         if (!Array.isArray(this.raw[3]))
             this.raw[3] = [];
         this.rawAdd(this.raw[3], node.raw, selectorObj);
+
+        return this;
     }
 
     remove(selector = '') {
@@ -163,6 +165,8 @@ class NodeObject extends NodeBase {
         this.rawRemove(this.raw[3], selectorObj);
         if (!this.raw[3].length)
             this.raw[3] = null;
+
+        return this;
     }
 
     each(callback) {
@@ -172,6 +176,8 @@ class NodeObject extends NodeBase {
         for (const n of this.raw[3]) {
             callback(new NodeObject(n));
         }
+
+        return this;
     }
 
     eachDeep(callback) {
@@ -190,6 +196,8 @@ class NodeObject extends NodeBase {
         }
 
         deep(this.raw[3]);
+
+        return this;
     }
 }
 
@@ -264,12 +272,16 @@ class XmlParser extends NodeBase {
                 this.rawAdd(n[3], node.raw, selectorObj);
             }
         }
+
+        return this;
     }
 
     addRoot(node, after = '*') {
         const selectorObj = this.makeSelectorObj(after);
 
         this.rawAdd(this.rawNodes, node.raw, selectorObj);
+
+        return this;
     }
 
     remove(selector = '') {
@@ -282,18 +294,24 @@ class XmlParser extends NodeBase {
                     n[3] = null;
             }
         }
+
+        return this;
     }
 
     removeRoot(selector = '') {
         const selectorObj = this.makeSelectorObj(selector);
 
         this.rawRemove(this.rawNodes, selectorObj);
+
+        return this;
     }
 
     each(callback) {
         for (const n of this.rawNodes) {
             callback(new NodeObject(n));
         }
+
+        return this;
     }
 
     eachDeep(callback) {
@@ -309,12 +327,16 @@ class XmlParser extends NodeBase {
         }
 
         deep(this.rawNodes);
+
+        return this;
     }
 
     rawSelect(nodes, selectorObj, callback) {
         for (const n of nodes)
             if (this.checkNode(n, selectorObj))
                 callback(n);
+
+        return this;
     }
 
     select(selector = '', self = false) {
@@ -355,7 +377,7 @@ class XmlParser extends NodeBase {
     }
 
     $$self(selector) {
-        return this.$$(selector, true);
+        return this.select(selector, true);
     }
 
     selectFirst(selector, self) {
@@ -369,7 +391,7 @@ class XmlParser extends NodeBase {
     }
 
     $self(selector) {
-        return this.$(selector, true);
+        return this.selectFirst(selector, true);
     }
 
     toJson(options = {}) {
@@ -458,7 +480,13 @@ class XmlParser extends NodeBase {
         return out;
     }
 
-    fromString(xmlString, options = {}, pickNode = () => true) {
+    fromString(xmlString, options = {}) {
+        const {
+            lowerCase = false,
+            whiteSpace = false,
+            pickNode = false,
+        } = options;
+
         const parsed = [];
         const root = this.createNode('root', null, parsed);//fake node
         let node = root;
@@ -467,16 +495,18 @@ class XmlParser extends NodeBase {
         let routeStack = [];
         let ignoreNode = false;
 
-        const {lowerCase = false, whiteSpace = false} = options;
-
         const onStartNode = (tag, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
             if (tag == '?xml')
                 return;
 
-            route += `/${tag}`;
-            ignoreNode = !pickNode(route);
+            if (!ignoreNode && pickNode) {
+                route += `/${tag}`;
+                ignoreNode = !pickNode(route);
+            }
 
-            const newNode = this.createNode(tag);
+            let newNode = node;
+            if (!ignoreNode)
+                newNode = this.createNode(tag);
 
             routeStack.push({tag, route, ignoreNode, node: newNode});
 
@@ -518,7 +548,7 @@ class XmlParser extends NodeBase {
         }
 
         const onTextNode = (text, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
-            if (ignoreNode)
+            if (ignoreNode || (pickNode && !pickNode(`${route}/*TEXT`)))
                 return;
 
             if (!whiteSpace && text.trim() == '')
@@ -531,7 +561,7 @@ class XmlParser extends NodeBase {
         };
 
         const onCdata = (tagData, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
-            if (ignoreNode)
+            if (ignoreNode || (pickNode && !pickNode(`${route}/*CDATA`)))
                 return;
 
             if (!node.value)
@@ -541,7 +571,7 @@ class XmlParser extends NodeBase {
         }
 
         const onComment = (tagData, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
-            if (ignoreNode)
+            if (ignoreNode || (pickNode && !pickNode(`${route}/*COMMENT`)))
                 return;
 
             if (!node.value)

From e755ddbbefaa96177eed6676eef05ccf3f091b77 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 8 Nov 2022 14:07:17 +0700
Subject: [PATCH 15/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20XmlParser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/XmlParser.js | 61 +++++++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
index af1af12..f3c69cf 100644
--- a/server/core/xml/XmlParser.js
+++ b/server/core/xml/XmlParser.js
@@ -103,19 +103,24 @@ class NodeObject extends NodeBase {
             this.raw[1] = value;
     }
 
-    get attrs() {
-        if (this.type === NODE && Array.isArray(this.raw[2]))
-            return new Map(this.raw[2]);
+    attrs(key, value) {
+        if (this.type !== NODE)
+            return null;
 
-        return null;
-    }
+        let map = null;
 
-    set attrs(value) {
-        if (this.type === NODE)
-            if (value && value.size)
-                this.raw[2] = Array.from(value);
-            else
-                this.raw[2] = null;
+        if (key instanceof Map) {
+            map = key;
+            this.raw[2] = Array.from(map);
+        } else if (Array.isArray(this.raw[2])) {
+            map = new Map(this.raw[2]);
+            if (key) {
+                map.set(key, value);
+                this.raw[2] = Array.from(map);
+            }
+        }
+
+        return map;
     }
 
     get value() {
@@ -151,7 +156,13 @@ class NodeObject extends NodeBase {
 
         if (!Array.isArray(this.raw[3]))
             this.raw[3] = [];
-        this.rawAdd(this.raw[3], node.raw, selectorObj);
+
+        if (Array.isArray(node)) {
+            for (const node_ of node)
+                this.rawAdd(this.raw[3], node_.raw, selectorObj);
+        } else {
+            this.rawAdd(this.raw[3], node.raw, selectorObj);
+        }
 
         return this;
     }
@@ -269,7 +280,13 @@ class XmlParser extends NodeBase {
             if (n && n[0] === NODE) {
                 if (!Array.isArray(n[3]))
                     n[3] = [];
-                this.rawAdd(n[3], node.raw, selectorObj);
+                
+                if (Array.isArray(node)) {
+                    for (const node_ of node)
+                        this.rawAdd(n[3], node_.raw, selectorObj);
+                } else {
+                    this.rawAdd(n[3], node.raw, selectorObj);
+                }
             }
         }
 
@@ -279,7 +296,12 @@ class XmlParser extends NodeBase {
     addRoot(node, after = '*') {
         const selectorObj = this.makeSelectorObj(after);
 
-        this.rawAdd(this.rawNodes, node.raw, selectorObj);
+        if (Array.isArray(node)) {
+            for (const node_ of node)
+                this.rawAdd(this.rawNodes, node_.raw, selectorObj);
+        } else {
+            this.rawAdd(this.rawNodes, node.raw, selectorObj);
+        }
 
         return this;
     }
@@ -412,11 +434,11 @@ class XmlParser extends NodeBase {
     }
 
     toString(options = {}) {
-        const {encoding = 'utf-8', format = false} = options;
+        const {encoding = 'utf-8', format = false, noHeader = false} = options;
 
         let deepType = 0;
         let out = '';
-        if (this.count < 2)
+        if (!noHeader)
             out += `<?xml version="1.0" encoding="${encoding}"?>`;
 
         const nodesToString = (nodes, depth = 0) => {
@@ -438,8 +460,9 @@ class XmlParser extends NodeBase {
 
                     let attrs = '';
 
-                    if (node.attrs) {
-                        for (const [attrName, attrValue] of node.attrs) {
+                    const nodeAttrs = node.attrs();
+                    if (nodeAttrs) {
+                        for (const [attrName, attrValue] of nodeAttrs) {
                             if (typeof(attrValue) === 'string')
                                 attrs += ` ${attrName}="${attrValue}"`;
                             else
@@ -521,7 +544,7 @@ class XmlParser extends NodeBase {
                 }
 
                 if (attrs.size)
-                    newNode.attrs = attrs;
+                    newNode.attrs(attrs);
             }
 
             if (!node.value)

From 98fac2bf11facc5aca63b96e3524520be89e98f2 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 8 Nov 2022 14:42:28 +0700
Subject: [PATCH 16/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20XmlParser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/XmlParser.js | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
index f3c69cf..eb86598 100644
--- a/server/core/xml/XmlParser.js
+++ b/server/core/xml/XmlParser.js
@@ -201,7 +201,7 @@ class NodeObject extends NodeBase {
                 callback(node, route);
 
                 if (node.type === NODE && node.value) {
-                    deep(node.value, route + `/${node.name}`);
+                    deep(node.value, `${route}${route ? '/' : ''}${node.name}`);
                 }
             }
         }
@@ -328,31 +328,49 @@ class XmlParser extends NodeBase {
         return this;
     }
 
-    each(callback) {
-        for (const n of this.rawNodes) {
-            callback(new NodeObject(n));
+    each(callback, self = false) {
+        if (self) {
+            for (const n of this.rawNodes) {
+                callback(new NodeObject(n));
+            }
+        } else {
+            for (const n of this.rawNodes) {
+                if (n[0] === NODE && n[3])
+                    callback(new NodeObject(n[3]));
+            }
         }
 
         return this;
     }
 
-    eachDeep(callback) {
+    eachDeep(callback, self = false) {
         const deep = (nodes, route = '') => {
             for (const n of nodes) {
                 const node = new NodeObject(n);
                 callback(node, route);
 
                 if (node.type === NODE && node.value) {
-                    deep(node.value, route + `/${node.name}`);
+                    deep(node.value, `${route}${route ? '/' : ''}${node.name}`);
                 }
             }
         }
 
-        deep(this.rawNodes);
+        if (self) {
+            deep(this.rawNodes);
+        } else {
+            for (const n of this.rawNodes) {
+                if (n[0] === NODE && n[3])
+                    deep(n[3]);
+            }
+        }
 
         return this;
     }
 
+    eachDeepSelf(callback) {
+        return this.eachDeep(callback, true);
+    }
+
     rawSelect(nodes, selectorObj, callback) {
         for (const n of nodes)
             if (this.checkNode(n, selectorObj))

From 9cf9530447bce06b8726aee26b56f18d30526d7c Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 8 Nov 2022 15:01:52 +0700
Subject: [PATCH 17/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20XmlParser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/XmlParser.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
index eb86598..bca3160 100644
--- a/server/core/xml/XmlParser.js
+++ b/server/core/xml/XmlParser.js
@@ -452,7 +452,7 @@ class XmlParser extends NodeBase {
     }
 
     toString(options = {}) {
-        const {encoding = 'utf-8', format = false, noHeader = false} = options;
+        const {encoding = 'utf-8', format = false, noHeader = false, expandEmpty = false} = options;
 
         let deepType = 0;
         let out = '';
@@ -489,15 +489,19 @@ class XmlParser extends NodeBase {
                         }
                     }
 
-
-                    open = (format && lastType !== TEXT ? indent : '');
-                    open += `<${node.name}${attrs}>`;
-
                     if (node.value)
                         body = nodesToString(node.value, depth + 2);
 
-                    close = (format && deepType && deepType !== TEXT ? indent : '');
-                    close += `</${node.name}>`;
+                    if (!body && !expandEmpty) {
+                        open = (format && lastType !== TEXT ? indent : '');
+                        open += `<${node.name}${attrs}/>`;
+                    } else {
+                        open = (format && lastType !== TEXT ? indent : '');
+                        open += `<${node.name}${attrs}>`;
+
+                        close = (format && deepType && deepType !== TEXT ? indent : '');
+                        close += `</${node.name}>`;
+                    }
                 } else if (node.type === TEXT) {
                     body = node.value || '';
                 } else if (node.type === CDATA) {
@@ -516,7 +520,7 @@ class XmlParser extends NodeBase {
             return result;
         }
 
-        out += nodesToString(this.rawNodes);
+        out += nodesToString(this.rawNodes) + (format ? '\n' : '');
 
         return out;
     }

From f7994fd9e95de076d432e1e9a4eb0f4ff913590f Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 8 Nov 2022 16:12:46 +0700
Subject: [PATCH 18/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20XmlParser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/XmlParser.js | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
index bca3160..8591e85 100644
--- a/server/core/xml/XmlParser.js
+++ b/server/core/xml/XmlParser.js
@@ -228,7 +228,7 @@ class XmlParser extends NodeBase {
         return this.rawNodes.length;
     }
 
-    toObject(node) {
+    nodeObject(node) {
         return new NodeObject(node);
     }
 
@@ -335,14 +335,20 @@ class XmlParser extends NodeBase {
             }
         } else {
             for (const n of this.rawNodes) {
-                if (n[0] === NODE && n[3])
-                    callback(new NodeObject(n[3]));
+                if (n[0] === NODE && n[3]) {
+                    for (const nn of n[3])
+                        callback(new NodeObject(nn));
+                }
             }
         }
 
         return this;
     }
 
+    eachSelf(callback) {
+        return this.each(callback, true);
+    }
+
     eachDeep(callback, self = false) {
         const deep = (nodes, route = '') => {
             for (const n of nodes) {
@@ -423,7 +429,7 @@ class XmlParser extends NodeBase {
     selectFirst(selector, self) {
         const result = this.select(selector, self);
         const node = (result.count ? result.rawNodes[0] : null);
-        return this.toObject(node);
+        return new NodeObject(node);
     }
 
     $(selector, self) {
@@ -452,7 +458,12 @@ class XmlParser extends NodeBase {
     }
 
     toString(options = {}) {
-        const {encoding = 'utf-8', format = false, noHeader = false, expandEmpty = false} = options;
+        const {
+            encoding = 'utf-8',
+            format = false,
+            noHeader = false,
+            expandEmpty = false
+        } = options;
 
         let deepType = 0;
         let out = '';
@@ -545,7 +556,7 @@ class XmlParser extends NodeBase {
                 return;
 
             if (!ignoreNode && pickNode) {
-                route += `/${tag}`;
+                route += `${route ? '/' : ''}${tag}`;
                 ignoreNode = !pickNode(route);
             }
 

From 4b5949e3bcaf7f162e1d8381b2fc49059ffc435b Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 8 Nov 2022 22:02:35 +0700
Subject: [PATCH 19/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20XmlParser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/XmlParser.js | 99 +++++++++++++++++++++++++++++++++++-
 1 file changed, 97 insertions(+), 2 deletions(-)

diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
index 8591e85..a24cd2d 100644
--- a/server/core/xml/XmlParser.js
+++ b/server/core/xml/XmlParser.js
@@ -485,7 +485,7 @@ class XmlParser extends NodeBase {
 
                 if (node.type === NODE) {
                     if (!node.name)
-                        break;
+                        continue;
 
                     let attrs = '';
 
@@ -640,7 +640,102 @@ class XmlParser extends NodeBase {
             onStartNode, onEndNode, onTextNode, onCdata, onComment, lowerCase
         });
 
-        this.rawNodes = parsed;        
+        this.rawNodes = parsed;
+    }
+
+    toObject() {
+        const nodesToObject = (nodes) => {
+            const result = {};
+
+            for (const n of nodes) {
+                const node = new NodeObject(n);
+
+                if (node.type === NODE) {
+                    if (!node.name)
+                        continue;
+
+                    let newNode = {};
+
+                    const nodeAttrs = node.attrs();
+                    if (nodeAttrs)
+                        newNode['*ATTRS'] = Object.fromEntries(nodeAttrs);
+
+                    if (node.value) {
+                        Object.assign(newNode, nodesToObject(node.value));
+
+                        //схлопывание узла до строки
+                        if (!Array.isArray(newNode)
+                            && Object.prototype.hasOwnProperty.call(newNode, '*TEXT')
+                            && Object.keys(newNode).length === 1) {
+                            newNode = newNode['*TEXT'];
+                        }
+                    }
+
+                    if (!Object.prototype.hasOwnProperty.call(result, node.name)) {
+                        result[node.name] = newNode;
+                    } else {
+                        if (!Array.isArray(result[node.name])) {
+                            result[node.name] = [result[node.name]];
+                        }
+
+                        result[node.name].push(newNode);
+                    }
+                } else if (node.type === TEXT) {
+                    if (!result['*TEXT'])
+                        result['*TEXT'] = '';
+                    result['*TEXT'] += node.value || '';
+                } else if (node.type === CDATA) {
+                    if (!result['*CDATA'])
+                        result['*CDATA'] = '';
+                    result['*CDATA'] += node.value || '';
+                } else if (node.type === COMMENT) {
+                    if (!result['*COMMENT'])
+                        result['*COMMENT'] = '';
+                    result['*COMMENT'] += node.value || '';
+                }
+            }
+
+            return result;
+        }
+
+        return nodesToObject(this.rawNodes);
+    }
+
+    fromObject(xmlObject) {
+        const objectToNodes = (obj) => {
+            const result = [];
+
+            for (const [tag, objNode] of Object.entries(obj)) {
+                if (tag === '*TEXT') {
+                    result.push(this.createText(objNode).raw);
+                } else if (tag === '*CDATA') {
+                    result.push(this.createCdata(objNode).raw);
+                } else if (tag === '*COMMENT') {
+                    result.push(this.createComment(objNode).raw);
+                } else if (tag === '*ATTRS') {
+                    //пропускаем
+                } else {
+                    if (typeof(objNode) === 'string') {
+                        result.push(this.createNode(tag, null, [this.createText(objNode).raw]).raw);
+                    } else if (Array.isArray(objNode)) {
+                        for (const n of objNode) {
+                            if (typeof(n) === 'string') {
+                                result.push(this.createNode(tag, null, [this.createText(n).raw]).raw);
+                            } else if (typeof(n) === 'object') {
+                                result.push(this.createNode(tag, (n['*ATTRS'] ? Object.entries(n['*ATTRS']) : null), objectToNodes(n)).raw);
+                            }
+                        }
+
+                    } else if (typeof(objNode) === 'object') {
+                        result.push(this.createNode(tag, (objNode['*ATTRS'] ? Object.entries(objNode['*ATTRS']) : null), objectToNodes(objNode)).raw);
+                    }
+                }
+            }
+
+            return result;
+        };
+
+        this.rawNodes = objectToNodes(xmlObject);
     }
 }
 

From 40f72d17e6d4beea02bdfc9f44d912a27210492d Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 8 Nov 2022 22:07:11 +0700
Subject: [PATCH 20/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20BookInfoDialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/WebWorker.js     | 13 ++++++-------
 server/core/xml/Fb2Parser.js | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/server/core/WebWorker.js b/server/core/WebWorker.js
index 0cb502f..e7c68f5 100644
--- a/server/core/WebWorker.js
+++ b/server/core/WebWorker.js
@@ -473,15 +473,14 @@ class WebWorker {
                 const rows = await db.select({table: 'book', where: `@@id(${db.esc(bookId)})`});
                 const book = rows[0];
 
-                let fb2 = false;
-                if (book.ext == 'fb2') {
-                    const parsedFb2 = await this.fb2Parser.getDescAndCover(bookFile);
-                    fb2 = parsedFb2;
-                }
-
                 bookInfo.book = book;
-                bookInfo.fb2 = fb2;
                 bookInfo.cover = '';
+                bookInfo.fb2 = false;
+
+                if (book.ext == 'fb2') {
+                    const {desc, cover} = await this.fb2Parser.getDescAndCover(bookFile);
+                    bookInfo.fb2 = desc;
+                }
 
                 await fs.writeFile(bookFileInfo, JSON.stringify(bookInfo, null, 2));
             } else {
diff --git a/server/core/xml/Fb2Parser.js b/server/core/xml/Fb2Parser.js
index 05383e9..13a2824 100644
--- a/server/core/xml/Fb2Parser.js
+++ b/server/core/xml/Fb2Parser.js
@@ -2,7 +2,7 @@ const fs = require('fs-extra');
 const iconv = require('iconv-lite');
 const textUtils = require('./textUtils');
 
-const xmlParser = require('./xmlParser');
+const XmlParser = require('./XmlParser');
 const utils = require('../utils');
 
 class Fb2Parser {
@@ -55,12 +55,20 @@ class Fb2Parser {
         data = await utils.gunzipBuffer(data);
         //data = this.checkEncoding(data);
 
-        const result = xmlParser.parseXml(data.toString(), true, (route) => {
-            console.log(route);
-            return true;
+        const xml = new XmlParser();
+
+        xml.fromString(data.toString(), {
+            lowerCase: true,
+            pickNode: route => route.indexOf('fictionbook/body') !== 0,
         });
 
-        return xmlParser.simplifyXmlParsed(result);
+        let cover = null;
+        //console.log(xml.toString());
+        //xml.each(node => console.log(node.name));
+
+        const desc = xml.$$('description').toObject();
+
+        return {desc, cover};
     }
 }
 

From 04a8ba8426e571cb2d47b3774faec83770551a5f Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 9 Nov 2022 14:44:00 +0700
Subject: [PATCH 21/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20XmlParser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/XmlParser.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
index a24cd2d..fedc362 100644
--- a/server/core/xml/XmlParser.js
+++ b/server/core/xml/XmlParser.js
@@ -455,6 +455,8 @@ class XmlParser extends NodeBase {
             throw new Error('JSON parse error: root element must be array');
 
         this.rawNodes = parsed;
+
+        return this;
     }
 
     toString(options = {}) {
@@ -641,9 +643,15 @@ class XmlParser extends NodeBase {
         });
 
         this.rawNodes = parsed;
+
+        return this;
     }
 
-    toObject() {
+    toObject(options = {}) {
+        const {
+            compactText = false
+        } = options;
+
         const nodesToObject = (nodes) => {
             const result = {};
 
@@ -663,8 +671,9 @@ class XmlParser extends NodeBase {
                     if (node.value) {
                         Object.assign(newNode, nodesToObject(node.value));
 
-                        //схлопывание узла до строки
-                        if (!Array.isArray(newNode)
+                        //схлопывание текстового узла до string
+                        if (compactText
+                            && !Array.isArray(newNode)
                             && Object.prototype.hasOwnProperty.call(newNode, '*TEXT')
                             && Object.keys(newNode).length === 1) {
                             newNode = newNode['*TEXT'];
@@ -736,6 +745,8 @@ class XmlParser extends NodeBase {
         };
 
         this.rawNodes = objectToNodes(xmlObject);
+
+        return this;
     }
 }
 

From 927dade502eb8d0c48a8393f664aa5713beb61fa Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 9 Nov 2022 14:45:40 +0700
Subject: [PATCH 22/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20Fb2Parser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/Fb2Parser.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/core/xml/Fb2Parser.js b/server/core/xml/Fb2Parser.js
index 13a2824..6839dbe 100644
--- a/server/core/xml/Fb2Parser.js
+++ b/server/core/xml/Fb2Parser.js
@@ -53,7 +53,8 @@ class Fb2Parser {
     async getDescAndCover(bookFile) {
         let data = await fs.readFile(bookFile);
         data = await utils.gunzipBuffer(data);
-        //data = this.checkEncoding(data);
+
+        data = this.checkEncoding(data);
 
         const xml = new XmlParser();
 

From f1db203027d58075fd28b87c3cc0c8623417c7f1 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 9 Nov 2022 14:47:55 +0700
Subject: [PATCH 23/42] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/WebWorker.js              | 2 +-
 server/core/{xml => fb2}/Fb2Parser.js | 2 +-
 server/core/{xml => fb2}/textUtils.js | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename server/core/{xml => fb2}/Fb2Parser.js (98%)
 rename server/core/{xml => fb2}/textUtils.js (100%)

diff --git a/server/core/WebWorker.js b/server/core/WebWorker.js
index e7c68f5..f0e321f 100644
--- a/server/core/WebWorker.js
+++ b/server/core/WebWorker.js
@@ -15,7 +15,7 @@ const ayncExit = new (require('./AsyncExit'))();
 const log = new (require('./AppLogger'))().log;//singleton
 const utils = require('./utils');
 const genreTree = require('./genres');
-const Fb2Parser = require('./xml/Fb2Parser');
+const Fb2Parser = require('./fb2/Fb2Parser');
 
 //server states
 const ssNormal = 'normal';
diff --git a/server/core/xml/Fb2Parser.js b/server/core/fb2/Fb2Parser.js
similarity index 98%
rename from server/core/xml/Fb2Parser.js
rename to server/core/fb2/Fb2Parser.js
index 6839dbe..c3e1323 100644
--- a/server/core/xml/Fb2Parser.js
+++ b/server/core/fb2/Fb2Parser.js
@@ -2,7 +2,7 @@ const fs = require('fs-extra');
 const iconv = require('iconv-lite');
 const textUtils = require('./textUtils');
 
-const XmlParser = require('./XmlParser');
+const XmlParser = require('../xml/XmlParser');
 const utils = require('../utils');
 
 class Fb2Parser {
diff --git a/server/core/xml/textUtils.js b/server/core/fb2/textUtils.js
similarity index 100%
rename from server/core/xml/textUtils.js
rename to server/core/fb2/textUtils.js

From b64c5de5a342f672f38fffc2e5a4299f314d1345 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 9 Nov 2022 16:37:10 +0700
Subject: [PATCH 24/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20XmlParser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/ObjectNavigator.js | 111 +++++++++++++++++++++++++++++
 server/core/xml/XmlParser.js       |  11 ++-
 2 files changed, 119 insertions(+), 3 deletions(-)
 create mode 100644 server/core/xml/ObjectNavigator.js

diff --git a/server/core/xml/ObjectNavigator.js b/server/core/xml/ObjectNavigator.js
new file mode 100644
index 0000000..b2331f5
--- /dev/null
+++ b/server/core/xml/ObjectNavigator.js
@@ -0,0 +1,111 @@
+class ObjectNavigator {
+    constructor(raw = null) {
+        if (Array.isArray(raw))
+            this.raw = raw;
+        else
+            this.raw = [raw];
+    }
+
+    makeSelector(selector) {
+        const result = [];
+        selector = selector.trim();
+        
+        //последний индекс не учитывется, только если не задан явно
+        if (selector && selector[selector.length - 1] == ']')
+            selector += '/';
+
+        const levels = selector.split('/');
+
+        for (const level of levels) {
+            const [name, indexPart] = level.split('[');
+            let index = 0;
+            if (indexPart) {
+                const i = indexPart.indexOf(']');
+                index = parseInt(indexPart.substring(0, i), 10) || 0;
+            }
+
+            result.push({name, index});
+        }
+
+        if (result.length);
+            result[result.length - 1].last = true;
+
+        return result;
+    }
+
+    select(selector = '') {
+        selector = this.makeSelector(selector);
+
+        let raw = this.raw;
+        for (const s of selector) {
+            if (s.name) {
+                raw = raw[0];
+                if (typeof(raw) === 'object' && !Array.isArray(raw))
+                    raw = raw[s.name];
+                else
+                    raw = null;
+
+                if (raw !== null && !s.last) {
+                    if (Array.isArray(raw))
+                        raw = raw[s.index];
+                    else if (s.index > 0)
+                        raw = null;
+                }
+            } else {
+                raw = raw[s.index];
+            }
+
+            if (raw === undefined || raw === null) {
+                raw = null;
+                break;
+            }
+
+            if (!Array.isArray(raw))
+                raw = [raw];
+        }
+
+        if (raw === null)
+            return null;
+
+        const result = [];
+        for (const r of raw)
+            result.push(new ObjectNavigator(r));
+
+        return result;
+    }
+
+    $$(selector) {
+        return this.select(selector);
+    }
+
+    $(selector) {
+        const res = this.select(selector);
+        return (res !== null && res.length ? res[0] : null);
+    }
+
+    get value() {
+        return (this.raw.length ? this.raw[0] : null);
+    }
+
+    text(selector = '') {
+        const res = this.$(`${selector}/*TEXT`);
+        return (res ? res.value : null);
+    }
+
+    comment(selector = '') {
+        const res = this.$(`${selector}/*COMMENT`);
+        return (res ? res.value : null);
+    }
+
+    cdata(selector = '') {
+        const res = this.$(`${selector}/*CDATA`);
+        return (res ? res.value : null);
+    }
+
+    attrs(selector = '') {
+        const res = this.$(`${selector}/*ATTRS`);
+        return (res ? res.value : null);
+    }
+}
+
+module.exports = ObjectNavigator;
\ No newline at end of file
diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
index fedc362..456629b 100644
--- a/server/core/xml/XmlParser.js
+++ b/server/core/xml/XmlParser.js
@@ -1,4 +1,5 @@
 const sax = require('./sax');
+const ObjectNavigator = require('./ObjectNavigator');
 
 //node types
 const NODE = 1;
@@ -78,11 +79,11 @@ class NodeBase {
 }
 
 class NodeObject extends NodeBase {
-    constructor(rawNode) {
+    constructor(raw = null) {
         super();
 
-        if (rawNode)
-            this.raw = rawNode;
+        if (raw)
+            this.raw = raw;
         else
             this.raw = [];
     }
@@ -748,6 +749,10 @@ class XmlParser extends NodeBase {
 
         return this;
     }
+
+    navigator() {
+        return new ObjectNavigator(this.toObject());
+    }
 }
 
 module.exports = XmlParser;
\ No newline at end of file

From 18da23530b54abd198fbf19e0e68f3776482e5dc Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 9 Nov 2022 16:47:36 +0700
Subject: [PATCH 25/42] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/ObjectNavigator.js | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/server/core/xml/ObjectNavigator.js b/server/core/xml/ObjectNavigator.js
index b2331f5..aa39057 100644
--- a/server/core/xml/ObjectNavigator.js
+++ b/server/core/xml/ObjectNavigator.js
@@ -1,9 +1,6 @@
 class ObjectNavigator {
     constructor(raw = null) {
-        if (Array.isArray(raw))
-            this.raw = raw;
-        else
-            this.raw = [raw];
+        this.raw = raw;
     }
 
     makeSelector(selector) {
@@ -39,34 +36,30 @@ class ObjectNavigator {
         let raw = this.raw;
         for (const s of selector) {
             if (s.name) {
-                raw = raw[0];
                 if (typeof(raw) === 'object' && !Array.isArray(raw))
                     raw = raw[s.name];
                 else
                     raw = null;
+            }
 
-                if (raw !== null && !s.last) {
-                    if (Array.isArray(raw))
-                        raw = raw[s.index];
-                    else if (s.index > 0)
-                        raw = null;
-                }
-            } else {
-                raw = raw[s.index];
+            if (raw !== null && !s.last) {
+                if (Array.isArray(raw))
+                    raw = raw[s.index];
+                else if (s.index > 0)
+                    raw = null;
             }
 
             if (raw === undefined || raw === null) {
                 raw = null;
                 break;
             }
-
-            if (!Array.isArray(raw))
-                raw = [raw];
         }
 
         if (raw === null)
             return null;
 
+        raw = (Array.isArray(raw) ? raw : [raw]);
+        
         const result = [];
         for (const r of raw)
             result.push(new ObjectNavigator(r));
@@ -84,7 +77,7 @@ class ObjectNavigator {
     }
 
     get value() {
-        return (this.raw.length ? this.raw[0] : null);
+        return this.raw;
     }
 
     text(selector = '') {

From 28963116c3f0315dfe5538b65c7a83ee58be08af Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 9 Nov 2022 17:22:18 +0700
Subject: [PATCH 26/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20XmlParser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/XmlParser.js | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
index 456629b..61199e8 100644
--- a/server/core/xml/XmlParser.js
+++ b/server/core/xml/XmlParser.js
@@ -186,7 +186,8 @@ class NodeObject extends NodeBase {
             return;
 
         for (const n of this.raw[3]) {
-            callback(new NodeObject(n));
+            if (callback(new NodeObject(n)) === false)
+                break;
         }
 
         return this;
@@ -199,10 +200,13 @@ class NodeObject extends NodeBase {
         const deep = (nodes, route = '') => {
             for (const n of nodes) {
                 const node = new NodeObject(n);
-                callback(node, route);
+
+                if (callback(node, route) === false)
+                    return false;
 
                 if (node.type === NODE && node.value) {
-                    deep(node.value, `${route}${route ? '/' : ''}${node.name}`);
+                    if (deep(node.value, `${route}${route ? '/' : ''}${node.name}`) === false)
+                        return false;
                 }
             }
         }
@@ -332,13 +336,15 @@ class XmlParser extends NodeBase {
     each(callback, self = false) {
         if (self) {
             for (const n of this.rawNodes) {
-                callback(new NodeObject(n));
+                if (callback(new NodeObject(n)) === false);
+                    return this;
             }
         } else {
             for (const n of this.rawNodes) {
                 if (n[0] === NODE && n[3]) {
                     for (const nn of n[3])
-                        callback(new NodeObject(nn));
+                        if (callback(new NodeObject(nn)) === false)
+                            return this;
                 }
             }
         }
@@ -354,10 +360,13 @@ class XmlParser extends NodeBase {
         const deep = (nodes, route = '') => {
             for (const n of nodes) {
                 const node = new NodeObject(n);
-                callback(node, route);
+
+                if (callback(node, route) === false)
+                    return false;
 
                 if (node.type === NODE && node.value) {
-                    deep(node.value, `${route}${route ? '/' : ''}${node.name}`);
+                    if (deep(node.value, `${route}${route ? '/' : ''}${node.name}`) === false)
+                        return false;
                 }
             }
         }
@@ -367,7 +376,8 @@ class XmlParser extends NodeBase {
         } else {
             for (const n of this.rawNodes) {
                 if (n[0] === NODE && n[3])
-                    deep(n[3]);
+                    if (deep(n[3]) === false)
+                        break;
             }
         }
 
@@ -750,8 +760,11 @@ class XmlParser extends NodeBase {
         return this;
     }
 
-    navigator() {
-        return new ObjectNavigator(this.toObject());
+    navigator(obj) {
+        if (!obj)
+            obj = this.toObject();
+
+        return new ObjectNavigator(obj);
     }
 }
 

From 2fa48cdde63b8105856e8ab9354688dd2b3dbf3f Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 9 Nov 2022 18:26:19 +0700
Subject: [PATCH 27/42] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/xml/XmlParser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
index 61199e8..ec56c01 100644
--- a/server/core/xml/XmlParser.js
+++ b/server/core/xml/XmlParser.js
@@ -336,7 +336,7 @@ class XmlParser extends NodeBase {
     each(callback, self = false) {
         if (self) {
             for (const n of this.rawNodes) {
-                if (callback(new NodeObject(n)) === false);
+                if (callback(new NodeObject(n)) === false)
                     return this;
             }
         } else {

From 7b5061df5f9a36b1fd1551874b096dcca700989b Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 9 Nov 2022 18:26:29 +0700
Subject: [PATCH 28/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20BookInfoDialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/WebWorker.js     | 40 ++++++++++++++++++++++++++++--------
 server/core/fb2/Fb2Parser.js | 36 +++++++++++++++++++++++++++-----
 2 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/server/core/WebWorker.js b/server/core/WebWorker.js
index f0e321f..f01829d 100644
--- a/server/core/WebWorker.js
+++ b/server/core/WebWorker.js
@@ -469,24 +469,48 @@ class WebWorker {
             const bookFile = `${this.config.filesDir}/${hash}`;
             const bookFileInfo = `${bookFile}.info`;
 
-            if (!await fs.pathExists(bookFileInfo)) {
+            const restoreBookInfo = async() => {
+                const result = {};
+
                 const rows = await db.select({table: 'book', where: `@@id(${db.esc(bookId)})`});
                 const book = rows[0];
 
-                bookInfo.book = book;
-                bookInfo.cover = '';
-                bookInfo.fb2 = false;
+                result.book = book;
+                result.cover = '';
+                result.fb2 = false;
 
                 if (book.ext == 'fb2') {
-                    const {desc, cover} = await this.fb2Parser.getDescAndCover(bookFile);
-                    bookInfo.fb2 = desc;
+                    const {desc, cover, coverExt} = await this.fb2Parser.getDescAndCover(bookFile);
+                    result.fb2 = desc;
+
+                    if (cover) {
+                        result.cover = `${this.config.filesPathStatic}/${hash}${coverExt}`;
+                        await fs.writeFile(`${bookFile}${coverExt}`, cover);
+                    }
                 }
 
+                return result;
+            };
+
+            if (!await fs.pathExists(bookFileInfo)) {
+                Object.assign(bookInfo, await restoreBookInfo());
                 await fs.writeFile(bookFileInfo, JSON.stringify(bookInfo, null, 2));
             } else {
                 await utils.touchFile(bookFileInfo);
-                const info = fs.readFile(bookFileInfo, 'utf-8');
-                bookInfo = JSON.parse(info);
+                const info = await fs.readFile(bookFileInfo, 'utf-8');
+                const tmpInfo = JSON.parse(info);
+
+                //проверим существование файла обложки, восстановим если нету
+                let coverFile = '';
+                if (tmpInfo.cover)
+                    coverFile = `${this.config.publicFilesDir}${tmpInfo.cover}`;
+
+                if (coverFile && !await fs.pathExists(coverFile)) {
+                    Object.assign(bookInfo, await restoreBookInfo());
+                    await fs.writeFile(bookFileInfo, JSON.stringify(bookInfo, null, 2));
+                } else {
+                    bookInfo = tmpInfo;
+                }
             }
 
             return {bookInfo};
diff --git a/server/core/fb2/Fb2Parser.js b/server/core/fb2/Fb2Parser.js
index c3e1323..3cf2564 100644
--- a/server/core/fb2/Fb2Parser.js
+++ b/server/core/fb2/Fb2Parser.js
@@ -63,13 +63,39 @@ class Fb2Parser {
             pickNode: route => route.indexOf('fictionbook/body') !== 0,
         });
 
-        let cover = null;
-        //console.log(xml.toString());
-        //xml.each(node => console.log(node.name));
-
         const desc = xml.$$('description').toObject();
+        const coverImage = xml.navigator(desc).$('description/title-info/coverpage/image');
 
-        return {desc, cover};
+        let cover = null;
+        let coverExt = '';
+        if (coverImage) {
+            const coverAttrs = coverImage.attrs();
+            const href = coverAttrs['l:href'];
+            let coverType = coverAttrs['content-type'];
+            coverType = (coverType == 'image/jpg' || coverType == 'application/octet-stream' ? 'image/jpeg' : coverType);
+            coverExt = (coverType == 'image/png' ? '.png' : '.jpg');
+
+            if (href) {
+                const binaryId = (href[0] == '#' ? href.substring(1) : href);
+
+                //найдем нужный image
+                xml.$$('binary').eachSelf(node => {
+                    let attrs = node.attrs();
+                    if (!attrs)
+                        return;
+                    attrs = Object.fromEntries(attrs);
+
+                    if (attrs.id === binaryId) {
+                        const textNode = new XmlParser(node.value);
+                        const base64 = textNode.$self('*TEXT').value;
+
+                        cover = (base64 ? Buffer.from(base64, 'base64') : null);
+                    }
+                });
+            }
+        }
+
+        return {desc, cover, coverExt};
     }
 }
 

From ffc65ab9446194e8ec43cbe369016795e3fbfeb0 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 9 Nov 2022 19:25:59 +0700
Subject: [PATCH 29/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20BookInfoDialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/App.vue                     |  4 ++
 .../Search/BookInfoDialog/BookInfoDialog.vue  | 42 ++++++++++++++++++-
 client/components/Search/Search.vue           |  2 +-
 server/core/xml/ObjectNavigator.js            |  7 +++-
 4 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/client/components/App.vue b/client/components/App.vue
index b36ba19..dc81796 100644
--- a/client/components/App.vue
+++ b/client/components/App.vue
@@ -133,6 +133,10 @@ body, html, #app {
     animation: rotating 2s linear infinite;
 }
 
+.q-dialog__inner--minimized > div {
+    max-width: 800px;
+}
+
 @keyframes rotating { 
     from { 
         transform: rotate(0deg); 
diff --git a/client/components/Search/BookInfoDialog/BookInfoDialog.vue b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
index 2c3ce57..dc43230 100644
--- a/client/components/Search/BookInfoDialog/BookInfoDialog.vue
+++ b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
@@ -8,7 +8,8 @@
             </div>
         </template>
 
-        <div ref="box" class="column q-mt-xs overflow-auto no-wrap" style="width: 200px; padding: 0px 10px 10px 10px;">
+        <div ref="box" class="column q-mt-xs overflow-auto no-wrap" style="padding: 0px 10px 10px 10px;">
+            <div v-html="annotation" />
         </div>
 
         <template #footer>
@@ -24,6 +25,7 @@
 import vueComponent from '../../vueComponent.js';
 
 import Dialog from '../../share/Dialog.vue';
+import XmlParser from '../../../../server/core/xml/XmlParser';
 
 const componentOptions = {
     components: {
@@ -36,23 +38,50 @@ const componentOptions = {
         dialogVisible(newValue) {
             this.$emit('update:modelValue', newValue);
         },
+        bookInfo() {
+            this.parseBookInfo();
+        }
     }
 };
 class BookInfoDialog {
     _options = componentOptions;
     _props = {
         modelValue: Boolean,
+        bookInfo: Object,
     };
 
     dialogVisible = false;
 
+    //info props
+    annotation = '';
+
     created() {
         this.commit = this.$store.commit;
+        this.parseBookInfo();
     }
 
     mounted() {
     }
 
+    parseBookInfo() {
+        const bookInfo = this.bookInfo;
+        const xml = new XmlParser();
+
+        //defaults
+        this.annotation = '';
+
+        if (bookInfo.fb2) {
+            const desc = xml.navigator(bookInfo.fb2);
+
+            //annotation
+            const annObj = desc.v('description/title-info/annotation');
+            if (annObj) {
+                this.annotation = xml.fromObject(annObj).toString({noHeader: true});
+                this.annotation = this.annotation.replace(/<p>/g, `<p class="p-annotation">`);
+            }
+        }
+    }
+
     okClick() {
         this.dialogVisible = false;
     }
@@ -63,4 +92,13 @@ export default vueComponent(BookInfoDialog);
 </script>
 
 <style scoped>
-</style>
\ No newline at end of file
+</style>
+
+<style>
+.p-annotation {
+    text-indent: 20px;
+    text-align: justify;
+    padding: 0;
+    margin: 0;
+}
+</style>
diff --git a/client/components/Search/Search.vue b/client/components/Search/Search.vue
index bed5d14..a07514d 100644
--- a/client/components/Search/Search.vue
+++ b/client/components/Search/Search.vue
@@ -250,7 +250,7 @@
         <SelectLangDialog v-model="selectLangDialogVisible" v-model:lang="search.lang" :lang-list="langList" :lang-default="langDefault" />        
         <SelectLibRateDialog v-model="selectLibRateDialogVisible" v-model:librate="search.librate" />
         <SelectDateDialog v-model="selectDateDialogVisible" v-model:date="search.date" />
-        <BookInfoDialog v-model="bookInfoDialogVisible" book-info="bookInfo" />
+        <BookInfoDialog v-model="bookInfoDialogVisible" :book-info="bookInfo" />
     </div>
 </template>
 
diff --git a/server/core/xml/ObjectNavigator.js b/server/core/xml/ObjectNavigator.js
index aa39057..929422b 100644
--- a/server/core/xml/ObjectNavigator.js
+++ b/server/core/xml/ObjectNavigator.js
@@ -59,7 +59,7 @@ class ObjectNavigator {
             return null;
 
         raw = (Array.isArray(raw) ? raw : [raw]);
-        
+
         const result = [];
         for (const r of raw)
             result.push(new ObjectNavigator(r));
@@ -80,6 +80,11 @@ class ObjectNavigator {
         return this.raw;
     }
 
+    v(selector = '') {
+        const res = this.$(selector);
+        return (res ? res.value : null);
+    }
+
     text(selector = '') {
         const res = this.$(`${selector}/*TEXT`);
         return (res ? res.value : null);

From 8ee1b98a12e4cbf871b0279a3270b1cc38d67fe8 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 9 Nov 2022 23:58:08 +0700
Subject: [PATCH 30/42] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=82=D0=B4=D0=B0=D1=87=D0=B0?=
 =?UTF-8?q?=20=D1=81=D1=82=D0=B0=D1=82=D0=B8=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/index.js | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/server/index.js b/server/index.js
index 99383c1..15e387f 100644
--- a/server/index.js
+++ b/server/index.js
@@ -189,32 +189,31 @@ function initStatic(app, config) {
             return next();
         }
 
-        if (path.extname(req.path) == '.json')
-            return next();
+        if (path.extname(req.path) == '') {
+            const bookFile = `${config.publicFilesDir}${req.path}`;
+            const bookFileDesc = `${bookFile}.json`;
 
-        const bookFile = `${config.publicFilesDir}${req.path}`;
-        const bookFileDesc = `${bookFile}.json`;
+            let downFileName = '';
+            //восстановим из json-файла описания
+            try {
+                if (await fs.pathExists(bookFile) && await fs.pathExists(bookFileDesc)) {
+                    await utils.touchFile(bookFile);
+                    await utils.touchFile(bookFileDesc);
 
-        let downFileName = '';
-        //восстановим из json-файла описания
-        try {
-            if (await fs.pathExists(bookFile) && await fs.pathExists(bookFileDesc)) {
-                await utils.touchFile(bookFile);
-                await utils.touchFile(bookFileDesc);
-
-                let desc = await fs.readFile(bookFileDesc, 'utf8');
-                desc = JSON.parse(desc);
-                downFileName = desc.downFileName;
-            } else {
-                await fs.remove(bookFile);
-                await fs.remove(bookFileDesc);
+                    let desc = await fs.readFile(bookFileDesc, 'utf8');
+                    desc = JSON.parse(desc);
+                    downFileName = desc.downFileName;
+                } else {
+                    await fs.remove(bookFile);
+                    await fs.remove(bookFileDesc);
+                }
+            } catch(e) {
+                log(LM_ERR, e.message);
             }
-        } catch(e) {
-            log(LM_ERR, e.message);
-        }
 
-        if (downFileName)
-            res.downFileName = downFileName;
+            if (downFileName)
+                res.downFileName = downFileName;
+        }
 
         return next();
     });

From ec6b72868b7a5c273d010e778abd1bbacb0961fa Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 10 Nov 2022 00:40:44 +0700
Subject: [PATCH 31/42] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/WebWorker.js                      |   6 +-
 server/core/fb2/Fb2Parser.js                  | 108 ++++--------------
 ...{ObjectNavigator.js => ObjectInspector.js} |   6 +-
 server/core/xml/XmlParser.js                  |   6 +-
 4 files changed, 31 insertions(+), 95 deletions(-)
 rename server/core/xml/{ObjectNavigator.js => ObjectInspector.js} (96%)

diff --git a/server/core/WebWorker.js b/server/core/WebWorker.js
index f01829d..ae54819 100644
--- a/server/core/WebWorker.js
+++ b/server/core/WebWorker.js
@@ -15,7 +15,7 @@ const ayncExit = new (require('./AsyncExit'))();
 const log = new (require('./AppLogger'))().log;//singleton
 const utils = require('./utils');
 const genreTree = require('./genres');
-const Fb2Parser = require('./fb2/Fb2Parser');
+const Fb2Helper = require('./fb2/Fb2Helper');
 
 //server states
 const ssNormal = 'normal';
@@ -45,7 +45,7 @@ class WebWorker {
             }
             
             this.inpxHashCreator = new InpxHashCreator(config);
-            this.fb2Parser = new Fb2Parser();
+            this.fb2Helper = new Fb2Helper();
             this.inpxFileHash = '';
 
             this.wState = this.workerState.getControl('server_state');
@@ -480,7 +480,7 @@ class WebWorker {
                 result.fb2 = false;
 
                 if (book.ext == 'fb2') {
-                    const {desc, cover, coverExt} = await this.fb2Parser.getDescAndCover(bookFile);
+                    const {desc, cover, coverExt} = await this.fb2Helper.getDescAndCover(bookFile);
                     result.fb2 = desc;
 
                     if (cover) {
diff --git a/server/core/fb2/Fb2Parser.js b/server/core/fb2/Fb2Parser.js
index 3cf2564..97708d2 100644
--- a/server/core/fb2/Fb2Parser.js
+++ b/server/core/fb2/Fb2Parser.js
@@ -1,101 +1,37 @@
-const fs = require('fs-extra');
-const iconv = require('iconv-lite');
-const textUtils = require('./textUtils');
-
 const XmlParser = require('../xml/XmlParser');
-const utils = require('../utils');
 
 class Fb2Parser {
-    checkEncoding(data) {
-        //Корректируем кодировку UTF-16
-        let encoding = textUtils.getEncoding(data);
-        if (encoding.indexOf('UTF-16') == 0) {
-            data = Buffer.from(iconv.decode(data, encoding));
-            encoding = 'utf-8';
-        }
-
-        //Корректируем пробелы, всякие файлы попадаются :(
-        if (data[0] == 32) {
-            data = Buffer.from(data.toString().trim());
-        }
-
-        //Окончательно корректируем кодировку
-        let result = data;
-
-        let left = data.indexOf('<?xml version="1.0"');
-        if (left < 0) {
-            left = data.indexOf('<?xml version=\'1.0\'');
-        }
-
-        if (left >= 0) {
-            const right = data.indexOf('?>', left);
-            if (right >= 0) {
-                const head = data.slice(left, right + 2).toString();
-                const m = head.match(/encoding=['"](.*?)['"]/);
-                if (m) {
-                    let enc = m[1].toLowerCase();
-                    if (enc != 'utf-8') {
-                        //enc может не соответсвовать реальной кодировке файла, поэтому:
-                        if (encoding.indexOf('ISO-8859') >= 0) {
-                            encoding = enc;
-                        }
-
-                        result = iconv.decode(data, encoding);
-                        result = Buffer.from(result.toString().replace(m[0], `encoding="utf-8"`));
-                    }
-                }
-            }
-        }
-
-        return result;
+    constructor() {
+        this.xml = new XmlParser();
     }
 
-    async getDescAndCover(bookFile) {
-        let data = await fs.readFile(bookFile);
-        data = await utils.gunzipBuffer(data);
+    toString(options) {
+        return this.xml.toString(options);
+    }
 
-        data = this.checkEncoding(data);
+    fromString(fb2String) {
+        this.xml.fromString(fb2String);
+        return this;
+    }
 
-        const xml = new XmlParser();
+    toObject(options) {
+        return this.xml.toObject(options);
+    }
 
-        xml.fromString(data.toString(), {
-            lowerCase: true,
-            pickNode: route => route.indexOf('fictionbook/body') !== 0,
-        });
+    fromObject(fb2Object) {
+        this.xml.fromObject(fb2Object);
+        return this;
+    }
 
-        const desc = xml.$$('description').toObject();
-        const coverImage = xml.navigator(desc).$('description/title-info/coverpage/image');
+    bookInfo(fb2Object) {
+        if (!fb2Object)
+            fb2Object = this.toObject();
 
-        let cover = null;
-        let coverExt = '';
-        if (coverImage) {
-            const coverAttrs = coverImage.attrs();
-            const href = coverAttrs['l:href'];
-            let coverType = coverAttrs['content-type'];
-            coverType = (coverType == 'image/jpg' || coverType == 'application/octet-stream' ? 'image/jpeg' : coverType);
-            coverExt = (coverType == 'image/png' ? '.png' : '.jpg');
+        //const result = {};
 
-            if (href) {
-                const binaryId = (href[0] == '#' ? href.substring(1) : href);
+    }
 
-                //найдем нужный image
-                xml.$$('binary').eachSelf(node => {
-                    let attrs = node.attrs();
-                    if (!attrs)
-                        return;
-                    attrs = Object.fromEntries(attrs);
-
-                    if (attrs.id === binaryId) {
-                        const textNode = new XmlParser(node.value);
-                        const base64 = textNode.$self('*TEXT').value;
-
-                        cover = (base64 ? Buffer.from(base64, 'base64') : null);
-                    }
-                });
-            }
-        }
-
-        return {desc, cover, coverExt};
+    bookInfoList(fb2Object) {
     }
 }
 
diff --git a/server/core/xml/ObjectNavigator.js b/server/core/xml/ObjectInspector.js
similarity index 96%
rename from server/core/xml/ObjectNavigator.js
rename to server/core/xml/ObjectInspector.js
index 929422b..616228d 100644
--- a/server/core/xml/ObjectNavigator.js
+++ b/server/core/xml/ObjectInspector.js
@@ -1,4 +1,4 @@
-class ObjectNavigator {
+class ObjectInspector {
     constructor(raw = null) {
         this.raw = raw;
     }
@@ -62,7 +62,7 @@ class ObjectNavigator {
 
         const result = [];
         for (const r of raw)
-            result.push(new ObjectNavigator(r));
+            result.push(new ObjectInspector(r));
 
         return result;
     }
@@ -106,4 +106,4 @@ class ObjectNavigator {
     }
 }
 
-module.exports = ObjectNavigator;
\ No newline at end of file
+module.exports = ObjectInspector;
\ No newline at end of file
diff --git a/server/core/xml/XmlParser.js b/server/core/xml/XmlParser.js
index ec56c01..26da7e7 100644
--- a/server/core/xml/XmlParser.js
+++ b/server/core/xml/XmlParser.js
@@ -1,5 +1,5 @@
 const sax = require('./sax');
-const ObjectNavigator = require('./ObjectNavigator');
+const ObjectInspector = require('./ObjectInspector');
 
 //node types
 const NODE = 1;
@@ -760,11 +760,11 @@ class XmlParser extends NodeBase {
         return this;
     }
 
-    navigator(obj) {
+    inspector(obj) {
         if (!obj)
             obj = this.toObject();
 
-        return new ObjectNavigator(obj);
+        return new ObjectInspector(obj);
     }
 }
 

From 1d99472ca18fb8063d9d0227cf4a2e67b03d1e10 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 10 Nov 2022 00:51:18 +0700
Subject: [PATCH 32/42] =?UTF-8?q?=D0=A0=D0=B5=D1=81=D1=82=D1=80=D1=83?=
 =?UTF-8?q?=D0=BA=D1=82=D1=83=D1=80=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/fb2/Fb2Helper.js | 102 +++++++++++++++++++++++++++++++++++
 server/core/fb2/Fb2Parser.js |  51 ++++++++++--------
 2 files changed, 130 insertions(+), 23 deletions(-)
 create mode 100644 server/core/fb2/Fb2Helper.js

diff --git a/server/core/fb2/Fb2Helper.js b/server/core/fb2/Fb2Helper.js
new file mode 100644
index 0000000..4bb07f3
--- /dev/null
+++ b/server/core/fb2/Fb2Helper.js
@@ -0,0 +1,102 @@
+const fs = require('fs-extra');
+const iconv = require('iconv-lite');
+const textUtils = require('./textUtils');
+
+const Fb2Parser = require('../fb2/Fb2Parser');
+const utils = require('../utils');
+
+class Fb2Helper {
+    checkEncoding(data) {
+        //Корректируем кодировку UTF-16
+        let encoding = textUtils.getEncoding(data);
+        if (encoding.indexOf('UTF-16') == 0) {
+            data = Buffer.from(iconv.decode(data, encoding));
+            encoding = 'utf-8';
+        }
+
+        //Корректируем пробелы, всякие файлы попадаются :(
+        if (data[0] == 32) {
+            data = Buffer.from(data.toString().trim());
+        }
+
+        //Окончательно корректируем кодировку
+        let result = data;
+
+        let left = data.indexOf('<?xml version="1.0"');
+        if (left < 0) {
+            left = data.indexOf('<?xml version=\'1.0\'');
+        }
+
+        if (left >= 0) {
+            const right = data.indexOf('?>', left);
+            if (right >= 0) {
+                const head = data.slice(left, right + 2).toString();
+                const m = head.match(/encoding=['"](.*?)['"]/);
+                if (m) {
+                    let enc = m[1].toLowerCase();
+                    if (enc != 'utf-8') {
+                        //enc может не соответсвовать реальной кодировке файла, поэтому:
+                        if (encoding.indexOf('ISO-8859') >= 0) {
+                            encoding = enc;
+                        }
+
+                        result = iconv.decode(data, encoding);
+                        result = Buffer.from(result.toString().replace(m[0], `encoding="utf-8"`));
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
+    async getDescAndCover(bookFile) {
+        let data = await fs.readFile(bookFile);
+        data = await utils.gunzipBuffer(data);
+
+        data = this.checkEncoding(data);
+
+        const fb2 = new Fb2Parser();
+
+        fb2.fromString(data.toString(), {
+            lowerCase: true,
+            pickNode: route => route.indexOf('fictionbook/body') !== 0,
+        });
+
+        const desc = fb2.$$('description').toObject();
+        const coverImage = fb2.inspector(desc).$('description/title-info/coverpage/image');
+
+        let cover = null;
+        let coverExt = '';
+        if (coverImage) {
+            const coverAttrs = coverImage.attrs();
+            const href = coverAttrs['l:href'];
+            let coverType = coverAttrs['content-type'];
+            coverType = (coverType == 'image/jpg' || coverType == 'application/octet-stream' ? 'image/jpeg' : coverType);
+            coverExt = (coverType == 'image/png' ? '.png' : '.jpg');
+
+            if (href) {
+                const binaryId = (href[0] == '#' ? href.substring(1) : href);
+
+                //найдем нужный image
+                fb2.$$('binary').eachSelf(node => {
+                    let attrs = node.attrs();
+                    if (!attrs)
+                        return;
+                    attrs = Object.fromEntries(attrs);
+
+                    if (attrs.id === binaryId) {
+                        const textNode = new Fb2Parser(node.value);
+                        const base64 = textNode.$self('*TEXT').value;
+
+                        cover = (base64 ? Buffer.from(base64, 'base64') : null);
+                    }
+                });
+            }
+        }
+
+        return {desc, cover, coverExt};
+    }
+}
+
+module.exports = Fb2Helper;
\ No newline at end of file
diff --git a/server/core/fb2/Fb2Parser.js b/server/core/fb2/Fb2Parser.js
index 97708d2..13806bf 100644
--- a/server/core/fb2/Fb2Parser.js
+++ b/server/core/fb2/Fb2Parser.js
@@ -1,28 +1,6 @@
 const XmlParser = require('../xml/XmlParser');
 
-class Fb2Parser {
-    constructor() {
-        this.xml = new XmlParser();
-    }
-
-    toString(options) {
-        return this.xml.toString(options);
-    }
-
-    fromString(fb2String) {
-        this.xml.fromString(fb2String);
-        return this;
-    }
-
-    toObject(options) {
-        return this.xml.toObject(options);
-    }
-
-    fromObject(fb2Object) {
-        this.xml.fromObject(fb2Object);
-        return this;
-    }
-
+class Fb2Parser extends XmlParser {
     bookInfo(fb2Object) {
         if (!fb2Object)
             fb2Object = this.toObject();
@@ -33,6 +11,33 @@ class Fb2Parser {
 
     bookInfoList(fb2Object) {
     }
+
+    toHtml(xmlString) {
+        const substs = {
+            '<subtitle>': '<p><b>',
+            '</subtitle>': '</b></p>',
+            '<empty-line/>': '<br>',
+            '<strong>': '<b>',
+            '</strong>': '</b>',
+            '<emphasis>': '<i>',
+            '</emphasis>': '</i>',
+            '<stanza>': '<br>',
+            '</stanza>': '',
+            '<poem>': '<br>',
+            '</poem>': '',
+            '<cite>': '<i>',
+            '</cite>': '</i>',
+            '<table>': '<br>',
+            '</table>': '',
+        };
+
+        for (const [tag, s] of Object.entries(substs)) {
+            const r = new RegExp(`${tag}`, 'g');
+            xmlString = xmlString.replace(r, s);
+        }
+
+        return xmlString;
+    }    
 }
 
 module.exports = Fb2Parser;
\ No newline at end of file

From 79e6ca2d275d5e8e828a39785c2de9bdc45578fa Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 10 Nov 2022 00:59:47 +0700
Subject: [PATCH 33/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20BookInfoDialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Search/BookInfoDialog/BookInfoDialog.vue  | 32 ++++++++++++++-----
 server/core/WebWorker.js                      |  4 +--
 server/core/fb2/Fb2Helper.js                  | 13 ++++----
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/client/components/Search/BookInfoDialog/BookInfoDialog.vue b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
index dc43230..1c88f49 100644
--- a/client/components/Search/BookInfoDialog/BookInfoDialog.vue
+++ b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
@@ -8,8 +8,15 @@
             </div>
         </template>
 
-        <div ref="box" class="column q-mt-xs overflow-auto no-wrap" style="padding: 0px 10px 10px 10px;">
-            <div v-html="annotation" />
+        <div ref="box" class="fit column q-mt-xs overflow-auto no-wrap" style="padding: 0px 10px 10px 10px;">
+            <div class="row" style="height: 300px">
+                <div style="height: 300px">
+                    <img v-if="coverSrc" :src="coverSrc" style="height: 100%;" />
+                </div>
+            </div>
+
+            <div class="q-mt-md" v-html="annotation" />
+            <pre>{{ annotation }}</pre>
         </div>
 
         <template #footer>
@@ -25,7 +32,7 @@
 import vueComponent from '../../vueComponent.js';
 
 import Dialog from '../../share/Dialog.vue';
-import XmlParser from '../../../../server/core/xml/XmlParser';
+import Fb2Parser from '../../../../server/core/fb2/Fb2Parser';
 
 const componentOptions = {
     components: {
@@ -53,6 +60,7 @@ class BookInfoDialog {
     dialogVisible = false;
 
     //info props
+    coverSrc = '';
     annotation = '';
 
     created() {
@@ -65,21 +73,29 @@ class BookInfoDialog {
 
     parseBookInfo() {
         const bookInfo = this.bookInfo;
-        const xml = new XmlParser();
+        const parser = new Fb2Parser();
 
         //defaults
+        this.coverSrc = '';
         this.annotation = '';
 
-        if (bookInfo.fb2) {
-            const desc = xml.navigator(bookInfo.fb2);
+        //cover
+        if (bookInfo.cover)
+            this.coverSrc = bookInfo.cover;
+
+        //fb2
+        if (bookInfo.fb2 && bookInfo.fb2.fictionbook && bookInfo.fb2.fictionbook.description) {
+            const desc = parser.inspector(bookInfo.fb2.fictionbook.description);
 
             //annotation
-            const annObj = desc.v('description/title-info/annotation');
+            const annObj = desc.v('title-info/annotation');
             if (annObj) {
-                this.annotation = xml.fromObject(annObj).toString({noHeader: true});
+                this.annotation = parser.fromObject(annObj).toString({noHeader: true, format: true});
+                this.annotation = parser.toHtml(this.annotation);
                 this.annotation = this.annotation.replace(/<p>/g, `<p class="p-annotation">`);
             }
         }
+
     }
 
     okClick() {
diff --git a/server/core/WebWorker.js b/server/core/WebWorker.js
index ae54819..c862b0d 100644
--- a/server/core/WebWorker.js
+++ b/server/core/WebWorker.js
@@ -480,8 +480,8 @@ class WebWorker {
                 result.fb2 = false;
 
                 if (book.ext == 'fb2') {
-                    const {desc, cover, coverExt} = await this.fb2Helper.getDescAndCover(bookFile);
-                    result.fb2 = desc;
+                    const {fb2, cover, coverExt} = await this.fb2Helper.getDescAndCover(bookFile);
+                    result.fb2 = fb2;
 
                     if (cover) {
                         result.cover = `${this.config.filesPathStatic}/${hash}${coverExt}`;
diff --git a/server/core/fb2/Fb2Helper.js b/server/core/fb2/Fb2Helper.js
index 4bb07f3..709844c 100644
--- a/server/core/fb2/Fb2Helper.js
+++ b/server/core/fb2/Fb2Helper.js
@@ -56,15 +56,15 @@ class Fb2Helper {
 
         data = this.checkEncoding(data);
 
-        const fb2 = new Fb2Parser();
+        const parser = new Fb2Parser();
 
-        fb2.fromString(data.toString(), {
+        parser.fromString(data.toString(), {
             lowerCase: true,
             pickNode: route => route.indexOf('fictionbook/body') !== 0,
         });
 
-        const desc = fb2.$$('description').toObject();
-        const coverImage = fb2.inspector(desc).$('description/title-info/coverpage/image');
+        const desc = parser.$$('description').toObject();
+        const coverImage = parser.inspector(desc).$('description/title-info/coverpage/image');
 
         let cover = null;
         let coverExt = '';
@@ -79,7 +79,7 @@ class Fb2Helper {
                 const binaryId = (href[0] == '#' ? href.substring(1) : href);
 
                 //найдем нужный image
-                fb2.$$('binary').eachSelf(node => {
+                parser.$$('binary').eachSelf(node => {
                     let attrs = node.attrs();
                     if (!attrs)
                         return;
@@ -95,7 +95,8 @@ class Fb2Helper {
             }
         }
 
-        return {desc, cover, coverExt};
+        parser.remove('binary');
+        return {fb2: parser.toObject(), cover, coverExt};
     }
 }
 

From 81d8b476a51b9dd28f9fd5176968d3262c462273 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 10 Nov 2022 14:56:25 +0700
Subject: [PATCH 34/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20BookInfoDialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Search/BookInfoDialog/BookInfoDialog.vue  |  23 +--
 server/core/fb2/Fb2Helper.js                  |   2 +-
 server/core/fb2/Fb2Parser.js                  | 148 +++++++++++++++++-
 server/core/xml/ObjectInspector.js            |   2 +-
 4 files changed, 160 insertions(+), 15 deletions(-)

diff --git a/client/components/Search/BookInfoDialog/BookInfoDialog.vue b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
index 1c88f49..a66c857 100644
--- a/client/components/Search/BookInfoDialog/BookInfoDialog.vue
+++ b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
@@ -16,7 +16,6 @@
             </div>
 
             <div class="q-mt-md" v-html="annotation" />
-            <pre>{{ annotation }}</pre>
         </div>
 
         <template #footer>
@@ -62,6 +61,7 @@ class BookInfoDialog {
     //info props
     coverSrc = '';
     annotation = '';
+    info = [];
 
     created() {
         this.commit = this.$store.commit;
@@ -78,24 +78,25 @@ class BookInfoDialog {
         //defaults
         this.coverSrc = '';
         this.annotation = '';
+        this.info = [];
 
         //cover
         if (bookInfo.cover)
             this.coverSrc = bookInfo.cover;
 
         //fb2
-        if (bookInfo.fb2 && bookInfo.fb2.fictionbook && bookInfo.fb2.fictionbook.description) {
-            const desc = parser.inspector(bookInfo.fb2.fictionbook.description);
-
-            //annotation
-            const annObj = desc.v('title-info/annotation');
-            if (annObj) {
-                this.annotation = parser.fromObject(annObj).toString({noHeader: true, format: true});
-                this.annotation = parser.toHtml(this.annotation);
-                this.annotation = this.annotation.replace(/<p>/g, `<p class="p-annotation">`);
+        if (bookInfo.fb2) {
+            this.info = parser.bookInfoList(bookInfo.fb2);
+            
+            const infoObj = parser.bookInfo(bookInfo.fb2);
+            if (infoObj) {
+                let ann = infoObj.titleInfo.annotationHtml;
+                if (ann) {
+                    ann = ann.replace(/<p>/g, `<p class="p-annotation">`);
+                    this.annotation = ann;
+                }
             }
         }
-
     }
 
     okClick() {
diff --git a/server/core/fb2/Fb2Helper.js b/server/core/fb2/Fb2Helper.js
index 709844c..e70e30d 100644
--- a/server/core/fb2/Fb2Helper.js
+++ b/server/core/fb2/Fb2Helper.js
@@ -70,7 +70,7 @@ class Fb2Helper {
         let coverExt = '';
         if (coverImage) {
             const coverAttrs = coverImage.attrs();
-            const href = coverAttrs['l:href'];
+            const href = coverAttrs[`${parser.xlinkNS}:href`];
             let coverType = coverAttrs['content-type'];
             coverType = (coverType == 'image/jpg' || coverType == 'application/octet-stream' ? 'image/jpeg' : coverType);
             coverExt = (coverType == 'image/png' ? '.png' : '.jpg');
diff --git a/server/core/fb2/Fb2Parser.js b/server/core/fb2/Fb2Parser.js
index 13806bf..f8cdd6a 100644
--- a/server/core/fb2/Fb2Parser.js
+++ b/server/core/fb2/Fb2Parser.js
@@ -1,15 +1,159 @@
 const XmlParser = require('../xml/XmlParser');
 
 class Fb2Parser extends XmlParser {
+    get xlinkNS() {
+        if (!this._xlinkNS) {
+            const rootAttrs = this.$self().attrs();
+            let ns = 'l';
+            for (const [key, value] of rootAttrs) {
+                if (value == 'http://www.w3.org/1999/xlink') {
+                    ns = key.split(':')[1] || ns;
+                    break;
+                }
+            }
+
+            this._xlinkNS = ns;
+        }
+
+        return this._xlinkNS;
+    }
+
     bookInfo(fb2Object) {
+        const result = {};
+
         if (!fb2Object)
             fb2Object = this.toObject();
 
-        //const result = {};
+        const desc = this.inspector(fb2Object).$('fictionbook/description');
 
+        if (!desc)
+            return result;
+
+        //title-info
+        const titleInfo = desc.$('title-info');
+        if (titleInfo) {
+            const info = {};
+
+            info.genre = [];
+            for (const g of titleInfo.$$('genre'))
+                info.genre.push(g.text());
+
+            const parseAuthors = (tagName) => {
+                const authors = [];
+                for (const a of titleInfo.$$(tagName)) {
+                    let names = [];
+                    names.push(a.text('last-name'));
+                    names.push(a.text('first-name'));
+                    names.push(a.text('middle-name'));
+                    names = names.filter(n => n);
+                    if (!names.length)
+                        names.push(a.text('nickname'));
+
+                    authors.push(names.join(' '));
+                }
+
+                return authors;
+            }
+
+            info.author = parseAuthors('author');
+
+            info.bookTitle = titleInfo.text('book-title');
+
+            info.annotation = null;
+            info.annotationHtml = null;
+            const node = titleInfo.$('annotation') && titleInfo.$('annotation').value;
+
+            if (node) {
+                //annotation как кусок xml
+                info.annotation = (new XmlParser()).fromObject(node).toString({noHeader: true});
+
+                //annotation как html
+                info.annotationHtml = this.toHtml(info.annotation);
+            }
+
+            info.keywords = titleInfo.text('keywords');
+            info.date = titleInfo.text('date');
+            info.coverpage = titleInfo.$('coverpage') && titleInfo.$('coverpage').value;
+            info.lang = titleInfo.text('lang');
+            info.srcLang = titleInfo.text('src-lang');
+
+            info.translator = parseAuthors('translator');
+
+            const seqAttrs = titleInfo.attrs('sequence') || new Map();
+            info.sequenceName = seqAttrs.get('name') || null;
+            info.sequenceNum = seqAttrs.get('number') || null;
+            info.sequenceLang = seqAttrs.get('xml:lang') || null;
+
+            result.titleInfo = info;
+        }
+
+        return result;
     }
 
-    bookInfoList(fb2Object) {
+    bookInfoList(fb2Object, options = {}) {
+        let {
+            correctMapping = false,
+            valueToString = false,
+        } = options;
+
+        if (!correctMapping)
+            correctMapping = mapping => mapping;
+
+        if (!valueToString) {
+            valueToString = (value, nodePath) => {//eslint-disable-line no-unused-vars
+                if (typeof(value) === 'string') {
+                    return value;
+                } else if (Array.isArray(value)) {
+                    return value.join(', ');
+                } else if (typeof(value) === 'object') {
+                    return JSON.stringify(value);
+                }
+
+                return value;
+            };
+        }
+
+        let mapping = [
+            {name: 'titleInfo', label: 'Общая информация', value: [
+                {name: 'author', label: 'Автор(ы)'},
+                {name: 'bookTitle', label: 'Название'},
+                {name: 'sequenceName', label: 'Серия'},
+                {name: 'sequenceNum', label: 'Номер в серии'},
+                {name: 'genre', label: 'Жанр'},
+
+                {name: 'date', label: 'Дата'},
+                {name: 'lang', label: 'Язык книги'},
+                {name: 'srcLang', label: 'Язык оригинала'},
+                {name: 'translator', label: 'Переводчик(и)'},
+                {name: 'keywords', label: 'Ключевые слова'},
+            ]},
+        ];
+
+        mapping = correctMapping(mapping);
+        const bookInfo = this.bookInfo(fb2Object);
+
+        //заполняем mapping
+        let result = [];
+        for (const item of mapping) {
+            const itemOut = {name: item.name, label: item.label, value: []};
+            const info = bookInfo[item.name];
+            if (!info)
+                continue;
+
+            for (const subItem of item.value) {
+                if (info[subItem.name] !== null)
+                    itemOut.value.push({
+                        name: subItem.name,
+                        label: subItem.label,
+                        value: valueToString(info[subItem.name])
+                    });
+            }
+
+            if (itemOut.value.length)
+                result.push(itemOut);
+        }
+
+        return result;
     }
 
     toHtml(xmlString) {
diff --git a/server/core/xml/ObjectInspector.js b/server/core/xml/ObjectInspector.js
index 616228d..0adc188 100644
--- a/server/core/xml/ObjectInspector.js
+++ b/server/core/xml/ObjectInspector.js
@@ -56,7 +56,7 @@ class ObjectInspector {
         }
 
         if (raw === null)
-            return null;
+            return [];
 
         raw = (Array.isArray(raw) ? raw : [raw]);
 

From 391fb3aa70d37eda281f05fc1626b5de144b24c6 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 10 Nov 2022 17:17:56 +0700
Subject: [PATCH 35/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20BookInfoDialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Search/BookInfoDialog/BookInfoDialog.vue  | 178 ++++++++++++++++--
 client/quasar.js                              |   4 +-
 server/core/fb2/Fb2Parser.js                  |  20 +-
 3 files changed, 177 insertions(+), 25 deletions(-)

diff --git a/client/components/Search/BookInfoDialog/BookInfoDialog.vue b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
index a66c857..4cd2d94 100644
--- a/client/components/Search/BookInfoDialog/BookInfoDialog.vue
+++ b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
@@ -9,9 +9,57 @@
         </template>
 
         <div ref="box" class="fit column q-mt-xs overflow-auto no-wrap" style="padding: 0px 10px 10px 10px;">
-            <div class="row" style="height: 300px">
-                <div style="height: 300px">
-                    <img v-if="coverSrc" :src="coverSrc" style="height: 100%;" />
+            <div class="text-green-10">
+                {{ bookAuthor }}
+            </div>
+            <div>
+                <b>{{ book.title }}</b>
+            </div>
+
+            <div class="row q-mt-sm no-wrap">
+                <div class="column justify-center" style="height: 300px; width: 200px;">
+                    <img v-if="coverSrc" :src="coverSrc" class="fit row justify-center items-center" style="object-fit: contain" @error="coverSrc = ''" />
+                    <div v-if="!coverSrc" class="fit row justify-center items-center text-grey-5" style="border: 1px solid #ccc; font-size: 300%">
+                        <i>{{ book.ext }}</i>
+                    </div>
+                </div>
+
+                <div class="col column q-ml-sm" style="min-width: 300px; border: 1px solid #ccc">
+                    <div class="bg-grey-3 row">
+                        <q-tabs
+                            v-model="selectedTab"
+                            active-color="black"
+                            active-bg-color="white"
+                            indicator-color="white"
+                            dense
+                            no-caps
+                            inline-label
+                            class="bg-grey-4 text-grey-7"
+                        >
+                            <q-tab name="fb2" label="Fb2 инфо" />
+                            <q-tab name="inpx" label="Inpx инфо" />
+                        </q-tabs>
+                    </div>
+
+                    <div class="overflow-auto full-width" style="height: 262px">
+                        <div v-for="item in info" :key="item.name">
+                            <div class="row q-ml-sm q-mt-sm items-center">
+                                <div class="text-blue" style="font-size: 90%">
+                                    {{ item.label }}
+                                </div>
+                                <div class="col q-mx-xs" style="height: 0px; border-top: 1px solid #ccc" />
+                            </div>
+
+                            <div v-for="subItem in item.value" :key="subItem.name" class="row q-ml-md">
+                                <div style="width: 110px">
+                                    {{ subItem.label }}
+                                </div>
+                                <div class="q-ml-sm">
+                                    {{ subItem.value }}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
 
@@ -40,13 +88,12 @@ const componentOptions = {
     watch: {
         modelValue(newValue) {
             this.dialogVisible = newValue;
+            if (newValue)
+                this.init();
         },
         dialogVisible(newValue) {
             this.$emit('update:modelValue', newValue);
         },
-        bookInfo() {
-            this.parseBookInfo();
-        }
     }
 };
 class BookInfoDialog {
@@ -57,28 +104,125 @@ class BookInfoDialog {
     };
 
     dialogVisible = false;
+    selectedTab = 'fb2';
 
     //info props
     coverSrc = '';
     annotation = '';
-    info = [];
+    fb2 = [];
+    book = {};
 
     created() {
         this.commit = this.$store.commit;
-        this.parseBookInfo();
     }
 
     mounted() {
     }
 
-    parseBookInfo() {
-        const bookInfo = this.bookInfo;
-        const parser = new Fb2Parser();
-
+    init() {
         //defaults
         this.coverSrc = '';
         this.annotation = '';
-        this.info = [];
+        this.fb2 = [];
+        this.book = {};
+
+        this.parseBookInfo();
+    }
+
+    get bookAuthor() {
+        if (this.book.author) {
+            let a = this.book.author.split(',');
+            return a.slice(0, 3).join(', ') + (a.length > 3 ? ' и др.' : '');
+        }
+
+        return '';
+    }
+
+    get inpx() {
+        const mapping = [
+            {name: 'fileInfo', label: 'Информация о файле', value: [
+                {name: 'folder', label: 'Папка'},
+                {name: 'file', label: 'Файл'},
+                {name: 'size', label: 'Размер'},
+                {name: 'date', label: 'Добавлен'},
+            ]},
+        ];
+/*
+                {name: 'author', label: 'Автор(ы)'},
+                {name: 'bookTitle', label: 'Название'},
+                {name: 'sequenceName', label: 'Серия'},
+                {name: 'sequenceNum', label: 'Номер в серии'},
+                {name: 'genre', label: 'Жанр'},
+
+                {name: 'date', label: 'Дата'},
+                {name: 'lang', label: 'Язык книги'},
+                {name: 'srcLang', label: 'Язык оригинала'},
+                {name: 'translator', label: 'Переводчик(и)'},
+                {name: 'keywords', label: 'Ключевые слова'},
+
+
+        {"author":"Грант Максвелл",
+         "genre":"det_hard",
+         "title":"Tower of Death",
+         "series":"The Shadow[a]",
+         "serno":53,
+         "file":"641310",
+         "size":420422,
+         "libid":"641310",
+         "del":0,
+         "ext":"fb2",
+         "date":"2021-11-04",
+         "insno":181,
+         "folder":"f.fb2-641019-643928.zip",
+         "lang":"en",
+         "librate":0,
+         "keywords":"Hard-Boiled, Pulp Fiction,det",
+*/
+        const valueToString = (value, nodePath) => {//eslint-disable-line no-unused-vars
+            if (typeof(value) === 'string') {
+                return value;
+            }
+
+            return value;
+        };
+
+        let result = [];
+        for (const item of mapping) {
+            const itemOut = {name: item.name, label: item.label, value: []};
+
+            for (const subItem of item.value) {
+                const subItemOut = {
+                    name: subItem.name,
+                    label: subItem.label,
+                    value: valueToString(this.book[subItem.name], `${item.name}/${subItem.name}`)
+                };
+                if (subItemOut.value)
+                    itemOut.value.push(subItemOut);
+            }
+
+            if (itemOut.value.length)
+                result.push(itemOut);
+        }
+
+        return result;
+    }
+
+    get info() {
+        let result = [];
+
+        switch (this.selectedTab) {
+            case 'fb2':
+                return this.fb2;
+            case 'inpx':
+                return this.inpx;
+        }
+
+        return result;
+    }
+
+    parseBookInfo() {
+        const bookInfo = this.bookInfo;
+        const parser = new Fb2Parser();
 
         //cover
         if (bookInfo.cover)
@@ -86,10 +230,10 @@ class BookInfoDialog {
 
         //fb2
         if (bookInfo.fb2) {
-            this.info = parser.bookInfoList(bookInfo.fb2);
+            this.fb2 = parser.bookInfoList(bookInfo.fb2);
             
             const infoObj = parser.bookInfo(bookInfo.fb2);
-            if (infoObj) {
+            if (infoObj.titleInfo) {
                 let ann = infoObj.titleInfo.annotationHtml;
                 if (ann) {
                     ann = ann.replace(/<p>/g, `<p class="p-annotation">`);
@@ -97,6 +241,10 @@ class BookInfoDialog {
                 }
             }
         }
+
+        //book
+        if (bookInfo.book)
+            this.book = bookInfo.book;
     }
 
     okClick() {
diff --git a/client/quasar.js b/client/quasar.js
index 925a20f..9acf6b1 100644
--- a/client/quasar.js
+++ b/client/quasar.js
@@ -17,7 +17,7 @@ import {QBtn} from 'quasar/src/components/btn';
 import {QBtnToggle} from 'quasar/src/components/btn-toggle';
 import {QIcon} from 'quasar/src/components/icon';
 //import {QSlider} from 'quasar/src/components/slider';
-//import {QTabs, QTab} from 'quasar/src/components/tabs';
+import {QTabs, QTab} from 'quasar/src/components/tabs';
 //import {QTabPanels, QTabPanel} from 'quasar/src/components/tab-panels';
 //import {QSeparator} from 'quasar/src/components/separator';
 //import {QList} from 'quasar/src/components/item';
@@ -52,7 +52,7 @@ const components = {
     QBtnToggle,
     QIcon,
     //QSlider,
-    //QTabs, QTab,
+    QTabs, QTab,
     //QTabPanels, QTabPanel,
     //QSeparator,
     //QList,
diff --git a/server/core/fb2/Fb2Parser.js b/server/core/fb2/Fb2Parser.js
index f8cdd6a..efc0b83 100644
--- a/server/core/fb2/Fb2Parser.js
+++ b/server/core/fb2/Fb2Parser.js
@@ -79,10 +79,10 @@ class Fb2Parser extends XmlParser {
 
             info.translator = parseAuthors('translator');
 
-            const seqAttrs = titleInfo.attrs('sequence') || new Map();
-            info.sequenceName = seqAttrs.get('name') || null;
-            info.sequenceNum = seqAttrs.get('number') || null;
-            info.sequenceLang = seqAttrs.get('xml:lang') || null;
+            const seqAttrs = titleInfo.attrs('sequence') || {};
+            info.sequenceName = seqAttrs['name'] || null;
+            info.sequenceNum = seqAttrs['number'] || null;
+            info.sequenceLang = seqAttrs['xml:lang'] || null;
 
             result.titleInfo = info;
         }
@@ -141,12 +141,16 @@ class Fb2Parser extends XmlParser {
                 continue;
 
             for (const subItem of item.value) {
-                if (info[subItem.name] !== null)
-                    itemOut.value.push({
+                if (info[subItem.name] !== null) {
+                    const subItemOut = {
                         name: subItem.name,
                         label: subItem.label,
-                        value: valueToString(info[subItem.name])
-                    });
+                        value: valueToString(info[subItem.name], `${item.name}/${subItem.name}`)
+                    };
+
+                    if (subItemOut.value)
+                        itemOut.value.push(subItemOut);
+                }
             }
 
             if (itemOut.value.length)

From 0bb434d4151d9768dd0126f952f64b6a9a553daf Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 10 Nov 2022 17:55:16 +0700
Subject: [PATCH 36/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20BookInfoDialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Search/BookInfoDialog/BookInfoDialog.vue  | 74 +++++++++++--------
 1 file changed, 42 insertions(+), 32 deletions(-)

diff --git a/client/components/Search/BookInfoDialog/BookInfoDialog.vue b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
index 4cd2d94..800abef 100644
--- a/client/components/Search/BookInfoDialog/BookInfoDialog.vue
+++ b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
@@ -47,7 +47,7 @@
                                 <div class="text-blue" style="font-size: 90%">
                                     {{ item.label }}
                                 </div>
-                                <div class="col q-mx-xs" style="height: 0px; border-top: 1px solid #ccc" />
+                                <div class="col q-mx-xs" style="height: 0px; border-top: 1px solid #ccc"></div>
                             </div>
 
                             <div v-for="subItem in item.value" :key="subItem.name" class="row q-ml-md">
@@ -59,6 +59,8 @@
                                 </div>
                             </div>
                         </div>
+
+                        <div class="q-mt-xs"></div>
                     </div>
                 </div>
             </div>
@@ -80,6 +82,7 @@ import vueComponent from '../../vueComponent.js';
 
 import Dialog from '../../share/Dialog.vue';
 import Fb2Parser from '../../../../server/core/fb2/Fb2Parser';
+import * as utils from '../../../share/utils';
 
 const componentOptions = {
     components: {
@@ -138,52 +141,59 @@ class BookInfoDialog {
         return '';
     }
 
+    formatSize(size) {
+        size = size/1024;
+        let unit = 'KB';
+        if (size > 1024) {
+            size = size/1024;
+            unit = 'MB';
+        }
+        return `${size.toFixed(1)} ${unit}`;
+    }
+
     get inpx() {
         const mapping = [
             {name: 'fileInfo', label: 'Информация о файле', value: [
                 {name: 'folder', label: 'Папка'},
                 {name: 'file', label: 'Файл'},
+                {name: 'ext', label: 'Тип'},
                 {name: 'size', label: 'Размер'},
                 {name: 'date', label: 'Добавлен'},
+                {name: 'del', label: 'Удален'},
+                {name: 'libid', label: 'LibId'},
+                {name: 'insno', label: 'InsideNo'},
+            ]},
+
+            {name: 'titleInfo', label: 'Общая информация', value: [
+                {name: 'author', label: 'Автор(ы)'},
+                {name: 'title', label: 'Название'},
+                {name: 'series', label: 'Серия'},
+                {name: 'serno', label: 'Номер в серии'},
+                {name: 'genre', label: 'Жанр'},
+                {name: 'librate', label: 'Оценка'},
+                {name: 'lang', label: 'Язык книги'},
+                {name: 'keywords', label: 'Ключевые слова'},
             ]},
         ];
-/*
-                {name: 'author', label: 'Автор(ы)'},
-                {name: 'bookTitle', label: 'Название'},
-                {name: 'sequenceName', label: 'Серия'},
-                {name: 'sequenceNum', label: 'Номер в серии'},
-                {name: 'genre', label: 'Жанр'},
 
-                {name: 'date', label: 'Дата'},
-                {name: 'lang', label: 'Язык книги'},
-                {name: 'srcLang', label: 'Язык оригинала'},
-                {name: 'translator', label: 'Переводчик(и)'},
-                {name: 'keywords', label: 'Ключевые слова'},
-
-
-        {"author":"Грант Максвелл",
-         "genre":"det_hard",
-         "title":"Tower of Death",
-         "series":"The Shadow[a]",
-         "serno":53,
-         "file":"641310",
-         "size":420422,
-         "libid":"641310",
-         "del":0,
-         "ext":"fb2",
-         "date":"2021-11-04",
-         "insno":181,
-         "folder":"f.fb2-641019-643928.zip",
-         "lang":"en",
-         "librate":0,
-         "keywords":"Hard-Boiled, Pulp Fiction,det",
-*/
         const valueToString = (value, nodePath) => {//eslint-disable-line no-unused-vars
+            if (nodePath == 'fileInfo/size')
+                return `${this.formatSize(value)} (${value.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1 ')} Bytes)`;
+
+            if (nodePath == 'fileInfo/date')
+                return utils.sqlDateFormat(value);
+
+            if (nodePath == 'fileInfo/del')
+                return (value ? 'Да' : 'Нет');
+
+            if (nodePath == 'titleInfo/author')
+                return value.split(',').join(', ');
+
             if (typeof(value) === 'string') {
                 return value;
             }
 
-            return value;
+            return (value.toString ? value.toString() : '');
         };
 
         let result = [];

From 7b2171c269de75cd0834c30be173c36ca90c35e9 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 10 Nov 2022 18:05:53 +0700
Subject: [PATCH 37/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20BookInfoDialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Search/BookInfoDialog/BookInfoDialog.vue           | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/client/components/Search/BookInfoDialog/BookInfoDialog.vue b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
index 800abef..65f6b8e 100644
--- a/client/components/Search/BookInfoDialog/BookInfoDialog.vue
+++ b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
@@ -24,7 +24,7 @@
                     </div>
                 </div>
 
-                <div class="col column q-ml-sm" style="min-width: 300px; border: 1px solid #ccc">
+                <div class="col column q-ml-sm" style="min-width: 400px; border: 1px solid #ccc">
                     <div class="bg-grey-3 row">
                         <q-tabs
                             v-model="selectedTab"
@@ -36,7 +36,7 @@
                             inline-label
                             class="bg-grey-4 text-grey-7"
                         >
-                            <q-tab name="fb2" label="Fb2 инфо" />
+                            <q-tab v-if="fb2.length" name="fb2" label="Fb2 инфо" />
                             <q-tab name="inpx" label="Inpx инфо" />
                         </q-tabs>
                     </div>
@@ -130,6 +130,9 @@ class BookInfoDialog {
         this.book = {};
 
         this.parseBookInfo();
+
+        if (!this.fb2.length)
+            this.selectedTab = 'inpx';
     }
 
     get bookAuthor() {
@@ -189,6 +192,9 @@ class BookInfoDialog {
             if (nodePath == 'titleInfo/author')
                 return value.split(',').join(', ');
 
+            if ((nodePath == 'titleInfo/serno' || nodePath == 'titleInfo/librate') && !value)
+                return null;
+
             if (typeof(value) === 'string') {
                 return value;
             }

From d7d04fcda84822c08bff21dccf568a6ce6fe4305 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 10 Nov 2022 18:57:20 +0700
Subject: [PATCH 38/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20BookInfoDialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Search/BookInfoDialog/BookInfoDialog.vue  |  26 +++-
 server/core/fb2/Fb2Parser.js                  | 127 ++++++++++++++----
 2 files changed, 120 insertions(+), 33 deletions(-)

diff --git a/client/components/Search/BookInfoDialog/BookInfoDialog.vue b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
index 65f6b8e..5415d08 100644
--- a/client/components/Search/BookInfoDialog/BookInfoDialog.vue
+++ b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
@@ -54,9 +54,7 @@
                                 <div style="width: 110px">
                                     {{ subItem.label }}
                                 </div>
-                                <div class="q-ml-sm">
-                                    {{ subItem.value }}
-                                </div>
+                                <div class="q-ml-sm" v-html="subItem.value" />
                             </div>
                         </div>
 
@@ -246,7 +244,22 @@ class BookInfoDialog {
 
         //fb2
         if (bookInfo.fb2) {
-            this.fb2 = parser.bookInfoList(bookInfo.fb2);
+            this.fb2 = parser.bookInfoList(bookInfo.fb2, {
+                valueToString(value, nodePath) {//eslint-disable-line no-unused-vars
+                    if (nodePath == 'documentInfo/historyHtml' && value)
+                        return value.replace(/<p>/g, `<p class="p-history">`);
+
+                    if (typeof(value) === 'string') {
+                        return value;
+                    } else if (Array.isArray(value)) {
+                        return value.join(', ');
+                    } else if (typeof(value) === 'object') {
+                        return JSON.stringify(value);
+                    }
+
+                    return value;
+                },
+            });
             
             const infoObj = parser.bookInfo(bookInfo.fb2);
             if (infoObj.titleInfo) {
@@ -282,4 +295,9 @@ export default vueComponent(BookInfoDialog);
     padding: 0;
     margin: 0;
 }
+
+.p-history {
+    padding: 0;
+    margin: 0;
+}
 </style>
diff --git a/server/core/fb2/Fb2Parser.js b/server/core/fb2/Fb2Parser.js
index efc0b83..345cc3d 100644
--- a/server/core/fb2/Fb2Parser.js
+++ b/server/core/fb2/Fb2Parser.js
@@ -29,46 +29,44 @@ class Fb2Parser extends XmlParser {
         if (!desc)
             return result;
 
-        //title-info
-        const titleInfo = desc.$('title-info');
-        if (titleInfo) {
+        const parseAuthors = (node, tagName) => {
+            const authors = [];
+            for (const a of node.$$(tagName)) {
+                let names = [];
+                names.push(a.text('last-name'));
+                names.push(a.text('first-name'));
+                names.push(a.text('middle-name'));
+                names = names.filter(n => n);
+                if (!names.length)
+                    names.push(a.text('nickname'));
+
+                authors.push(names.join(' '));
+            }
+
+            return authors;
+        }
+
+        const parseTitleInfo = (titleInfo) => {
             const info = {};
 
             info.genre = [];
             for (const g of titleInfo.$$('genre'))
                 info.genre.push(g.text());
 
-            const parseAuthors = (tagName) => {
-                const authors = [];
-                for (const a of titleInfo.$$(tagName)) {
-                    let names = [];
-                    names.push(a.text('last-name'));
-                    names.push(a.text('first-name'));
-                    names.push(a.text('middle-name'));
-                    names = names.filter(n => n);
-                    if (!names.length)
-                        names.push(a.text('nickname'));
-
-                    authors.push(names.join(' '));
-                }
-
-                return authors;
-            }
-
-            info.author = parseAuthors('author');
+            info.author = parseAuthors(titleInfo, 'author');
 
             info.bookTitle = titleInfo.text('book-title');
 
-            info.annotation = null;
+            //annotation как Object
+            info.annotation = titleInfo.$('annotation') && titleInfo.$('annotation').value;
+            info.annotationXml = null;
             info.annotationHtml = null;
-            const node = titleInfo.$('annotation') && titleInfo.$('annotation').value;
-
-            if (node) {
+            if (info.annotation) {
                 //annotation как кусок xml
-                info.annotation = (new XmlParser()).fromObject(node).toString({noHeader: true});
+                info.annotationXml = (new XmlParser()).fromObject(info.annotation).toString({noHeader: true});
 
                 //annotation как html
-                info.annotationHtml = this.toHtml(info.annotation);
+                info.annotationHtml = this.toHtml(info.annotationXml);
             }
 
             info.keywords = titleInfo.text('keywords');
@@ -77,14 +75,61 @@ class Fb2Parser extends XmlParser {
             info.lang = titleInfo.text('lang');
             info.srcLang = titleInfo.text('src-lang');
 
-            info.translator = parseAuthors('translator');
+            info.translator = parseAuthors(titleInfo, 'translator');
 
             const seqAttrs = titleInfo.attrs('sequence') || {};
             info.sequenceName = seqAttrs['name'] || null;
             info.sequenceNum = seqAttrs['number'] || null;
             info.sequenceLang = seqAttrs['xml:lang'] || null;
 
-            result.titleInfo = info;
+            return info;
+        }
+
+        //title-info
+        const titleInfo = desc.$('title-info');
+        if (titleInfo) {
+            result.titleInfo = parseTitleInfo(titleInfo);
+        }
+
+        //src-title-info
+        const srcTitleInfo = desc.$('src-title-info');
+        if (srcTitleInfo) {
+            result.srcTitleInfo = parseTitleInfo(srcTitleInfo);
+        }
+
+        //document-info
+        const documentInfo = desc.$('document-info');
+        if (documentInfo) {
+            const info = {};
+
+            info.author = parseAuthors(documentInfo, 'author');
+            info.programUsed = documentInfo.text('program-used');
+            info.date = documentInfo.text('date');
+
+            info.srcUrl = [];
+            for (const url of documentInfo.$$('src-url'))
+                info.srcUrl.push(url.text());
+
+            info.srcOcr = documentInfo.text('src-ocr');
+            info.id = documentInfo.text('id');
+            info.version = documentInfo.text('version');
+            
+            //аналогично annotation, но разбирать в Xml и Html пока не будем
+            info.history = documentInfo.$('history') && documentInfo.$('history').value;
+            info.historyXml = null;
+            info.historyHtml = null;
+            if (info.history) {
+                //history как кусок xml
+                info.historyXml = (new XmlParser()).fromObject(info.history).toString({noHeader: true});
+
+                //history как html
+                info.historyHtml = this.toHtml(info.historyXml);
+            }
+
+
+            info.publisher = parseAuthors(documentInfo, 'publisher');
+
+            result.documentInfo = info;
         }
 
         return result;
@@ -127,6 +172,30 @@ class Fb2Parser extends XmlParser {
                 {name: 'translator', label: 'Переводчик(и)'},
                 {name: 'keywords', label: 'Ключевые слова'},
             ]},
+            {name: 'srcTitleInfo', label: 'Информация о произведении на языке оригинала', value: [
+                {name: 'author', label: 'Автор(ы)'},
+                {name: 'bookTitle', label: 'Название'},
+                {name: 'sequenceName', label: 'Серия'},
+                {name: 'sequenceNum', label: 'Номер в серии'},
+                {name: 'genre', label: 'Жанр'},
+
+                {name: 'date', label: 'Дата'},
+                {name: 'lang', label: 'Язык книги'},
+                {name: 'srcLang', label: 'Язык оригинала'},
+                {name: 'translator', label: 'Переводчик(и)'},
+                {name: 'keywords', label: 'Ключевые слова'},
+            ]},
+            {name: 'documentInfo', label: 'Информация о документе (OCR)', value: [
+                {name: 'author', label: 'Автор(ы)'},
+                {name: 'programUsed', label: 'Программа'},
+                {name: 'date', label: 'Дата'},
+                //srcUrl = []
+                {name: 'id', label: 'ID'},
+                {name: 'version', label: 'Версия'},
+                {name: 'srcOcr', label: 'Автор источника'},
+                {name: 'historyHtml', label: 'История'},
+                {name: 'publisher', label: 'Правообладатели'},
+            ]},
         ];
 
         mapping = correctMapping(mapping);

From e39611098a79e4ca795766355fa0a1ce7519df6e Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 10 Nov 2022 19:45:26 +0700
Subject: [PATCH 39/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20BookInfoDialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Search/BookInfoDialog/BookInfoDialog.vue  | 12 +--
 server/core/fb2/Fb2Parser.js                  | 81 ++++++++++++++-----
 2 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/client/components/Search/BookInfoDialog/BookInfoDialog.vue b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
index 5415d08..f5f08fa 100644
--- a/client/components/Search/BookInfoDialog/BookInfoDialog.vue
+++ b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
@@ -245,19 +245,11 @@ class BookInfoDialog {
         //fb2
         if (bookInfo.fb2) {
             this.fb2 = parser.bookInfoList(bookInfo.fb2, {
-                valueToString(value, nodePath) {//eslint-disable-line no-unused-vars
+                valueToString(value, nodePath, origVTS) {//eslint-disable-line no-unused-vars
                     if (nodePath == 'documentInfo/historyHtml' && value)
                         return value.replace(/<p>/g, `<p class="p-history">`);
 
-                    if (typeof(value) === 'string') {
-                        return value;
-                    } else if (Array.isArray(value)) {
-                        return value.join(', ');
-                    } else if (typeof(value) === 'object') {
-                        return JSON.stringify(value);
-                    }
-
-                    return value;
+                    return origVTS(value, nodePath);
                 },
             });
             
diff --git a/server/core/fb2/Fb2Parser.js b/server/core/fb2/Fb2Parser.js
index 345cc3d..70e2815 100644
--- a/server/core/fb2/Fb2Parser.js
+++ b/server/core/fb2/Fb2Parser.js
@@ -46,6 +46,20 @@ class Fb2Parser extends XmlParser {
             return authors;
         }
 
+        const parseSequence = (node, tagName) => {
+            const sequence = [];
+            for (const s of node.$$(tagName)) {
+                const seqAttrs = s.attrs() || {};
+                const name = seqAttrs['name'] || null;
+                const num = seqAttrs['number'] || null;
+                const lang = seqAttrs['xml:lang'] || null;
+
+                sequence.push({name, num, lang});
+            }
+
+            return sequence;
+        }
+
         const parseTitleInfo = (titleInfo) => {
             const info = {};
 
@@ -77,10 +91,7 @@ class Fb2Parser extends XmlParser {
 
             info.translator = parseAuthors(titleInfo, 'translator');
 
-            const seqAttrs = titleInfo.attrs('sequence') || {};
-            info.sequenceName = seqAttrs['name'] || null;
-            info.sequenceNum = seqAttrs['number'] || null;
-            info.sequenceLang = seqAttrs['xml:lang'] || null;
+            info.sequence = parseSequence(titleInfo, 'sequence');
 
             return info;
         }
@@ -114,7 +125,7 @@ class Fb2Parser extends XmlParser {
             info.id = documentInfo.text('id');
             info.version = documentInfo.text('version');
             
-            //аналогично annotation, но разбирать в Xml и Html пока не будем
+            //аналогично annotation
             info.history = documentInfo.$('history') && documentInfo.$('history').value;
             info.historyXml = null;
             info.historyHtml = null;
@@ -126,12 +137,26 @@ class Fb2Parser extends XmlParser {
                 info.historyHtml = this.toHtml(info.historyXml);
             }
 
-
             info.publisher = parseAuthors(documentInfo, 'publisher');
 
             result.documentInfo = info;
         }
 
+        //publish-info
+        const publishInfo = desc.$('publish-info');
+        if (publishInfo) {
+            const info = {};
+
+            info.bookName = publishInfo.text('book-name');
+            info.publisher = publishInfo.text('publisher');
+            info.city = publishInfo.text('city');
+            info.year = publishInfo.text('year');
+            info.isbn = publishInfo.text('isbn');
+            info.sequence = parseSequence(publishInfo, 'sequence');
+
+            result.publishInfo = info;
+        }
+
         return result;
     }
 
@@ -144,26 +169,31 @@ class Fb2Parser extends XmlParser {
         if (!correctMapping)
             correctMapping = mapping => mapping;
 
-        if (!valueToString) {
-            valueToString = (value, nodePath) => {//eslint-disable-line no-unused-vars
-                if (typeof(value) === 'string') {
-                    return value;
-                } else if (Array.isArray(value)) {
-                    return value.join(', ');
-                } else if (typeof(value) === 'object') {
-                    return JSON.stringify(value);
-                }
+        const myValueToString = (value, nodePath, origVTS) => {//eslint-disable-line no-unused-vars
+            if (nodePath == 'titleInfo/sequence' 
+                || nodePath == 'srcTitleInfo/sequence' 
+                || nodePath == 'publishInfo/sequence')
+                return value.map(v => [v.name, v.num].filter(s => s).join(' #')).join(', ');
 
+            if (typeof(value) === 'string') {
                 return value;
-            };
-        }
+            } else if (Array.isArray(value)) {
+                return value.join(', ');
+            } else if (typeof(value) === 'object') {
+                return JSON.stringify(value);
+            }
+
+            return value;
+        };
+
+        if (!valueToString)
+            valueToString = myValueToString;
 
         let mapping = [
             {name: 'titleInfo', label: 'Общая информация', value: [
                 {name: 'author', label: 'Автор(ы)'},
                 {name: 'bookTitle', label: 'Название'},
-                {name: 'sequenceName', label: 'Серия'},
-                {name: 'sequenceNum', label: 'Номер в серии'},
+                {name: 'sequence', label: 'Серия'},
                 {name: 'genre', label: 'Жанр'},
 
                 {name: 'date', label: 'Дата'},
@@ -175,8 +205,7 @@ class Fb2Parser extends XmlParser {
             {name: 'srcTitleInfo', label: 'Информация о произведении на языке оригинала', value: [
                 {name: 'author', label: 'Автор(ы)'},
                 {name: 'bookTitle', label: 'Название'},
-                {name: 'sequenceName', label: 'Серия'},
-                {name: 'sequenceNum', label: 'Номер в серии'},
+                {name: 'sequence', label: 'Серия'},
                 {name: 'genre', label: 'Жанр'},
 
                 {name: 'date', label: 'Дата'},
@@ -185,6 +214,14 @@ class Fb2Parser extends XmlParser {
                 {name: 'translator', label: 'Переводчик(и)'},
                 {name: 'keywords', label: 'Ключевые слова'},
             ]},
+            {name: 'publishInfo', label: 'Издательская информация', value: [
+                {name: 'bookName', label: 'Название'},
+                {name: 'publisher', label: 'Издательство'},
+                {name: 'city', label: 'Город'},
+                {name: 'year', label: 'Год'},
+                {name: 'isbn', label: 'ISBN'},
+                {name: 'sequence', label: 'Серия'},
+            ]},
             {name: 'documentInfo', label: 'Информация о документе (OCR)', value: [
                 {name: 'author', label: 'Автор(ы)'},
                 {name: 'programUsed', label: 'Программа'},
@@ -214,7 +251,7 @@ class Fb2Parser extends XmlParser {
                     const subItemOut = {
                         name: subItem.name,
                         label: subItem.label,
-                        value: valueToString(info[subItem.name], `${item.name}/${subItem.name}`)
+                        value: valueToString(info[subItem.name], `${item.name}/${subItem.name}`, myValueToString),
                     };
 
                     if (subItemOut.value)

From 6dfb3f6db95588245028a25205860f134539aee7 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 10 Nov 2022 20:10:43 +0700
Subject: [PATCH 40/42] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20BookInfoDialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/App.vue                             |  7 ++++++-
 .../Search/BookInfoDialog/BookInfoDialog.vue          | 11 +++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/client/components/App.vue b/client/components/App.vue
index dc81796..8e46141 100644
--- a/client/components/App.vue
+++ b/client/components/App.vue
@@ -133,8 +133,13 @@ body, html, #app {
     animation: rotating 2s linear infinite;
 }
 
+.q-dialog__inner--minimized {
+    padding: 10px !important;
+}
+
 .q-dialog__inner--minimized > div {
-    max-width: 800px;
+    max-height: 100% !important;
+    max-width: 800px !important;
 }
 
 @keyframes rotating { 
diff --git a/client/components/Search/BookInfoDialog/BookInfoDialog.vue b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
index f5f08fa..34e96a7 100644
--- a/client/components/Search/BookInfoDialog/BookInfoDialog.vue
+++ b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
@@ -17,7 +17,7 @@
             </div>
 
             <div class="row q-mt-sm no-wrap">
-                <div class="column justify-center" style="height: 300px; width: 200px;">
+                <div class="column justify-center" style="height: 300px; width: 200px; min-width: 100px">
                     <img v-if="coverSrc" :src="coverSrc" class="fit row justify-center items-center" style="object-fit: contain" @error="coverSrc = ''" />
                     <div v-if="!coverSrc" class="fit row justify-center items-center text-grey-5" style="border: 1px solid #ccc; font-size: 300%">
                         <i>{{ book.ext }}</i>
@@ -81,6 +81,7 @@ import vueComponent from '../../vueComponent.js';
 import Dialog from '../../share/Dialog.vue';
 import Fb2Parser from '../../../../server/core/fb2/Fb2Parser';
 import * as utils from '../../../share/utils';
+import _ from 'lodash';
 
 const componentOptions = {
     components: {
@@ -169,7 +170,6 @@ class BookInfoDialog {
                 {name: 'author', label: 'Автор(ы)'},
                 {name: 'title', label: 'Название'},
                 {name: 'series', label: 'Серия'},
-                {name: 'serno', label: 'Номер в серии'},
                 {name: 'genre', label: 'Жанр'},
                 {name: 'librate', label: 'Оценка'},
                 {name: 'lang', label: 'Язык книги'},
@@ -190,7 +190,7 @@ class BookInfoDialog {
             if (nodePath == 'titleInfo/author')
                 return value.split(',').join(', ');
 
-            if ((nodePath == 'titleInfo/serno' || nodePath == 'titleInfo/librate') && !value)
+            if (nodePath == 'titleInfo/librate' && !value)
                 return null;
 
             if (typeof(value) === 'string') {
@@ -201,6 +201,9 @@ class BookInfoDialog {
         };
 
         let result = [];
+        const book = _.cloneDeep(this.book);
+        book.series = [book.series, book.serno].filter(v => v).join(' #');
+
         for (const item of mapping) {
             const itemOut = {name: item.name, label: item.label, value: []};
 
@@ -208,7 +211,7 @@ class BookInfoDialog {
                 const subItemOut = {
                     name: subItem.name,
                     label: subItem.label,
-                    value: valueToString(this.book[subItem.name], `${item.name}/${subItem.name}`)
+                    value: valueToString(book[subItem.name], `${item.name}/${subItem.name}`)
                 };
                 if (subItemOut.value)
                     itemOut.value.push(subItemOut);

From caf3adf884029927123dc8e43caaa94a5df8ce15 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 10 Nov 2022 20:14:49 +0700
Subject: [PATCH 41/42] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D0=B8=D1=8F=201.?=
 =?UTF-8?q?2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8fd934d..d61ac87 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "inpx-web",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "inpx-web",
-      "version": "1.1.4",
+      "version": "1.2.0",
       "hasInstallScript": true,
       "license": "CC0-1.0",
       "dependencies": {
diff --git a/package.json b/package.json
index 43da394..5015b26 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "inpx-web",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "author": "Book Pauk <bookpauk@gmail.com>",
   "license": "CC0-1.0",
   "repository": "bookpauk/inpx-web",

From 4bbaf659b88b05d3f362a27c130bcbbc3bc34790 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 10 Nov 2022 20:26:30 +0700
Subject: [PATCH 42/42] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=88=D0=B0=D1=8F=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=82=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Search/BookInfoDialog/BookInfoDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/Search/BookInfoDialog/BookInfoDialog.vue b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
index 34e96a7..b7bed34 100644
--- a/client/components/Search/BookInfoDialog/BookInfoDialog.vue
+++ b/client/components/Search/BookInfoDialog/BookInfoDialog.vue
@@ -51,7 +51,7 @@
                             </div>
 
                             <div v-for="subItem in item.value" :key="subItem.name" class="row q-ml-md">
-                                <div style="width: 110px">
+                                <div style="width: 100px">
                                     {{ subItem.label }}
                                 </div>
                                 <div class="q-ml-sm" v-html="subItem.value" />