From b387509f885e5edfe59dd6897a35f15d9224e5e8 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 8 Jul 2022 12:26:47 +0700
Subject: [PATCH 01/47] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B1=D0=BB=D0=BE=D0=BA=D0=B8=D1=80=D0=BE=D0=B2=D0=BA?=
 =?UTF-8?q?=D1=83=20=D0=BF=D1=80=D0=B8=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83?=
 =?UTF-8?q?=D0=B7=D0=BA=D0=B5=20=D0=BA=D0=BD=D0=B8=D0=B3,=20=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B6?=
 =?UTF-8?q?=D0=B0=D1=8E=D1=82=D1=81=D1=8F=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/Reader.vue | 29 ++++++++++++----
 client/share/LockQueue.js           | 53 +++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 6 deletions(-)
 create mode 100644 client/share/LockQueue.js

diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 7fe007a3..69366647 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -201,6 +201,7 @@ import miscApi from '../../api/misc';
 
 import {versionHistory} from './versionHistory';
 import * as utils from '../../share/utils';
+import LockQueue from '../../share/LockQueue';
 
 const componentOptions = {
     components: {
@@ -313,6 +314,8 @@ class Reader {
         this.reader = this.$store.state.reader;
         this.config = this.$store.state.config;
 
+        this.lock = new LockQueue(100);
+
         this.$root.addEventHook('key', this.keyHook);
 
         this.lastActivePage = false;
@@ -1051,7 +1054,7 @@ class Reader {
         return result;
     }
 
-    async loadBook(opts) {
+    async _loadBook(opts) {
         if (!opts || !opts.url) {
             this.mostRecentBook();
             return;
@@ -1061,10 +1064,6 @@ class Reader {
 
         let url = encodeURI(decodeURI(opts.url));
 
-        //TODO: убрать конвертирование 'file://' после 06.2021
-        if (url.length == 71 && url.indexOf('file://') == 0)
-            url = url.replace(/^file/, 'disk');
-
         if ((url.indexOf('http://') != 0) && (url.indexOf('https://') != 0) &&
             (url.indexOf('disk://') != 0))
             url = 'http://' + url;
@@ -1189,7 +1188,16 @@ class Reader {
         }
     }
 
-    async loadFile(opts) {
+    async loadBook(opts) {
+        await this.lock.get();
+        try {
+            await this._loadBook(opts);
+        } finally {
+            this.lock.ret();
+        }
+    }
+
+    async _loadFile(opts) {
         this.progressActive = true;
 
         await this.$nextTick();
@@ -1213,6 +1221,15 @@ class Reader {
         }
     }
 
+    async loadFile(opts) {
+        await this.lock.get();
+        try {
+            await this._loadFile(opts);
+        } finally {
+            this.lock.ret();
+        }
+    }
+
     blinkCachedLoadMessage() {
         if (!this.blinkCachedLoad)
             return;
diff --git a/client/share/LockQueue.js b/client/share/LockQueue.js
new file mode 100644
index 00000000..ed350c57
--- /dev/null
+++ b/client/share/LockQueue.js
@@ -0,0 +1,53 @@
+class LockQueue {
+    constructor(queueSize) {
+        this.queueSize = queueSize;
+        this.freed = true;
+        this.waitingQueue = [];
+    }
+
+    //async
+    get(take = true) {
+        return new Promise((resolve, reject) => {
+            if (this.freed) {
+                if (take)
+                    this.freed = false;
+                resolve();
+                return;
+            }
+
+            if (this.waitingQueue.length < this.queueSize) {
+                this.waitingQueue.push({resolve, reject});
+            } else {
+                reject(new Error('Lock queue is too long'));
+            }
+        });
+    }
+
+    ret() {
+        if (this.waitingQueue.length) {
+            this.waitingQueue.shift().resolve();
+        } else {
+            this.freed = true;
+        }
+    }
+
+    //async
+    wait() {
+        return this.get(false);
+    }
+
+    retAll() {
+        while (this.waitingQueue.length) {
+            this.waitingQueue.shift().resolve();
+        }
+    }
+
+    errAll(error = 'rejected') {
+        while (this.waitingQueue.length) {
+            this.waitingQueue.shift().reject(new Error(error));
+        }
+    }
+
+}
+
+export default LockQueue;
\ No newline at end of file

From fce69e465759d8c8b85430709af0a4169e1c5ed8 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 8 Jul 2022 13:21:42 +0700
Subject: [PATCH 02/47] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B9=D0=BA=D0=B0=20=D1=86=D0=B2=D0=B5=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/ExternalLibs/ExternalLibs.vue | 15 ++++++++-------
 client/components/share/Window.vue              | 14 +++++++++-----
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/client/components/ExternalLibs/ExternalLibs.vue b/client/components/ExternalLibs/ExternalLibs.vue
index f0832df0..2d91bf80 100644
--- a/client/components/ExternalLibs/ExternalLibs.vue
+++ b/client/components/ExternalLibs/ExternalLibs.vue
@@ -5,19 +5,19 @@
         </template>
 
         <template #buttons>
-            <span class="full-screen-button row justify-center items-center" @mousedown.stop @click="fullScreenToggle">
+            <span class="header-button row justify-center items-center" @mousedown.stop @click="fullScreenToggle">
                 <q-icon :name="(fullScreenActive ? 'la la-compress-arrows-alt': 'la la-expand-arrows-alt')" size="16px" />
                 <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">На весь экран</q-tooltip>
             </span>
-            <span class="full-screen-button row justify-center items-center" @mousedown.stop @click="changeScale(0.1)">
+            <span class="header-button row justify-center items-center" @mousedown.stop @click="changeScale(0.1)">
                 <q-icon name="la la-plus" size="16px" />
                 <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Увеличить масштаб</q-tooltip>
             </span>
-            <span class="full-screen-button row justify-center items-center" @mousedown.stop @click="changeScale(-0.1)">
+            <span class="header-button row justify-center items-center" @mousedown.stop @click="changeScale(-0.1)">
                 <q-icon name="la la-minus" size="16px" />
                 <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Уменьшить масштаб</q-tooltip>
             </span>
-            <span class="full-screen-button row justify-center items-center" @mousedown.stop @click="showHelp">
+            <span class="header-button row justify-center items-center" @mousedown.stop @click="showHelp">
                 <q-icon name="la la-question-circle" size="16px" />
                 <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Справка</q-tooltip>
             </span>
@@ -894,14 +894,15 @@ export default vueComponent(ExternalLibs);
     background-color: #A0A0A0;
 }
 
-.full-screen-button {
+.header-button {
     width: 30px;
     height: 30px;
     cursor: pointer;
 }
 
-.full-screen-button:hover {
-    background-color: #69C05F;
+.header-button:hover {
+    color: white;
+    background-color: #39902F;
 }
 
 .transparent-layout {
diff --git a/client/components/share/Window.vue b/client/components/share/Window.vue
index 3b474395..2b5977de 100644
--- a/client/components/share/Window.vue
+++ b/client/components/share/Window.vue
@@ -127,6 +127,9 @@ class Window {
 
 export default vueComponent(Window);
 //-----------------------------------------------------------------------------
+//    background-color: #69C05F;
+//    text-shadow: 2px 1px 5px black, 2px 2px 5px black;
+
 </script>
 
 <style scoped>
@@ -153,7 +156,7 @@ export default vueComponent(Window);
 }
 
 .header {
-    background: linear-gradient(to bottom right, green, #59B04F);
+    background: linear-gradient(to bottom right, #007000, #59B04F);
     align-items: center;
     height: 30px;
 }
@@ -161,8 +164,8 @@ export default vueComponent(Window);
 .header-text {
     margin-left: 10px;
     margin-right: 10px;
-    color: yellow;
-    text-shadow: 2px 1px 5px black, 2px 2px 5px black;
+    color: #50FFFF;
+    text-shadow: 2px 2px 5px #005000, 2px 1px 7px #005000;
     overflow: hidden;
     white-space: nowrap;
 }
@@ -174,7 +177,8 @@ export default vueComponent(Window);
 }
 
 .close-button:hover {
-    background-color: #69C05F;
+    color: white;
+    background-color: #FF3030;
 }
 
-</style>
\ No newline at end of file
+</style>

From 8c9d4a12ee1bb4b6d98831681487b1751a868fac Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 8 Jul 2022 13:24:13 +0700
Subject: [PATCH 03/47] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B9=D0=BA=D0=B0=20=D1=86=D0=B2=D0=B5=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/share/Window.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/components/share/Window.vue b/client/components/share/Window.vue
index 2b5977de..51bb253b 100644
--- a/client/components/share/Window.vue
+++ b/client/components/share/Window.vue
@@ -127,9 +127,6 @@ class Window {
 
 export default vueComponent(Window);
 //-----------------------------------------------------------------------------
-//    background-color: #69C05F;
-//    text-shadow: 2px 1px 5px black, 2px 2px 5px black;
-
 </script>
 
 <style scoped>
@@ -164,7 +161,7 @@ export default vueComponent(Window);
 .header-text {
     margin-left: 10px;
     margin-right: 10px;
-    color: #50FFFF;
+    color: #70FFFF;
     text-shadow: 2px 2px 5px #005000, 2px 1px 7px #005000;
     overflow: hidden;
     white-space: nowrap;

From d49c9baec3bf1e3b93d233bbda060f63a3d8b673 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 8 Jul 2022 13:34:53 +0700
Subject: [PATCH 04/47] =?UTF-8?q?=D0=A3=D0=BD=D0=B8=D1=84=D0=B8=D0=BA?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84?=
 =?UTF-8?q?=D0=B5=D0=B9=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Reader/HelpPage/HelpPage.vue   | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/client/components/Reader/HelpPage/HelpPage.vue b/client/components/Reader/HelpPage/HelpPage.vue
index 8278affa..2e1d80be 100644
--- a/client/components/Reader/HelpPage/HelpPage.vue
+++ b/client/components/Reader/HelpPage/HelpPage.vue
@@ -5,13 +5,20 @@
         </template>
 
         <div class="col column" style="min-width: 600px">
-            <q-btn-toggle
-                v-model="selectedTab"
-                toggle-color="primary"
-                no-caps unelevated
-                :options="buttons"
-            />
-            <div class="separator"></div>
+            <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 v-for="btn in buttons" :key="btn.value" :name="btn.value" :label="btn.label" />
+                </q-tabs>
+            </div>
 
             <keep-alive>
                 <component :is="activePage" ref="page" class="col"></component>
@@ -93,8 +100,4 @@ export default vueComponent(HelpPage);
 </script>
 
 <style scoped>
-.separator {
-    height: 1px;
-    background-color: #E0E0E0;
-}
 </style>

From a29f9d9a4b5705297451596fa2e450c6cdf8e9ed Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 8 Jul 2022 13:43:59 +0700
Subject: [PATCH 05/47] =?UTF-8?q?=D0=A3=D0=BD=D0=B8=D1=84=D0=B8=D0=BA?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=BE=D0=BA=D0=BE=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reader/RecentBooksPage/RecentBooksPage.vue         | 10 +++++-----
 client/components/Reader/SettingsPage/SettingsPage.vue |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index 3ecee803..8ec2c51e 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -28,9 +28,9 @@
                     <q-th key="date" class="td-mp break-word" style="width: 77px" :props="props">
                         <span v-html="props.cols[1].label"></span>
                     </q-th>
-                    <q-th key="desc" class="td-mp" style="width: 332px" :props="props" colspan="4">
+                    <q-th key="desc" class="td-mp" style="width: 300px" :props="props" colspan="4">
                         <q-input ref="input" v-model="search"
-                            outlined dense rounded style="position: absolute; top: 6px; left: 90px; width: 380px" bg-color="white"
+                            outlined dense rounded style="position: absolute; top: 6px; left: 90px; width: 350px" bg-color="white"
                             placeholder="Найти"                            
                             @click.stop
                         >
@@ -59,12 +59,12 @@
                     </q-td>
 
                     <q-td key="desc" auto-width :props="props" class="td-mp clickable" @click="loadBook(props.row.url)">
-                        <div class="break-word" style="width: 332px; font-size: 90%">
+                        <div class="break-word" style="width: 300px; font-size: 90%">
                             <div style="color: green">
                                 {{ props.row.desc.author }}
                             </div>
                             <div>{{ props.row.desc.title }}</div>
-                            <div class="read-bar" :style="`width: ${332*props.row.readPart}px`"></div>
+                            <div class="read-bar" :style="`width: ${300*props.row.readPart}px`"></div>
                         </div>
                     </q-td>
 
@@ -341,7 +341,7 @@ export default vueComponent(RecentBooksPage);
 
 <style scoped>
 .recent-books-table {
-    width: 600px;
+    width: 573px;
     overflow-y: auto;
     overflow-x: hidden;
 }
diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue
index 2cb0dc21..38b0f33c 100644
--- a/client/components/Reader/SettingsPage/SettingsPage.vue
+++ b/client/components/Reader/SettingsPage/SettingsPage.vue
@@ -1,5 +1,5 @@
 <template>
-    <Window ref="window" height="95%" width="600px" @close="close">
+    <Window ref="window" width="600px" @close="close">
         <template #header>
             Настройки
         </template>

From 07446696c1ffb4c117af26a42daeb0565785916b Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 8 Jul 2022 13:52:45 +0700
Subject: [PATCH 06/47] =?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=D1=86=D0=B2=D0=B5=D1=82=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/client/components/share/Window.vue b/client/components/share/Window.vue
index 51bb253b..b9fe757a 100644
--- a/client/components/share/Window.vue
+++ b/client/components/share/Window.vue
@@ -161,7 +161,7 @@ export default vueComponent(Window);
 .header-text {
     margin-left: 10px;
     margin-right: 10px;
-    color: #70FFFF;
+    color: #80FFFF;
     text-shadow: 2px 2px 5px #005000, 2px 1px 7px #005000;
     overflow: hidden;
     white-space: nowrap;

From 4a9eb7e4bb217624ce1be571fbd1c1704ce9ae5f Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 8 Jul 2022 14:30:44 +0700
Subject: [PATCH 07/47] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=83=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88=D0=B5=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/share/bookManager.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/components/Reader/share/bookManager.js b/client/components/Reader/share/bookManager.js
index ad07c0d0..cf9d7451 100644
--- a/client/components/Reader/share/bookManager.js
+++ b/client/components/Reader/share/bookManager.js
@@ -17,9 +17,6 @@ const bmDataStore = localForage.createInstance({
 });
 
 //список недавно открытых книг
-const bmRecentStoreOld = localForage.createInstance({
-    name: 'bmRecentStore'
-});
 const bmRecentStoreNew = localForage.createInstance({
     name: 'bmRecentStoreNew'
 });

From 66cf7790b3f8d7660076e391dd974e3f88b53e69 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 8 Jul 2022 19:09:57 +0700
Subject: [PATCH 08/47] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20ContentsPage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reader/ContentsPage/ContentsPage.vue      | 62 +++++++++++++------
 1 file changed, 44 insertions(+), 18 deletions(-)

diff --git a/client/components/Reader/ContentsPage/ContentsPage.vue b/client/components/Reader/ContentsPage/ContentsPage.vue
index 135657aa..4ade64d4 100644
--- a/client/components/Reader/ContentsPage/ContentsPage.vue
+++ b/client/components/Reader/ContentsPage/ContentsPage.vue
@@ -23,10 +23,10 @@
 
         <div class="q-mb-sm" />
 
-        <div v-show="selectedTab == 'contents'" class="tab-panel">
+        <div v-show="selectedTab == 'contents'" ref="tabPanel" class="tab-panel">
             <div>
                 <div v-for="item in contents" :key="item.key" class="column" style="width: 540px">
-                    <div class="row q-px-sm no-wrap" :class="{'item': !item.isBookPos, 'item-book-pos': item.isBookPos}">
+                    <div :ref="`mainitem${item.key}`" class="row q-px-sm no-wrap" :class="{'item': !item.isBookPos, 'item-book-pos': item.isBookPos}">
                         <div v-if="item.list.length" class="row justify-center items-center expand-button clickable" @click="expandClick(item.key)">
                             <q-icon name="la la-caret-right" class="icon" :class="{'expanded-icon': item.expanded}" color="green-8" size="20px" />
                         </div>
@@ -42,8 +42,12 @@
                         </div>
                     </div>
                     
-                    <div v-if="item.expanded" :ref="`subitem${item.key}`" class="subitems-transition">
-                        <div v-for="subitem in item.list" :key="subitem.key" class="row q-px-sm no-wrap" :class="{'subitem': !subitem.isBookPos, 'subitem-book-pos': subitem.isBookPos}">
+                    <div v-if="item.expanded" :ref="`subdiv${item.key}`" class="subitems-transition">
+                        <div 
+                            v-for="subitem in item.list" 
+                            :ref="`subitem${subitem.key}`" 
+                            :key="subitem.key" class="row q-px-sm no-wrap" :class="{'subitem': !subitem.isBookPos, 'subitem-book-pos': subitem.isBookPos}"
+                        >
                             <div class="col row clickable" @click="setBookPos(subitem.offset)">
                                 <div class="no-expand-button"></div>
                                 <div :style="subitem.indentStyle"></div>
@@ -289,24 +293,24 @@ class ContentsPage {
             const item = this.contents[i];
             const nextOffset = (i < this.contents.length - 1 ? this.contents[i + 1].offset : this.parsed.textLength);
 
+            if (bp >= item.offset && bp < nextOffset) {
+                item.isBookPos = true;
+                this.updateBookPosScrollTop(item);
+            } else if (item.isBookPos) {
+                item.isBookPos = false;
+            }
+
             for (let j = 0; j < item.list.length; j++) {
                 const subitem = item.list[j];
                 const nextSubOffset = (j < item.list.length - 1 ? item.list[j + 1].offset : nextOffset);
 
                 if (bp >= subitem.offset && bp < nextSubOffset) {
                     subitem.isBookPos = true;
-                    this.contents[i] = Object.assign(item, {list: item.list});
+                    this.updateBookPosScrollTop(item, subitem, j);
                 } else if (subitem.isBookPos) {
                     subitem.isBookPos = false;
-                    this.contents[i] = Object.assign(item, {list: item.list});
                 }
             }
-
-            if (bp >= item.offset && bp < nextOffset) {
-                this.contents[i] = Object.assign(item, {isBookPos: true});
-            } else if (item.isBookPos) {
-                this.contents[i] = Object.assign(item, {isBookPos: false});
-            }
         }
 
         for (let i = 0; i < this.images.length; i++) {
@@ -314,13 +318,35 @@ class ContentsPage {
             const nextOffset = (i < this.images.length - 1 ? this.images[i + 1].offset : this.parsed.textLength);
 
             if (bp >= img.offset && bp < nextOffset) {
-                this.images[i] = Object.assign(img, {isBookPos: true});
+                this.images[i].isBookPos = true;
             } else if (img.isBookPos) {
-                this.images[i] = Object.assign(img, {isBookPos: false});
+                this.images[i].isBookPos = false;
             }
         }
     }
 
+    updateBookPosScrollTop(item, subitem, i) {
+        try {
+            if (this.selectedTab == 'contents') {
+                let el = this.getFirstElem(this.$refs[`mainitem${item.key}`]);
+                let elShift = 0;
+                if (subitem && item.expanded) {
+                    const subEl = this.getFirstElem(this.$refs[`subitem${subitem.key}`]);
+                    elShift = el.offsetHeight - (0.5 + subEl.offsetHeight)*(i + 1);
+                } else {
+                    elShift = el.offsetHeight;
+                }
+
+                const halfH = this.$refs.tabPanel.clientHeight/2;
+                const newScrollTop = el.offsetTop - halfH - elShift;
+                if (newScrollTop < this.$refs.tabPanel.scrollTop - halfH || newScrollTop > this.$refs.tabPanel.scrollTop + halfH) 
+                    this.$refs.tabPanel.scrollTop = newScrollTop;
+            }
+        } catch (e) {
+            console.error(e);
+        }
+    }
+
     getFirstElem(items) {
         return (Array.isArray(items) ? items[0] : items);
     }
@@ -330,8 +356,8 @@ class ContentsPage {
         const expanded = !item.expanded;
 
         if (!expanded) {
-            let subitems = this.getFirstElem(this.$refs[`subitem${key}`]);
-            subitems.style.height = '0';
+            let subdiv = this.getFirstElem(this.$refs[`subdiv${key}`]);
+            subdiv.style.height = '0';
             await utils.sleep(200);
         }
 
@@ -339,8 +365,8 @@ class ContentsPage {
 
         if (expanded) {
             await this.$nextTick();
-            let subitems = this.getFirstElem(this.$refs[`subitem${key}`]);
-            subitems.style.height = subitems.scrollHeight + 'px';
+            let subdiv = this.getFirstElem(this.$refs[`subdiv${key}`]);
+            subdiv.style.height = subdiv.scrollHeight + 'px';
         }
     }
 

From 85910a20e9cac4daa1aefa13ce30f29ac133af66 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 8 Jul 2022 20:50:55 +0700
Subject: [PATCH 09/47] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20ContentsPage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reader/ContentsPage/ContentsPage.vue      | 45 ++++++++++++++-----
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/client/components/Reader/ContentsPage/ContentsPage.vue b/client/components/Reader/ContentsPage/ContentsPage.vue
index 4ade64d4..c18fd08c 100644
--- a/client/components/Reader/ContentsPage/ContentsPage.vue
+++ b/client/components/Reader/ContentsPage/ContentsPage.vue
@@ -23,7 +23,7 @@
 
         <div class="q-mb-sm" />
 
-        <div v-show="selectedTab == 'contents'" ref="tabPanel" class="tab-panel">
+        <div v-show="selectedTab == 'contents'" ref="tabPanelContents" class="tab-panel">
             <div>
                 <div v-for="item in contents" :key="item.key" class="column" style="width: 540px">
                     <div :ref="`mainitem${item.key}`" class="row q-px-sm no-wrap" :class="{'item': !item.isBookPos, 'item-book-pos': item.isBookPos}">
@@ -65,10 +65,10 @@
             </div>
         </div>
 
-        <div v-show="selectedTab == 'images'" class="tab-panel">
+        <div v-show="selectedTab == 'images'" ref="tabPanelImages" class="tab-panel">
             <div>
                 <div v-for="item in images" :key="item.key" class="column" style="width: 540px">
-                    <div class="row q-px-sm no-wrap" :class="{'item': !item.isBookPos, 'item-book-pos': item.isBookPos}">
+                    <div :ref="`image${item.key}`" class="row q-px-sm no-wrap" :class="{'item': !item.isBookPos, 'item-book-pos': item.isBookPos}">
                         <div class="col row clickable" @click="setBookPos(item.offset)">
                             <div class="image-thumb-box row justify-center items-center">
                                 <div v-show="!imageLoaded[item.id]" class="image-thumb column justify-center">
@@ -128,7 +128,10 @@ const componentOptions = {
     watch: {
         bookPos() {
             this.updateBookPosSelection();
-        }
+        },
+        selectedTab() {
+            this.updateBookPosSelection();
+        },
     },
 };
 class ContentsPage {
@@ -295,7 +298,7 @@ class ContentsPage {
 
             if (bp >= item.offset && bp < nextOffset) {
                 item.isBookPos = true;
-                this.updateBookPosScrollTop(item);
+                this.updateBookPosScrollTop('contents', item);
             } else if (item.isBookPos) {
                 item.isBookPos = false;
             }
@@ -306,7 +309,7 @@ class ContentsPage {
 
                 if (bp >= subitem.offset && bp < nextSubOffset) {
                     subitem.isBookPos = true;
-                    this.updateBookPosScrollTop(item, subitem, j);
+                    this.updateBookPosScrollTop('contents', item, subitem, j);
                 } else if (subitem.isBookPos) {
                     subitem.isBookPos = false;
                 }
@@ -319,28 +322,46 @@ class ContentsPage {
 
             if (bp >= img.offset && bp < nextOffset) {
                 this.images[i].isBookPos = true;
+                this.updateBookPosScrollTop('images', img);
             } else if (img.isBookPos) {
                 this.images[i].isBookPos = false;
             }
         }
     }
 
-    updateBookPosScrollTop(item, subitem, i) {
+    /*getOffsetTop(key) {
+        let el = this.getFirstElem(this.$refs[`mainitem${key}`]);
+        return (el ? el.offsetTop : 0);
+    }*/
+
+    updateBookPosScrollTop(tab, item, subitem, i) {
         try {
-            if (this.selectedTab == 'contents') {
+            if (tab == 'contents' && this.selectedTab == tab) {
                 let el = this.getFirstElem(this.$refs[`mainitem${item.key}`]);
                 let elShift = 0;
                 if (subitem && item.expanded) {
                     const subEl = this.getFirstElem(this.$refs[`subitem${subitem.key}`]);
-                    elShift = el.offsetHeight - (0.5 + subEl.offsetHeight)*(i + 1);
+                    elShift = el.offsetHeight - subEl.offsetHeight*(i + 1);
                 } else {
                     elShift = el.offsetHeight;
                 }
 
-                const halfH = this.$refs.tabPanel.clientHeight/2;
+                const tabPanel = this.$refs.tabPanelContents;
+                const halfH = tabPanel.clientHeight/2;
                 const newScrollTop = el.offsetTop - halfH - elShift;
-                if (newScrollTop < this.$refs.tabPanel.scrollTop - halfH || newScrollTop > this.$refs.tabPanel.scrollTop + halfH) 
-                    this.$refs.tabPanel.scrollTop = newScrollTop;
+                if (newScrollTop < 20 + tabPanel.scrollTop - halfH || newScrollTop > -20 + tabPanel.scrollTop + halfH) 
+                    tabPanel.scrollTop = newScrollTop;
+            }
+
+            if (tab == 'images' && this.selectedTab == tab) {
+                let el = this.getFirstElem(this.$refs[`image${item.key}`]);
+
+                const tabPanel = this.$refs.tabPanelImages;
+                const halfH = tabPanel.clientHeight/2;
+                const newScrollTop = el.offsetTop - halfH - el.offsetHeight/2;
+
+                if (newScrollTop < 20 + tabPanel.scrollTop - halfH || newScrollTop > -20 + tabPanel.scrollTop + halfH) 
+                    tabPanel.scrollTop = newScrollTop;
             }
         } catch (e) {
             console.error(e);

From 2ecf6beef274ac618979aab341dce38281e62a89 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sat, 9 Jul 2022 01:56:42 +0700
Subject: [PATCH 10/47] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=88=D0=BE=D0=B9=20=D0=B1=D0=B0=D0=B3=D1=84=D0=B8=D0=BA=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 69366647..95f67fe3 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -1180,7 +1180,7 @@ class Reader {
         } catch (e) {
             progress.hide(); this.progressActive = false;
             this.loaderActive = true;
-            if (!this.showHelpOnErrorIfNeeded(e.message)) {
+            if (!this.showHelpOnErrorIfNeeded(url)) {
                 this.$root.stdDialog.alert(e.message, 'Ошибка', {color: 'negative'});
             }
         } finally {

From 53a1d90bd8de1c41c71ffd2e893073b0e484b088 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sat, 9 Jul 2022 02:01:14 +0700
Subject: [PATCH 11/47] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D1=80=D0=B8=20=D0=BE=D1=87=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B4=D0=B8=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=BA=D0=BD=D0=B8=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 95f67fe3..e64e7ccb 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -1116,7 +1116,7 @@ class Reader {
                     this.blinkCachedLoadMessage();
 
                     this.checkBookPosPercent();
-                    await this.activateClickMapPage();
+                    this.activateClickMapPage();//no await
                     return;
                 }
 
@@ -1176,7 +1176,7 @@ class Reader {
                 this.stopBlink = true;
 
             this.checkBookPosPercent();
-            await this.activateClickMapPage();
+            this.activateClickMapPage();//no await
         } catch (e) {
             progress.hide(); this.progressActive = false;
             this.loaderActive = true;

From 30afd2421cddce76b96b8b7d4dacbad6fe4ac1fe Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sat, 9 Jul 2022 20:50:31 +0700
Subject: [PATCH 12/47] =?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

---
 .../Reader/ContentsPage/ContentsPage.vue      | 48 ++++++++++++++++---
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/client/components/Reader/ContentsPage/ContentsPage.vue b/client/components/Reader/ContentsPage/ContentsPage.vue
index c18fd08c..de8698e1 100644
--- a/client/components/Reader/ContentsPage/ContentsPage.vue
+++ b/client/components/Reader/ContentsPage/ContentsPage.vue
@@ -130,7 +130,7 @@ const componentOptions = {
             this.updateBookPosSelection();
         },
         selectedTab() {
-            this.updateBookPosSelection();
+            this.updateBookPosScrollTop();
         },
     },
 };
@@ -289,7 +289,7 @@ class ContentsPage {
         if (!this.isVisible)
             return;
 
-        await utils.sleep(50);
+        await this.$nextTick();
         const bp = this.bookPos;
         
         for (let i = 0; i < this.contents.length; i++) {
@@ -298,7 +298,6 @@ class ContentsPage {
 
             if (bp >= item.offset && bp < nextOffset) {
                 item.isBookPos = true;
-                this.updateBookPosScrollTop('contents', item);
             } else if (item.isBookPos) {
                 item.isBookPos = false;
             }
@@ -322,11 +321,12 @@ class ContentsPage {
 
             if (bp >= img.offset && bp < nextOffset) {
                 this.images[i].isBookPos = true;
-                this.updateBookPosScrollTop('images', img);
             } else if (img.isBookPos) {
                 this.images[i].isBookPos = false;
             }
         }
+
+        this.updateBookPosScrollTop();
     }
 
     /*getOffsetTop(key) {
@@ -334,9 +334,32 @@ class ContentsPage {
         return (el ? el.offsetTop : 0);
     }*/
 
-    updateBookPosScrollTop(tab, item, subitem, i) {
+    async updateBookPosScrollTop() {
         try {
-            if (tab == 'contents' && this.selectedTab == tab) {
+            await this.$nextTick();
+
+            if (this.selectedTab == 'contents') {
+                let item;
+                let subitem;
+                let i;
+
+                //ищем выделенные item
+                for(const _item of this.contents) {
+                    if (_item.isBookPos) {
+                        item = _item;
+                        for (let ii = 0; ii < item.list.length; ii++) {
+                            const _subitem = item.list[ii];
+                            if (_subitem.isBookPos) {
+                                subitem = _subitem;
+                                i = ii;
+                                break;
+                            }
+                        }
+                        break;
+                    }
+                }
+
+                //вычисляем и смещаем tabPanel.scrollTop
                 let el = this.getFirstElem(this.$refs[`mainitem${item.key}`]);
                 let elShift = 0;
                 if (subitem && item.expanded) {
@@ -353,7 +376,18 @@ class ContentsPage {
                     tabPanel.scrollTop = newScrollTop;
             }
 
-            if (tab == 'images' && this.selectedTab == tab) {
+            if (this.selectedTab == 'images') {
+                let item;
+
+                //ищем выделенные item
+                for(const _item of this.images) {
+                    if (_item.isBookPos) {
+                        item = _item;
+                        break;
+                    }
+                }
+
+                //вычисляем и смещаем tabPanel.scrollTop
                 let el = this.getFirstElem(this.$refs[`image${item.key}`]);
 
                 const tabPanel = this.$refs.tabPanelImages;

From 36aa057035560f5d45589ec9bafc3e6e23ae6e0d Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sat, 9 Jul 2022 21:00:09 +0700
Subject: [PATCH 13/47] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=86=D0=B2=D0=B5=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/share/Window.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/components/share/Window.vue b/client/components/share/Window.vue
index b9fe757a..1bbab94a 100644
--- a/client/components/share/Window.vue
+++ b/client/components/share/Window.vue
@@ -161,8 +161,8 @@ export default vueComponent(Window);
 .header-text {
     margin-left: 10px;
     margin-right: 10px;
-    color: #80FFFF;
-    text-shadow: 2px 2px 5px #005000, 2px 1px 7px #005000;
+    color: #FFFFA0;
+    text-shadow: 2px 2px 5px #005000, 2px 1px 5px #005000;
     overflow: hidden;
     white-space: nowrap;
 }

From 63840fadbcde7d3c5de939feb09aa7ece0fc2c4f Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 10 Jul 2022 14:59:39 +0700
Subject: [PATCH 14/47] =?UTF-8?q?=D0=9A=20=D0=BF=D1=80=D0=B5=D0=B4=D1=8B?=
 =?UTF-8?q?=D0=B4=D1=83=D1=89=D0=B5=D0=BC=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/ContentsPage/ContentsPage.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/components/Reader/ContentsPage/ContentsPage.vue b/client/components/Reader/ContentsPage/ContentsPage.vue
index de8698e1..8186d161 100644
--- a/client/components/Reader/ContentsPage/ContentsPage.vue
+++ b/client/components/Reader/ContentsPage/ContentsPage.vue
@@ -359,6 +359,9 @@ class ContentsPage {
                     }
                 }
 
+                if (!item)
+                    return;
+
                 //вычисляем и смещаем tabPanel.scrollTop
                 let el = this.getFirstElem(this.$refs[`mainitem${item.key}`]);
                 let elShift = 0;
@@ -387,6 +390,9 @@ class ContentsPage {
                     }
                 }
 
+                if (!item)
+                    return;
+
                 //вычисляем и смещаем tabPanel.scrollTop
                 let el = this.getFirstElem(this.$refs[`image${item.key}`]);
 

From 81798897c874d76b164cdd067828f27ef35e69ed Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 10 Jul 2022 16:38:54 +0700
Subject: [PATCH 15/47] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D0=BC=D0=B5=D1=85=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=20=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BA=D0=BD=D0=B8=D0=B3:=20=D1=82=D0=B5=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D1=8C=20=D0=BE=D1=80=D0=B8=D0=B5=D0=BD=D1=82=D0=B8?=
 =?UTF-8?q?=D1=80=D1=83=D0=B5=D0=BC=D1=81=D1=8F=20=D0=BD=D0=B0=20"=D0=BA?=
 =?UTF-8?q?=D0=BB=D1=8E=D1=87-filepath",=20=D0=B0=20=D0=BD=D0=B5=20"=D0=BA?=
 =?UTF-8?q?=D0=BB=D1=8E=D1=87-url"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/Reader.vue           |  7 +-
 client/components/Reader/share/bookManager.js | 79 +++++++++++++++----
 2 files changed, 68 insertions(+), 18 deletions(-)

diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index e64e7ccb..94c4760f 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -900,7 +900,7 @@ class Reader {
 
     refreshBook() {
         const mrb = this.mostRecentBook();
-        this.loadBook({url: mrb.url, uploadFileName: mrb.uploadFileName, force: true});
+        this.loadBook(Object.assign({}, mrb, {force: true}));
     }
 
     undoAction() {
@@ -1091,8 +1091,7 @@ class Reader {
             progress.setState({state: 'parse'});
 
             // есть ли среди недавних
-            const key = bookManager.keyFromUrl(url);
-            let wasOpened = await bookManager.getRecentBook({key});
+            let wasOpened = bookManager.findRecentByUrl(url);
             wasOpened = (wasOpened ? wasOpened : {});
             const bookPos = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos);
             const bookPosSeen = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPosSeen);
@@ -1102,7 +1101,7 @@ class Reader {
 
             if (!opts.force) {
                 // пытаемся загрузить и распарсить книгу в менеджере из локального кэша
-                const bookParsed = await bookManager.getBook({url, path: opts.path}, (prog) => {
+                const bookParsed = await bookManager.getBook({path: (opts.path? opts.path : wasOpened.path)}, (prog) => {
                     progress.setState({progress: prog});
                 });
 
diff --git a/client/components/Reader/share/bookManager.js b/client/components/Reader/share/bookManager.js
index cf9d7451..233c0a95 100644
--- a/client/components/Reader/share/bookManager.js
+++ b/client/components/Reader/share/bookManager.js
@@ -1,10 +1,12 @@
 import localForage from 'localforage';
+import path from 'path-browserify';
 import _ from 'lodash';
 
 import * as utils from '../../../share/utils';
 import BookParser from './BookParser';
 
 const maxDataSize = 500*1024*1024;//compressed bytes
+const maxRecentLength = 5000;
 
 //локальный кэш метаданных книг, ограничение maxDataSize
 const bmMetaStore = localForage.createInstance({
@@ -36,7 +38,7 @@ class BookManager {
 
         this.saveRecentItem = _.debounce(() => {
             bmRecentStoreNew.setItem('recent-item', this.recentItem);
-            this.recentRev = (this.recentRev < 1000 ? this.recentRev + 1 : 1);
+            this.recentRev = (this.recentRev < maxRecentLength ? this.recentRev + 1 : 1);
             bmRecentStoreNew.setItem('rev', this.recentRev);
         }, 200, {maxWait: 300});
 
@@ -51,6 +53,8 @@ class BookManager {
             if (this.recentItem)
                 this.recent[this.recentItem.key] = this.recentItem;
 
+            this.convertRecent();
+
             this.recentLastKey = await bmRecentStoreNew.getItem('recent-last-key');
             if (this.recentLastKey) {
                 const meta = await bmMetaStore.getItem(`bmMeta-${this.recentLastKey}`);
@@ -67,6 +71,36 @@ class BookManager {
         this.loadStored();//no await
     }
 
+    //TODO: убрать в 2025г
+    convertRecent() {
+        let converted = false;
+
+        for (const key in this.recent) {
+            const book = this.recent[key];
+
+            if (!book.path) {
+                continue;
+            }
+
+            const newKey = this.keyFromPath(book.path);
+
+            if (!book.deleted && key !== newKey) {
+                this.recent[newKey] = _.cloneDeep(this.recent[key]);
+                this.recent[key].deleted = 1;
+                converted = true; 
+            }
+        }
+
+        //console.log(converted);
+        if (converted) {
+            (async() => {
+                await utils.sleep(5000);
+                this.saveRecent();
+                this.emit('recent-changed');
+            })();
+        }
+    }
+
     //Ленивая асинхронная загрузка bmMetaStore
     async loadStored() {
         //даем время для загрузки последней читаемой книги, чтобы не блокировать приложение
@@ -193,7 +227,7 @@ class BookManager {
 
     async addBook(newBook, callback) {        
         let meta = {url: newBook.url, path: newBook.path};
-        meta.key = this.keyFromUrl(meta.url);
+        meta.key = this.keyFromPath(meta.path);
         meta.addTime = Date.now();
 
         const cb = (perc) => {
@@ -229,10 +263,10 @@ class BookManager {
     async hasBookParsed(meta) {
         if (!this.books) 
             return false;
-        if (!meta.url)
+        if (!meta.path)
             return false;
         if (!meta.key)
-            meta.key = this.keyFromUrl(meta.url);
+            meta.key = this.keyFromPath(meta.path);
 
         let book = this.books[meta.key];
 
@@ -247,8 +281,12 @@ class BookManager {
 
     async getBook(meta, callback) {
         let result = undefined;
+
+        if (!meta.path)
+            return;
+
         if (!meta.key)
-            meta.key = this.keyFromUrl(meta.url);
+            meta.key = this.keyFromPath(meta.path);
 
         result = this.books[meta.key];
 
@@ -258,11 +296,6 @@ class BookManager {
                 this.books[meta.key] = result;
         }
 
-        //Если файл на сервере изменился, считаем, что в кеше его нету
-        if (meta.path && result && meta.path != result.path) {
-            return;
-        }
-
         if (result && !result.parsed) {
             let data = await bmDataStore.getItem(`bmData-${meta.key}`);
             callback(5);
@@ -322,10 +355,13 @@ class BookManager {
         return result;
     }
 
-    keyFromUrl(url) {
+    /*keyFromUrl(url) {
         return utils.stringToHex(url);
-    }
+    }*/
 
+    keyFromPath(bookPath) {
+        return path.basename(bookPath);
+    }
     //-- recent --------------------------------------------------------------
     async recentSetItem(item = null, skipCheck = false) {
         const rev = await bmRecentStoreNew.getItem('rev');
@@ -398,7 +434,7 @@ class BookManager {
         const sorted = this.getSortedRecent();
 
         let isDel = false;
-        for (let i = 1000; i < sorted.length; i++) {
+        for (let i = maxRecentLength; i < sorted.length; i++) {
             delete this.recent[sorted[i].key];
             isDel = true;
         }
@@ -418,7 +454,7 @@ class BookManager {
 
         let max = 0;
         let result = null;
-        for (let key in this.recent) {
+        for (const key in this.recent) {
             const book = this.recent[key];
             if (!book.deleted && book.touchTime > max) {
                 max = book.touchTime;
@@ -449,6 +485,21 @@ class BookManager {
         return result;
     }
 
+    findRecentByUrl(url) {
+        let max = 0;
+        let result = null;
+
+        for (const key in this.recent) {
+            const book = this.recent[key];
+            if (!book.deleted && book.url == url && book.addTime > max) {
+                max = book.addTime;
+                result = book;
+            }
+        }
+
+        return result;
+    }
+
     async setRecent(value) {
         const mergedRecent = _.cloneDeep(this.recent);
 

From c878ce432ff72940dfa8c6df6c6aab9a97e9cb28 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 10 Jul 2022 17:20:47 +0700
Subject: [PATCH 16/47] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=88=D0=BE=D0=B5=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D0=BF=D0=BE=D0=B7=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=B2=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=B4=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/Reader/BookConverter/textUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/core/Reader/BookConverter/textUtils.js b/server/core/Reader/BookConverter/textUtils.js
index 5a7f926f..ef056067 100644
--- a/server/core/Reader/BookConverter/textUtils.js
+++ b/server/core/Reader/BookConverter/textUtils.js
@@ -3,7 +3,7 @@ const chardet = require('chardet');
 function getEncoding(buf) {
     let selected = getEncodingLite(buf);
 
-    if (selected == 'ISO-8859-5') {
+    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) {

From 5edeed074795fc0ca3dfc43d145aa31e3cb5b9b0 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 10 Jul 2022 17:31:21 +0700
Subject: [PATCH 17/47] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B5=D1=85=D0=B0=D0=BD=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=BC=D0=B0=20=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=BA=D0=BD=D0=B8=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/Reader.vue                   |  4 ++--
 .../Reader/RecentBooksPage/RecentBooksPage.vue        | 11 ++++++-----
 client/components/Reader/share/bookManager.js         |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 94c4760f..4edc1a92 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -1091,7 +1091,7 @@ class Reader {
             progress.setState({state: 'parse'});
 
             // есть ли среди недавних
-            let wasOpened = bookManager.findRecentByUrl(url);
+            let wasOpened = bookManager.findRecentByUrlAndPath(url, opts.path);
             wasOpened = (wasOpened ? wasOpened : {});
             const bookPos = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos);
             const bookPosSeen = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPosSeen);
@@ -1101,7 +1101,7 @@ class Reader {
 
             if (!opts.force) {
                 // пытаемся загрузить и распарсить книгу в менеджере из локального кэша
-                const bookParsed = await bookManager.getBook({path: (opts.path? opts.path : wasOpened.path)}, (prog) => {
+                const bookParsed = await bookManager.getBook({path: (opts.path ? opts.path : wasOpened.path)}, (prog) => {
                     progress.setState({progress: prog});
                 });
 
diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index 8ec2c51e..eba83b0f 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -29,7 +29,8 @@
                         <span v-html="props.cols[1].label"></span>
                     </q-th>
                     <q-th key="desc" class="td-mp" style="width: 300px" :props="props" colspan="4">
-                        <q-input ref="input" v-model="search"
+                        <q-input 
+                            ref="input" v-model="search"
                             outlined dense rounded style="position: absolute; top: 6px; left: 90px; width: 350px" bg-color="white"
                             placeholder="Найти"                            
                             @click.stop
@@ -51,14 +52,14 @@
                         </div>
                     </q-td>
 
-                    <q-td key="date" auto-width :props="props" class="td-mp clickable" @click="loadBook(props.row.url)">
+                    <q-td key="date" auto-width :props="props" class="td-mp clickable" @click="loadBook(props.row)">
                         <div class="break-word" style="width: 68px">
                             {{ props.row.touchDate }}<br>
                             {{ props.row.touchTime }}
                         </div>
                     </q-td>
 
-                    <q-td key="desc" auto-width :props="props" class="td-mp clickable" @click="loadBook(props.row.url)">
+                    <q-td key="desc" auto-width :props="props" class="td-mp clickable" @click="loadBook(props.row)">
                         <div class="break-word" style="width: 300px; font-size: 90%">
                             <div style="color: green">
                                 {{ props.row.desc.author }}
@@ -311,8 +312,8 @@ class RecentBooksPage {
             this.close();
     }
 
-    loadBook(url) {
-        this.$emit('load-book', {url});
+    loadBook(row) {
+        this.$emit('load-book', {url: row.url, path: row.path});
         this.close();
     }
 
diff --git a/client/components/Reader/share/bookManager.js b/client/components/Reader/share/bookManager.js
index 233c0a95..c7b1fe38 100644
--- a/client/components/Reader/share/bookManager.js
+++ b/client/components/Reader/share/bookManager.js
@@ -485,13 +485,13 @@ class BookManager {
         return result;
     }
 
-    findRecentByUrl(url) {
+    findRecentByUrlAndPath(url, bookPath) {
         let max = 0;
         let result = null;
 
         for (const key in this.recent) {
             const book = this.recent[key];
-            if (!book.deleted && book.url == url && book.addTime > max) {
+            if (!book.deleted && book.url == url && book.addTime > max && (!bookPath || book.path == bookPath)) {
                 max = book.addTime;
                 result = book;
             }

From 26ab5d6765ea6eca60bd0b1712d820583da10965 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 10 Jul 2022 18:27:05 +0700
Subject: [PATCH 18/47] =?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

---
 client/components/Reader/Reader.vue           | 25 +++++++-----
 client/components/Reader/share/bookManager.js | 38 +++++++++++--------
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 4edc1a92..dd0e294d 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -1092,24 +1092,28 @@ class Reader {
 
             // есть ли среди недавних
             let wasOpened = bookManager.findRecentByUrlAndPath(url, opts.path);
-            wasOpened = (wasOpened ? wasOpened : {});
-            const bookPos = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos);
-            const bookPosSeen = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPosSeen);
-            const uploadFileName = (opts.uploadFileName ? opts.uploadFileName : '');
+            wasOpened = (wasOpened ? _.cloneDeep(wasOpened) : {});
+            
+            wasOpened = Object.assign(wasOpened, {
+                path: (opts.path !== undefined ? opts.path : wasOpened.path),
+                bookPos: (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos),
+                bookPosSeen: (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPosSeen),
+                uploadFileName: (opts.uploadFileName ? opts.uploadFileName : wasOpened.uploadFileName),
+            });
 
             let book = null;
 
             if (!opts.force) {
                 // пытаемся загрузить и распарсить книгу в менеджере из локального кэша
-                const bookParsed = await bookManager.getBook({path: (opts.path ? opts.path : wasOpened.path)}, (prog) => {
+                const bookParsed = await bookManager.getBook(wasOpened, (prog) => {
                     progress.setState({progress: prog});
                 });
 
                 // если есть в локальном кэше
                 if (bookParsed) {
-                    await bookManager.setRecentBook(Object.assign({bookPos, bookPosSeen}, bookParsed));
+                    await bookManager.setRecentBook(Object.assign(wasOpened, bookParsed));
                     this.mostRecentBook();
-                    this.addAction(bookPos);
+                    this.addAction(wasOpened.bookPos);
                     this.loaderActive = false;
                     progress.hide(); this.progressActive = false;
                     this.blinkCachedLoadMessage();
@@ -1140,7 +1144,7 @@ class Reader {
             if (!book) {
                 book = await readerApi.loadBook({
                         url,
-                        uploadFileName,
+                        uploadFileName: wasOpened.uploadFileName,
                         enableSitesFilter: this.enableSitesFilter,
                         skipHtmlCheck: (this.splitToPara ? true : false),
                         isText: (this.splitToPara ? true : false),
@@ -1157,14 +1161,15 @@ class Reader {
 
             // добавляем в bookManager
             progress.setState({state: 'parse', step: 5});
+
             const addedBook = await bookManager.addBook(book, (prog) => {
                 progress.setState({progress: prog});
             });
 
             // добавляем в историю
-            await bookManager.setRecentBook(Object.assign({bookPos, bookPosSeen, uploadFileName}, addedBook));
+            await bookManager.setRecentBook(Object.assign(wasOpened, addedBook));
             this.mostRecentBook();
-            this.addAction(bookPos);
+            this.addAction(wasOpened.bookPos);
             this.updateRoute(true);
 
             this.loaderActive = false;
diff --git a/client/components/Reader/share/bookManager.js b/client/components/Reader/share/bookManager.js
index c7b1fe38..b9d0b29e 100644
--- a/client/components/Reader/share/bookManager.js
+++ b/client/components/Reader/share/bookManager.js
@@ -53,7 +53,8 @@ class BookManager {
             if (this.recentItem)
                 this.recent[this.recentItem.key] = this.recentItem;
 
-            this.convertRecent();
+            //конвертируем в новые ключи
+            await this.convertRecent();
 
             this.recentLastKey = await bmRecentStoreNew.getItem('recent-last-key');
             if (this.recentLastKey) {
@@ -72,12 +73,14 @@ class BookManager {
     }
 
     //TODO: убрать в 2025г
-    convertRecent() {
-        let converted = false;
+    async convertRecent() {
+        const converted = await bmRecentStoreNew.getItem('recent-converted');
+
+        if (converted)
+            return;
 
         for (const key in this.recent) {
             const book = this.recent[key];
-
             if (!book.path) {
                 continue;
             }
@@ -85,20 +88,18 @@ class BookManager {
             const newKey = this.keyFromPath(book.path);
 
             if (!book.deleted && key !== newKey) {
-                this.recent[newKey] = _.cloneDeep(this.recent[key]);
-                this.recent[key].deleted = 1;
-                converted = true; 
+                this.recent[newKey] = _.cloneDeep(book);
+                book.deleted = 1;
             }
         }
 
         //console.log(converted);
-        if (converted) {
-            (async() => {
-                await utils.sleep(5000);
-                this.saveRecent();
-                this.emit('recent-changed');
-            })();
-        }
+        (async() => {
+            await utils.sleep(3000);
+            this.saveRecent();
+            this.emit('recent-changed');
+            await bmRecentStoreNew.setItem('recent-converted', true);
+        })();
     }
 
     //Ленивая асинхронная загрузка bmMetaStore
@@ -486,12 +487,19 @@ class BookManager {
     }
 
     findRecentByUrlAndPath(url, bookPath) {
+        if (bookPath) {
+            const key = this.keyFromPath(bookPath);
+            const book = this.recent[key];
+            if (book && !book.deleted)
+                return book;
+        }
+
         let max = 0;
         let result = null;
 
         for (const key in this.recent) {
             const book = this.recent[key];
-            if (!book.deleted && book.url == url && book.addTime > max && (!bookPath || book.path == bookPath)) {
+            if (!book.deleted && book.url == url && book.addTime > max) {
                 max = book.addTime;
                 result = book;
             }

From f10291b6c68c1f89f92607ca95b6ded81f47ead1 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 10 Jul 2022 19:51:31 +0700
Subject: [PATCH 19/47] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=B4=D0=B5=D0=B9=D1=81=D1=82=D0=B2=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/store/modules/reader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/store/modules/reader.js b/client/store/modules/reader.js
index 8e01554e..53f34918 100644
--- a/client/store/modules/reader.js
+++ b/client/store/modules/reader.js
@@ -21,7 +21,7 @@ const readerActions = {
     'offlineMode': 'Автономный режим (без интернета)',
     'contents': 'Оглавление/закладки',
     'libs': 'Сетевая библиотека',
-    'recentBooks': 'Открыть недавние',
+    'recentBooks': 'Показать загруженные',
     'switchToolbar': 'Показать/скрыть панель управления',
     'donate': '',
     'bookBegin': 'В начало книги',

From 1cda186b1a8424229011bb2cb3ab70e40d6e756a Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 10 Jul 2022 19:52:29 +0700
Subject: [PATCH 20/47] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B4=D0=B8=D0=B0=D0=BB=D0=BE=D0=B3=20askYesNo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/share/StdDialog.vue | 45 +++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/client/components/share/StdDialog.vue b/client/components/share/StdDialog.vue
index 384585df..057299fc 100644
--- a/client/components/share/StdDialog.vue
+++ b/client/components/share/StdDialog.vue
@@ -55,6 +55,34 @@
             </div>
         </div>
 
+        <!--------------------------------------------------->
+        <div v-show="type == 'askYesNo'" class="bg-white no-wrap">
+            <div class="header row">
+                <div class="caption col row items-center q-ml-md">
+                    <q-icon v-show="caption" class="q-mr-sm" :class="iconColor" :name="iconName" size="28px"></q-icon>
+                    <div v-html="caption"></div>
+                </div>
+                <div class="close-icon column justify-center items-center">
+                    <q-btn v-close-popup flat round dense>
+                        <q-icon name="la la-times" size="18px"></q-icon>
+                    </q-btn>
+                </div>
+            </div>
+
+            <div class="q-mx-md">
+                <div v-html="message"></div>
+            </div>
+
+            <div class="buttons row justify-end q-pa-md">
+                <q-btn v-close-popup class="q-px-md q-ml-sm" dense no-caps>
+                    Нет
+                </q-btn>
+                <q-btn class="q-px-md q-ml-sm" color="primary" dense no-caps @click="okClick">
+                    Да
+                </q-btn>
+            </div>
+        </div>
+
         <!--------------------------------------------------->
         <div v-show="type == 'prompt'" class="bg-white no-wrap">
             <div class="header row">
@@ -262,6 +290,23 @@ class StdDialog {
         });
     }
 
+    askYesNo(message, caption, opts) {
+        return new Promise((resolve) => {
+            this.init(message, caption, opts);
+
+            this.hideTrigger = () => {
+                if (this.ok) {
+                    resolve(true);
+                } else {
+                    resolve(false);
+                }
+            };
+
+            this.type = 'askYesNo';
+            this.active = true;
+        });
+    }
+
     prompt(message, caption, opts) {
         return new Promise((resolve) => {
             this.enableValidator = false;

From 02a2099c1fe3fa98ee042c356912abe1aed2cb0d Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 10 Jul 2022 19:52:58 +0700
Subject: [PATCH 21/47] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20z-index?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/client/components/Reader/ProgressPage/ProgressPage.vue b/client/components/Reader/ProgressPage/ProgressPage.vue
index ff4bca7f..c36b5b51 100644
--- a/client/components/Reader/ProgressPage/ProgressPage.vue
+++ b/client/components/Reader/ProgressPage/ProgressPage.vue
@@ -1,5 +1,5 @@
 <template>
-    <div v-show="visible" class="column justify-center items-center z-max" style="background-color: rgba(0, 0, 0, 0.8)">
+    <div v-show="visible" class="column justify-center items-center" style="background-color: rgba(0, 0, 0, 0.8); z-index: 100;">
         <div class="column justify-start items-center" style="height: 250px">
             <q-circular-progress
                 show-value

From 25cad81c50211a4b3288131e279ece4dc165317e Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 10 Jul 2022 19:53:30 +0700
Subject: [PATCH 22/47] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index eba83b0f..04515175 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -229,7 +229,7 @@ class RecentBooksPage {
 
             let title = bt.bookTitle;
             title = (title ? `"${title}"`: '');
-            const author = (bt.author ? bt.author : (bt.bookTitle ? bt.bookTitle : book.url));
+            const author = (bt.author ? bt.author : (bt.bookTitle ? bt.bookTitle : (book.uploadFileName ? book.uploadFileName : book.url)));
 
             result.push({
                 num,

From 33fc553c55a42d221f63fc390022f4784fd97b90 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 10 Jul 2022 19:54:00 +0700
Subject: [PATCH 23/47] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=B4=D0=B8=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B7=D0=B8=D1=86=D0=B8=D0=B9=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BE=D0=B1=D0=BD=D0=B0=D1=80=D1=83=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BF=D0=BE=D1=85=D0=BE=D0=B6=D0=B5?=
 =?UTF-8?q?=D0=B3=D0=BE=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=20=D0=B2=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B6=D0=B5=D0=BD=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/Reader.vue           | 31 +++++++++++++++++--
 client/components/Reader/share/bookManager.js | 19 ++++++++++--
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index dd0e294d..e1a786df 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -1090,10 +1090,10 @@ class Reader {
             progress.show();
             progress.setState({state: 'parse'});
 
-            // есть ли среди недавних
+            // есть ли среди загруженных
             let wasOpened = bookManager.findRecentByUrlAndPath(url, opts.path);
             wasOpened = (wasOpened ? _.cloneDeep(wasOpened) : {});
-            
+
             wasOpened = Object.assign(wasOpened, {
                 path: (opts.path !== undefined ? opts.path : wasOpened.path),
                 bookPos: (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos),
@@ -1166,6 +1166,31 @@ class Reader {
                 progress.setState({progress: prog});
             });
 
+            // sameBookKey
+            if (url.indexOf('disk://') == 0) {
+                //ищем такой файл в загруженных
+                let found = bookManager.findRecentBySameBookKey(wasOpened.uploadFileName);
+                found = (found ? _.cloneDeep(found) : found);
+
+                if (found) {
+                    //спрашиваем, надо ли объединить файлы
+                    const askResult = (wasOpened.path == found.path) || 
+                        await this.$root.stdDialog.askYesNo(`
+Файл с именем "${wasOpened.uploadFileName}" уже есть в загруженных.
+<br>Объединить позицию?`, 'Найдена похожая книга');
+
+                    if (askResult) {
+                        wasOpened.bookPos = found.bookPos;
+                        wasOpened.bookPosSeen = found.bookPosSeen;
+                        wasOpened.sameBookKey = found.sameBookKey;
+                    }
+                } else {
+                    wasOpened.sameBookKey = wasOpened.uploadFileName;
+                }
+            } else {
+                wasOpened.sameBookKey = addedBook.url;
+            }
+
             // добавляем в историю
             await bookManager.setRecentBook(Object.assign(wasOpened, addedBook));
             this.mostRecentBook();
@@ -1217,7 +1242,7 @@ class Reader {
 
             progress.hide(); this.progressActive = false;
 
-            await this.loadBook({url, uploadFileName: opts.file.name, force: true});
+            await this._loadBook({url, uploadFileName: opts.file.name, force: true});
         } catch (e) {
             progress.hide(); this.progressActive = false;
             this.loaderActive = true;
diff --git a/client/components/Reader/share/bookManager.js b/client/components/Reader/share/bookManager.js
index b9d0b29e..dbf3cd5f 100644
--- a/client/components/Reader/share/bookManager.js
+++ b/client/components/Reader/share/bookManager.js
@@ -499,8 +499,23 @@ class BookManager {
 
         for (const key in this.recent) {
             const book = this.recent[key];
-            if (!book.deleted && book.url == url && book.addTime > max) {
-                max = book.addTime;
+            if (!book.deleted && book.url == url && book.touchTime > max) {
+                max = book.touchTime;
+                result = book;
+            }
+        }
+
+        return result;
+    }
+
+    findRecentBySameBookKey(sameKey) {
+        let max = 0;
+        let result = null;
+
+        for (const key in this.recent) {
+            const book = this.recent[key];
+            if (!book.deleted && book.sameBookKey == sameKey && book.touchTime > max) {
+                max = book.touchTime;
                 result = book;
             }
         }

From 4775d6e47bc0cfb0db0d6cf429957f11b289b2da Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 10 Jul 2022 20:07:33 +0700
Subject: [PATCH 24/47] =?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

---
 client/components/Reader/share/bookManager.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/components/Reader/share/bookManager.js b/client/components/Reader/share/bookManager.js
index dbf3cd5f..e7a9ebdb 100644
--- a/client/components/Reader/share/bookManager.js
+++ b/client/components/Reader/share/bookManager.js
@@ -89,6 +89,7 @@ class BookManager {
 
             if (!book.deleted && key !== newKey) {
                 this.recent[newKey] = _.cloneDeep(book);
+                this.recent[newKey].key = newKey;
                 book.deleted = 1;
             }
         }

From 1b4360b897fca746492e0a4f701de9b6b851510f Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 11 Jul 2022 16:26:03 +0700
Subject: [PATCH 25/47] =?UTF-8?q?=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=20convertRecent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/share/bookManager.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/components/Reader/share/bookManager.js b/client/components/Reader/share/bookManager.js
index e7a9ebdb..a49fc1f0 100644
--- a/client/components/Reader/share/bookManager.js
+++ b/client/components/Reader/share/bookManager.js
@@ -81,13 +81,14 @@ class BookManager {
 
         for (const key in this.recent) {
             const book = this.recent[key];
+
             if (!book.path) {
                 continue;
             }
 
             const newKey = this.keyFromPath(book.path);
 
-            if (!book.deleted && key !== newKey) {
+            if (!book.deleted && key !== newKey || book.key !== newKey) {
                 this.recent[newKey] = _.cloneDeep(book);
                 this.recent[newKey].key = newKey;
                 book.deleted = 1;

From 125a2e0f17546a0a61c451fc37802fb4e81acd8d Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 11 Jul 2022 17:12:17 +0700
Subject: [PATCH 26/47] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/share/bookManager.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/components/Reader/share/bookManager.js b/client/components/Reader/share/bookManager.js
index a49fc1f0..20f52199 100644
--- a/client/components/Reader/share/bookManager.js
+++ b/client/components/Reader/share/bookManager.js
@@ -79,8 +79,8 @@ class BookManager {
         if (converted)
             return;
 
-        for (const key in this.recent) {
-            const book = this.recent[key];
+        const newRecent = {};
+        for (const book of Object.values(this.recent)) {
 
             if (!book.path) {
                 continue;
@@ -88,18 +88,18 @@ class BookManager {
 
             const newKey = this.keyFromPath(book.path);
 
-            if (!book.deleted && key !== newKey || book.key !== newKey) {
-                this.recent[newKey] = _.cloneDeep(book);
-                this.recent[newKey].key = newKey;
-                book.deleted = 1;
-            }
+            newRecent[newKey] = _.cloneDeep(book);
+            newRecent[newKey].key = newKey;
         }
 
+        this.recent = newRecent;
+
         //console.log(converted);
         (async() => {
             await utils.sleep(3000);
             this.saveRecent();
             this.emit('recent-changed');
+            this.emit('set-recent');
             await bmRecentStoreNew.setItem('recent-converted', true);
         })();
     }

From 9c69f5bc01cb537760655c4966b21db50d295c0f Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 11 Jul 2022 20:10:51 +0700
Subject: [PATCH 27/47] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=20=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/ContentsPage/ContentsPage.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/components/Reader/ContentsPage/ContentsPage.vue b/client/components/Reader/ContentsPage/ContentsPage.vue
index 8186d161..afb12571 100644
--- a/client/components/Reader/ContentsPage/ContentsPage.vue
+++ b/client/components/Reader/ContentsPage/ContentsPage.vue
@@ -28,10 +28,10 @@
                 <div v-for="item in contents" :key="item.key" class="column" style="width: 540px">
                     <div :ref="`mainitem${item.key}`" class="row q-px-sm no-wrap" :class="{'item': !item.isBookPos, 'item-book-pos': item.isBookPos}">
                         <div v-if="item.list.length" class="row justify-center items-center expand-button clickable" @click="expandClick(item.key)">
-                            <q-icon name="la la-caret-right" class="icon" :class="{'expanded-icon': item.expanded}" color="green-8" size="20px" />
+                            <q-icon name="la la-caret-right" class="icon" :class="{'expanded-icon': item.expanded}" color="green-8" size="24px" />
                         </div>
                         <div v-else class="no-expand-button clickable" @click="setBookPos(item.offset)">
-                            <q-icon name="la la-stop" class="icon" style="visibility: hidden" size="20px" />
+                            <q-icon name="la la-stop" class="icon" style="visibility: hidden" size="24px" />
                         </div>
                         <div class="col row clickable" @click="setBookPos(item.offset)">
                             <div :style="item.indentStyle"></div>

From 7caa0c2112af69358945a90e2cc5fa1ff5ba1bbb Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 11 Jul 2022 20:11:38 +0700
Subject: [PATCH 28/47] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D0=BE=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B8=D1=80=D0=BE=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=B2=20RecentBooksPage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RecentBooksPage/RecentBooksPage.vue       | 228 ++++++++++++++----
 client/quasar.js                              |   3 +
 2 files changed, 181 insertions(+), 50 deletions(-)

diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index 04515175..6e653b60 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -9,7 +9,62 @@
 
         <a ref="download" style="display: none;" target="_blank"></a>
 
-        <q-table
+        <div id="vs-container" ref="vsContainer" class="recent-books-scroll col">
+            <div ref="header" class="scroll-header bg-blue-2">
+                <q-input 
+                    ref="input" v-model="search"
+                    outlined rounded dense
+                    style="position: relative; top: 5px; left: 200px; width: 350px" bg-color="white"
+                    placeholder="Найти"
+                    @click.stop
+                >
+                    <template #append>
+                        <q-icon v-if="search !== ''" name="la la-times" class="cursor-pointer" @click.stop="resetSearch" />
+                    </template>
+                </q-input>
+            </div>
+
+            <q-virtual-scroll
+                v-slot="{ item, index }"
+                :items="tableData"
+                scroll-target="#vs-container"
+                virtual-scroll-item-size="80"
+                @virtual-scroll="onScroll"
+            >
+                <div class="table-row row" :class="{even: index % 2 > 0, 'active-book': item.active}">
+                    <div class="row-part row justify-center items-center" style="width: 80px">
+                        {{ index }}
+                    </div>
+
+                    <div class="row-part column items-stretch break-word clickable" style="width: 350px; font-size: 80%" @click="loadBook(item)">
+                        <div class="column col">
+                            <div style="color: green">
+                                {{ item.desc.author }}
+                            </div>
+                            <div>{{ item.desc.title }}</div>
+                        </div>
+                        <div class="read-bar" :style="`width: ${340*item.readPart}px`"></div>
+                    </div>
+
+                    <div class="row-part column justify-center" style="width: 80px; font-size: 80%">
+                        <a v-show="isUrl(item.url)" :href="item.url" target="_blank">Оригинал</a><br>
+                        <a :href="item.path" @click.prevent="downloadBook(item.path, item.fullTitle)">Скачать FB2</a>
+                    </div>
+
+                    <div class="row-part column justify-center">
+                        <q-btn
+                            dense
+                            style="width: 30px; height: 30px; padding: 7px 0 7px 0; margin-left: 4px"
+                            @click="handleDel(item.key)"
+                        >
+                            <q-icon class="la la-times" size="14px" />
+                        </q-btn>
+                    </div>
+                </div>
+            </q-virtual-scroll>
+        </div>
+
+        <!--q-table
             class="recent-books-table col"
             :rows="tableData"
             row-key="key"
@@ -91,7 +146,7 @@
                     </q-td>
                 </q-tr>
             </template>
-        </q-table>
+        </q-table-->
     </Window>
 </template>
 
@@ -103,6 +158,7 @@ import path from 'path-browserify';
 //import _ from 'lodash';
 
 import * as utils from '../../../share/utils';
+import LockQueue from '../../../share/LockQueue';
 import Window from '../../share/Window.vue';
 import bookManager from '../share/bookManager';
 import readerApi from '../../../api/reader';
@@ -127,10 +183,14 @@ class RecentBooksPage {
     pagination = {};
 
     created() {
-        this.firstInit = true;
-        this.pagination = {rowsPerPage: 0};
+        this.lastScrollTop1 = 0;
+        this.lastScrollTop2 = 0;
 
-        this.columns = [
+        this.lock = new LockQueue(100);
+
+        //this.pagination = {rowsPerPage: 0};
+
+        /*this.columns = [
             {
                 name: 'num',
                 label: '#',
@@ -168,7 +228,7 @@ class RecentBooksPage {
                 label: '',
                 align: 'left',
             },
-        ];
+        ];*/
     }
 
     init() {
@@ -177,28 +237,84 @@ class RecentBooksPage {
         this.$nextTick(() => {
             //this.$refs.input.focus();//плохо на планшетах
         });
-        (async() => {//подгрузка списка
-            if (this.initing)
-                return;
-            this.initing = true;
 
-            if (this.firstInit) {//для отзывчивости
-                await this.updateTableData(20);
-                this.firstInit = false;
-            }
-            await utils.sleep(50);
-            await this.updateTableData();
-
-            this.initing = false;
-        })();
+        this.updateTableData();//no await
     }
 
-    async updateTableData(limit) {
+    async updateTableData() {
+        await this.lock.get();
+        try {
+            let result = [];
+
+            const sorted = bookManager.getSortedRecent();
+            const activeBook = bookManager.mostRecentBook();
+
+            let num = 0;
+            for (const book of sorted) {
+                if (book.deleted)
+                    continue;
+
+                num++;
+
+                let d = new Date();
+                d.setTime(book.touchTime);
+                const touchTime = utils.formatDate(d);
+
+                let readPart = 0;
+                let perc = '';
+                let textLen = '';
+                const p = (book.bookPosSeen ? book.bookPosSeen : (book.bookPos ? book.bookPos : 0));
+                if (book.textLength) {
+                    readPart = p/book.textLength;
+                    perc = ` [${(readPart*100).toFixed(2)}%]`;
+                    textLen = ` ${Math.round(book.textLength/1000)}k`;
+                }
+
+                const bt = utils.getBookTitle(book.fb2);
+
+                let title = bt.bookTitle;
+                title = (title ? `"${title}"`: '');
+                const author = (bt.author ? bt.author : (bt.bookTitle ? bt.bookTitle : (book.uploadFileName ? book.uploadFileName : book.url)));
+
+                result.push({
+                    num,
+                    touchTime,
+                    desc: {
+                        author,
+                        title: `${title}${perc}${textLen}`,
+                    },
+                    readPart,
+                    url: book.url,
+                    path: book.path,
+                    fullTitle: bt.fullTitle,
+                    key: book.key,
+                    active: (activeBook.key == book.key),
+
+                    //для сортировки
+                    touchTimeRaw: book.touchTime,
+                    descString: `${author}${title}${perc}${textLen}`,
+                });
+            }
+
+            const search = this.search;
+            result = result.filter(item => {
+                return !search ||
+                    item.touchTime.includes(search) ||
+                    item.desc.title.toLowerCase().includes(search.toLowerCase()) ||
+                    item.desc.author.toLowerCase().includes(search.toLowerCase())
+            });
+
+            this.tableData = result;
+        } finally {
+            this.lock.ret();
+        }
+    }
+
+    /*async updateTableData(limit) {
         while (this.updating) await utils.sleep(100);
         this.updating = true;
         let result = [];
 
-        this.loading = !!limit;
         const sorted = bookManager.getSortedRecent();
 
         let num = 0;
@@ -260,7 +376,7 @@ class RecentBooksPage {
 
         this.tableData = result;
         this.updating = false;
-    }
+    }*/
 
     resetSearch() {
         this.search = '';
@@ -324,6 +440,24 @@ class RecentBooksPage {
             return false;
     }
 
+    onScroll() {
+        const curScrollTop = this.$refs.vsContainer.scrollTop;
+
+        if (curScrollTop - this.lastScrollTop1 > 150) {
+            this.$refs.header.style.top = `-${this.$refs.header.offsetHeight}px`;
+            this.$refs.header.style.transition = 'top 0.2s ease 0s';
+
+            this.lastScrollTop1 = curScrollTop;
+        } else if (curScrollTop - this.lastScrollTop2 < 0) {
+            this.$refs.header.style.position = 'sticky';
+            this.$refs.header.style.top = 0;
+
+            this.lastScrollTop1 = curScrollTop;
+        }
+
+        this.lastScrollTop2 = curScrollTop;
+    }
+
     close() {
         this.$emit('recent-books-close');
     }
@@ -341,31 +475,34 @@ export default vueComponent(RecentBooksPage);
 </script>
 
 <style scoped>
-.recent-books-table {
+.recent-books-scroll {
     width: 573px;
     overflow-y: auto;
     overflow-x: hidden;
 }
 
+.scroll-header {
+    height: 50px;
+    position: sticky;
+    z-index: 1;
+    top: 0;
+}
+
+.table-row {
+    min-height: 80px;
+    border-bottom: 1px solid #cccccc;
+}
+
+.row-part {
+    padding: 4px 4px 4px 4px;
+}
+
 .clickable {
     cursor: pointer;
 }
 
-.td-mp {
-    margin: 0 !important;
-    padding: 4px 4px 4px 4px !important;
-    border-bottom: 1px solid #ddd;
-}
-
-.no-mp {
-    margin: 0 !important;
-    padding: 0 !important;
-    border: 0;
-    border-left: 1px solid #ddd !important;
-}
-
 .break-word {
-    line-height: 180%;
+    line-height: 150%;
     overflow-wrap: break-word;
     word-wrap: break-word;
     white-space: normal;
@@ -375,21 +512,12 @@ export default vueComponent(RecentBooksPage);
     height: 3px;
     background-color: #aaaaaa;
 }
-</style>
 
-<style>
-.recent-books-table .q-table__middle {
-    height: 100%;
-    overflow-x: hidden;
+.even {
+    background-color: #f0f0f0;
 }
 
-.recent-books-table thead tr:first-child th {
-    position: sticky;
-    z-index: 1;
-    top: 0;
-    background-color: #c1f4cd;
-}
-.recent-books-table tr:nth-child(even) {
-    background-color: #f8f8f8;
+.active-book {
+    background-color: #b0f0b0 !important;
 }
 </style>
diff --git a/client/quasar.js b/client/quasar.js
index 0994aa2a..dfbc5404 100644
--- a/client/quasar.js
+++ b/client/quasar.js
@@ -32,6 +32,8 @@ import {QPopupProxy} from 'quasar/src/components/popup-proxy';
 import {QDialog} from 'quasar/src/components/dialog';
 import {QChip} from 'quasar/src/components/chip';
 import {QTree} from 'quasar/src/components/tree';
+import {QVirtualScroll} from 'quasar/src/components/virtual-scroll';
+
 //import {QExpansionItem} from 'quasar/src/components/expansion-item';
 
 const components = {
@@ -62,6 +64,7 @@ const components = {
     QChip,
     QTree,
     //QExpansionItem,
+    QVirtualScroll,
 };
 
 //directives 

From 3ca14ae06add55dcdd752291c67d739710ff56fc Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 11 Jul 2022 22:26:34 +0700
Subject: [PATCH 29/47] =?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=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=BE=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RecentBooksPage/RecentBooksPage.vue       | 118 +++++++++---------
 1 file changed, 62 insertions(+), 56 deletions(-)

diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index 6e653b60..60882154 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -14,7 +14,7 @@
                 <q-input 
                     ref="input" v-model="search"
                     outlined rounded dense
-                    style="position: relative; top: 5px; left: 200px; width: 350px" bg-color="white"
+                    style="position: relative; top: 4px; left: 200px; width: 350px" bg-color="white"
                     placeholder="Найти"
                     @click.stop
                 >
@@ -33,7 +33,7 @@
             >
                 <div class="table-row row" :class="{even: index % 2 > 0, 'active-book': item.active}">
                     <div class="row-part row justify-center items-center" style="width: 80px">
-                        {{ index }}
+                        {{ item.num }}
                     </div>
 
                     <div class="row-part column items-stretch break-word clickable" style="width: 350px; font-size: 80%" @click="loadBook(item)">
@@ -179,56 +179,13 @@ class RecentBooksPage {
     loading = false;
     search = '';
     tableData = [];
-    columns = [];
-    pagination = {};
+    sortMethod = '';
 
     created() {
         this.lastScrollTop1 = 0;
         this.lastScrollTop2 = 0;
 
         this.lock = new LockQueue(100);
-
-        //this.pagination = {rowsPerPage: 0};
-
-        /*this.columns = [
-            {
-                name: 'num',
-                label: '#',
-                align: 'center',
-                sortable: true,
-                field: 'num',
-            },
-            {
-                name: 'date',
-                label: 'Время<br>просм.',
-                align: 'left',
-                field: 'touchDateTime',
-                sortable: true,
-                sort: (a, b, rowA, rowB) => rowA.touchDateTime - rowB.touchDateTime,
-            },
-            {
-                name: 'desc',
-                label: 'Название',
-                align: 'left',
-                field: 'descString',
-                sortable: true,
-            },
-            {
-                name: 'links',
-                label: '',
-                align: 'left',
-            },
-            {
-                name: 'close',
-                label: '',
-                align: 'left',
-            },
-            {
-                name: 'last',
-                label: '',
-                align: 'left',
-            },
-        ];*/
     }
 
     init() {
@@ -249,13 +206,11 @@ class RecentBooksPage {
             const sorted = bookManager.getSortedRecent();
             const activeBook = bookManager.mostRecentBook();
 
-            let num = 0;
+            //подготовка полей
             for (const book of sorted) {
                 if (book.deleted)
                     continue;
 
-                num++;
-
                 let d = new Date();
                 d.setTime(book.touchTime);
                 const touchTime = utils.formatDate(d);
@@ -277,7 +232,6 @@ class RecentBooksPage {
                 const author = (bt.author ? bt.author : (bt.bookTitle ? bt.bookTitle : (book.uploadFileName ? book.uploadFileName : book.url)));
 
                 result.push({
-                    num,
                     touchTime,
                     desc: {
                         author,
@@ -288,21 +242,72 @@ class RecentBooksPage {
                     path: book.path,
                     fullTitle: bt.fullTitle,
                     key: book.key,
+                    sameBookKey: book.sameBookKey,
                     active: (activeBook.key == book.key),
 
                     //для сортировки
+                    addTimeRaw: book.addTime,
                     touchTimeRaw: book.touchTime,
                     descString: `${author}${title}${perc}${textLen}`,
                 });
             }
 
+            //нумерация
+            let num = 0;
+
+            result.sort((a, b) => b.addTimeRaw - a.addTimeRaw);
+            for (const book of result) {
+                num++;
+                book.num = num;
+            }
+
+            //фильтрация
             const search = this.search;
-            result = result.filter(item => {
-                return !search ||
-                    item.touchTime.includes(search) ||
-                    item.desc.title.toLowerCase().includes(search.toLowerCase()) ||
-                    item.desc.author.toLowerCase().includes(search.toLowerCase())
-            });
+            if (search) {
+                result = result.filter(item => {
+                    return !search ||
+                        item.touchTime.includes(search) ||
+                        item.desc.title.toLowerCase().includes(search.toLowerCase()) ||
+                        item.desc.author.toLowerCase().includes(search.toLowerCase())
+                });
+            }
+
+            //сортировка
+            switch (this.sortMethod) {
+                case 'addTimeDesc':
+                    result.sort((a, b) => b.addTimeRaw - a.addTimeRaw);
+                    break;
+                case 'addTimeAsc':
+                    result.sort((a, b) => a.addTimeRaw - b.addTimeRaw);
+                    break;
+                case 'touchTimeDesc':
+                    result.sort((a, b) => b.touchTimeRaw - a.touchTimeRaw);
+                    break;
+                case 'touchTimeAsc':
+                    result.sort((a, b) => a.touchTimeRaw - b.touchTimeRaw);
+                    break;
+            }
+
+            //группировка
+            const groups = {};
+            const newResult = [];
+            for (const book of result) {
+                if (book.sameBookKey !== undefined) {
+                    if (!groups[book.sameBookKey]) {
+                        groups[book.sameBookKey] = [];
+                        book.group = groups[book.sameBookKey];
+                        newResult.push(book);
+                    } else {
+                        groups[book.sameBookKey].push(book);
+                    }
+                } else {
+                    newResult.push(book);
+                }
+            }
+            result = newResult;
+
+            //другие стадии
+            //.....
 
             this.tableData = result;
         } finally {
@@ -486,6 +491,7 @@ export default vueComponent(RecentBooksPage);
     position: sticky;
     z-index: 1;
     top: 0;
+    border-bottom: 2px solid #aaaaaa;
 }
 
 .table-row {

From 07b9a3c033658b59743b49fb8ff856dd734e026f Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 11 Jul 2022 22:28:48 +0700
Subject: [PATCH 30/47] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Reader/RecentBooksPage/RecentBooksPage.vue   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index 60882154..1ac68de7 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -389,10 +389,10 @@ class RecentBooksPage {
     }
 
     wordEnding(num) {
-        const endings = ['', 'а', 'и', 'и', 'и', '', '', '', '', ''];
+        const endings = ['ов', '', 'а', 'а', 'а', 'ов', 'ов', 'ов', 'ов', 'ов'];
         const deci = num % 100;
         if (deci > 10 && deci < 20) {
-            return '';
+            return 'ов';
         } else {
             return endings[num % 10];
         }
@@ -400,7 +400,7 @@ class RecentBooksPage {
 
     get header() {
         const len = (this.tableData ? this.tableData.length : 0);
-        return `${(this.search ? 'Найдено' : 'Всего')} ${len} книг${this.wordEnding(len)}`;
+        return `${(this.search ? 'Найдено' : 'Всего')} ${len} файл${this.wordEnding(len)}`;
     }
 
     async downloadBook(fb2path, fullTitle) {

From eb2affa518b3f139d925a4ec3e1405f6fd717cb1 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 11 Jul 2022 23:50:51 +0700
Subject: [PATCH 31/47] =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=B2=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20input=20=D0=BA=20=D0=B5=D0=B4=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BC=D1=83=20=D1=81=D1=82=D0=B8=D0=BB=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExternalLibs/BookmarkSettings/BookmarkSettings.vue    | 2 +-
 client/components/ExternalLibs/ExternalLibs.vue           | 8 ++++----
 client/components/Reader/ReaderDialogs/ReaderDialogs.vue  | 2 +-
 .../components/Reader/RecentBooksPage/RecentBooksPage.vue | 4 ++--
 .../Reader/SettingsPage/UserHotKeys/UserHotKeys.vue       | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/components/ExternalLibs/BookmarkSettings/BookmarkSettings.vue b/client/components/ExternalLibs/BookmarkSettings/BookmarkSettings.vue
index b41d3fc6..b43ac51c 100644
--- a/client/components/ExternalLibs/BookmarkSettings/BookmarkSettings.vue
+++ b/client/components/ExternalLibs/BookmarkSettings/BookmarkSettings.vue
@@ -11,7 +11,7 @@
                         Открыть выбранную закладку
                     </q-tooltip>
                 </q-btn>
-                <q-input ref="search" v-model="search" class="col" rounded outlined dense bg-color="white" placeholder="Найти">
+                <q-input ref="search" v-model="search" class="col" outlined dense bg-color="white" placeholder="Найти">
                     <template #append>
                         <q-icon v-if="search !== ''" name="la la-times" class="cursor-pointer" @click="resetSearch" />
                     </template>
diff --git a/client/components/ExternalLibs/ExternalLibs.vue b/client/components/ExternalLibs/ExternalLibs.vue
index 2d91bf80..aa2ddf7f 100644
--- a/client/components/ExternalLibs/ExternalLibs.vue
+++ b/client/components/ExternalLibs/ExternalLibs.vue
@@ -32,7 +32,7 @@
                     :options="rootLinkOptions"
                     style="width: 230px"
                     dropdown-icon="la la-angle-down la-sm"
-                    rounded outlined dense emit-value map-options display-value-sanitize options-sanitize
+                    outlined dense emit-value map-options display-value-sanitize options-sanitize
                     @popup-show="onSelectPopupShow" @popup-hide="onSelectPopupHide"
                 >
                     <template #prepend>
@@ -61,7 +61,7 @@
                     :options="selectedLinkOptions"
                     style="width: 50px"
                     dropdown-icon="la la-angle-down la-sm"
-                    rounded outlined dense emit-value map-options hide-selected display-value-sanitize options-sanitize
+                    outlined dense emit-value map-options hide-selected display-value-sanitize options-sanitize
                     @popup-show="onSelectPopupShow" @popup-hide="onSelectPopupHide"
                 >
                     <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
@@ -73,7 +73,7 @@
                     ref="input"
                     v-model="bookUrl"
                     class="col q-mr-sm"
-                    rounded outlined dense
+                    outlined dense
                     bg-color="white"
                     placeholder="Скопируйте сюда ссылку на книгу и нажмите 'Открыть'"
                     @focus="selectAllOnFocus" @keydown="bookUrlKeyDown"
@@ -99,7 +99,7 @@
                     </template>
                 </q-input>
 
-                <q-btn :disabled="!bookUrl" rounded color="green-7" no-caps size="14px" @click="submitUrl">
+                <q-btn :disabled="!bookUrl" color="green-7" no-caps size="14px" @click="submitUrl">
                     Открыть
                     <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
                         Открыть в читалке
diff --git a/client/components/Reader/ReaderDialogs/ReaderDialogs.vue b/client/components/Reader/ReaderDialogs/ReaderDialogs.vue
index 6e4c2ace..248f4670 100644
--- a/client/components/Reader/ReaderDialogs/ReaderDialogs.vue
+++ b/client/components/Reader/ReaderDialogs/ReaderDialogs.vue
@@ -54,7 +54,7 @@
 
                 <br><br>
                 <div class="row justify-center">
-                    <!--q-btn class="q-px-sm" color="primary" dense no-caps rounded @click="openDonate">
+                    <!--q-btn class="q-px-sm" color="primary" dense no-caps @click="openDonate">
                         Помочь проекту
                     </q-btn-->
                 </div>
diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index 1ac68de7..6de40be9 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -13,7 +13,7 @@
             <div ref="header" class="scroll-header bg-blue-2">
                 <q-input 
                     ref="input" v-model="search"
-                    outlined rounded dense
+                    outlined dense
                     style="position: relative; top: 4px; left: 200px; width: 350px" bg-color="white"
                     placeholder="Найти"
                     @click.stop
@@ -86,7 +86,7 @@
                     <q-th key="desc" class="td-mp" style="width: 300px" :props="props" colspan="4">
                         <q-input 
                             ref="input" v-model="search"
-                            outlined dense rounded style="position: absolute; top: 6px; left: 90px; width: 350px" bg-color="white"
+                            outlined dense style="position: absolute; top: 6px; left: 90px; width: 350px" bg-color="white"
                             placeholder="Найти"                            
                             @click.stop
                         >
diff --git a/client/components/Reader/SettingsPage/UserHotKeys/UserHotKeys.vue b/client/components/Reader/SettingsPage/UserHotKeys/UserHotKeys.vue
index 2943275c..0ed02657 100644
--- a/client/components/Reader/SettingsPage/UserHotKeys/UserHotKeys.vue
+++ b/client/components/Reader/SettingsPage/UserHotKeys/UserHotKeys.vue
@@ -13,7 +13,7 @@
                     ref="input"
                     v-model="search"
                     class="q-ml-sm col"
-                    outlined dense rounded
+                    outlined dense
                     bg-color="grey-4"
                     placeholder="Найти"                    
                     @click.stop

From bef9e5705c87678b9ea67211fb4fb37b94ab211e Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 11 Jul 2022 23:53:54 +0700
Subject: [PATCH 32/47] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=BE=D0=B2=D1=8B?=
 =?UTF-8?q?=D1=85=20=D1=81=D1=82=D1=80=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/SearchPage/SearchPage.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/client/components/Reader/SearchPage/SearchPage.vue b/client/components/Reader/SearchPage/SearchPage.vue
index bc6ec247..16786efe 100644
--- a/client/components/Reader/SearchPage/SearchPage.vue
+++ b/client/components/Reader/SearchPage/SearchPage.vue
@@ -8,12 +8,10 @@
             <span v-show="initStep">{{ initPercentage }}%</span>
 
             <div v-show="!initStep" class="input">
-                <!--input ref="input"
-                    placeholder="что ищем"
-                    :value="needle" @input="needle = $event.target.value"/-->
-                <q-input ref="input" v-model="needle"
+                <q-input
+                    ref="input" v-model="needle"
                     class="col" outlined dense
-                    placeholder="что ищем"
+                    placeholder="Найти"
                     @keydown="inputKeyDown"         
                 />
                 <div style="position: absolute; right: 10px; margin-top: 10px; font-size: 16px;">
@@ -108,7 +106,7 @@ class SearchPage {
             this.parsed = parsed;
         }
 
-        this.header = 'Найти';
+        this.header = 'Поиск в тексте';
         await this.$nextTick();
         this.$refs.input.focus();
         this.$refs.input.select();

From d957b4a5f9b1f920a590ea43ac812323ed272455 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 12 Jul 2022 01:03:44 +0700
Subject: [PATCH 33/47] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D0=B0=D0=B2=D1=82=D0=BE=D1=81=D0=BE?=
 =?UTF-8?q?=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D1=8F=20=D0=BF=D0=B0=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B8=20=D0=BF=D1=80=D0=B8=20=D0=BF=D1=80=D0=BE=D0=BA?=
 =?UTF-8?q?=D1=80=D1=83=D1=82=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/Reader.vue           | 13 ++++++++++++
 .../Reader/SettingsPage/ButtonsTab.inc        |  9 --------
 .../Reader/SettingsPage/SettingsPage.vue      | 10 ++++-----
 .../Reader/SettingsPage/ToolBarTab.inc        | 18 ++++++++++++++++
 .../components/Reader/TextPage/TextPage.vue   | 21 ++++++++++++++++---
 client/store/modules/reader.js                |  1 +
 6 files changed, 55 insertions(+), 17 deletions(-)
 delete mode 100644 client/components/Reader/SettingsPage/ButtonsTab.inc
 create mode 100644 client/components/Reader/SettingsPage/ToolBarTab.inc

diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index e1a786df..749c757d 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -141,6 +141,7 @@
                     @load-file="loadFile"
                     @book-pos-changed="bookPosChanged"
                     @do-action="doAction"
+                    @hide-tool-bar="hideToolBar"
                 ></component>
             </keep-alive>
 
@@ -348,6 +349,13 @@ class Reader {
             this.debouncedSetRecentBook(newValue);
         }, 15000, {maxWait: 20000});
 
+        this.debouncedHideToolBar = _.debounce((event) => {
+            if (this.toolBarHideOnScroll && this.toolBarActive !== !!event.show) {
+                this.commit('reader/setToolBarActive', !!event.show);
+                this.$root.eventHook('resize');
+            }
+        }, 200);
+
         document.addEventListener('fullscreenchange', () => {
             this.fullScreenActive = (document.fullscreenElement !== null);
         });
@@ -405,6 +413,7 @@ class Reader {
         this.clickControlActive = this.clickControl;
         this.blinkCachedLoad = settings.blinkCachedLoad;
         this.showToolButton = settings.showToolButton;
+        this.toolBarHideOnScroll = settings.toolBarHideOnScroll;
         this.enableSitesFilter = settings.enableSitesFilter;
         this.showNeedUpdateNotify = settings.showNeedUpdateNotify;
         this.splitToPara = settings.splitToPara;
@@ -665,6 +674,10 @@ class Reader {
         this.$root.eventHook('resize');
     }
 
+    hideToolBar(event) {
+        this.debouncedHideToolBar(event);
+    }
+
     fullScreenToggle() {
         this.fullScreenActive = !this.fullScreenActive;
         if (this.fullScreenActive) {
diff --git a/client/components/Reader/SettingsPage/ButtonsTab.inc b/client/components/Reader/SettingsPage/ButtonsTab.inc
deleted file mode 100644
index 27a6e818..00000000
--- a/client/components/Reader/SettingsPage/ButtonsTab.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="part-header">Показывать кнопки панели</div>
-
-<div class="item row" v-for="item in toolButtons" :key="item.name" v-show="item.name != 'libs' || mode == 'liberama.top'">
-    <div class="label-3"></div>
-    <div class="col row">
-        <q-checkbox size="xs" v-model="showToolButton[item.name]" :label="rstore.readerActions[item.name]"
-        />
-    </div>
-</div>
diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue
index 38b0f33c..4982df37 100644
--- a/client/components/Reader/SettingsPage/SettingsPage.vue
+++ b/client/components/Reader/SettingsPage/SettingsPage.vue
@@ -24,7 +24,7 @@
                     <div v-show="tabsScrollable" class="q-pt-lg" />
                     <q-tab class="tab" name="profiles" icon="la la-users" label="Профили" />
                     <q-tab class="tab" name="view" icon="la la-eye" label="Вид" />
-                    <q-tab class="tab" name="buttons" icon="la la-grip-horizontal" label="Кнопки" />
+                    <q-tab class="tab" name="toolbar" icon="la la-grip-horizontal" label="Панель" />
                     <q-tab class="tab" name="keys" icon="la la-gamepad" label="Управление" />
                     <q-tab class="tab" name="pagemove" icon="la la-school" label="Листание" />
                     <q-tab class="tab" name="convert" icon="la la-magic" label="Конвертир." />
@@ -82,8 +82,8 @@
                     </div>
                 </div>
                 <!-- Кнопки ---------------------------------------------------------------------->
-                <div v-if="selectedTab == 'buttons'" class="fit tab-panel">
-                    @@include('./ButtonsTab.inc');
+                <div v-if="selectedTab == 'toolbar'" class="fit tab-panel">
+                    @@include('./ToolBarTab.inc');
                 </div>
                 <!-- Управление ------------------------------------------------------------------>
                 <div v-if="selectedTab == 'keys'" class="fit column">
@@ -702,11 +702,11 @@ export default vueComponent(SettingsPage);
     margin-bottom: 5px;
 }
 
-.label-1, .label-7 {
+.label-1, .label-3, .label-7 {
     width: 75px;
 }
 
-.label-2, .label-3, .label-4, .label-5 {
+.label-2, .label-4, .label-5 {
     width: 110px;
 }
 
diff --git a/client/components/Reader/SettingsPage/ToolBarTab.inc b/client/components/Reader/SettingsPage/ToolBarTab.inc
new file mode 100644
index 00000000..a55db41b
--- /dev/null
+++ b/client/components/Reader/SettingsPage/ToolBarTab.inc
@@ -0,0 +1,18 @@
+<div class="part-header">Отображение</div>
+
+<div class="item row no-wrap">
+    <div class="label-3"></div>
+    <q-checkbox size="xs" v-model="toolBarHideOnScroll" label="Скрывать/показывать панель при прокрутке" >
+        <q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
+            Скрывать/показывть панель при прокрутке текста вперед/назад
+        </q-tooltip>
+    </q-checkbox>
+</div>
+
+<div class="part-header">Показывать кнопки</div>
+
+<div class="item row no-wrap" v-for="item in toolButtons" :key="item.name" v-show="item.name != 'libs' || mode == 'liberama.top'">
+    <div class="label-3"></div>
+        <q-checkbox size="xs" v-model="showToolButton[item.name]" :label="rstore.readerActions[item.name]"
+        />
+</div>
diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue
index 58377b54..7a1cc4f0 100644
--- a/client/components/Reader/TextPage/TextPage.vue
+++ b/client/components/Reader/TextPage/TextPage.vue
@@ -66,7 +66,14 @@ const componentOptions = {
     watch: {
         bookPos: function() {
             this.$emit('book-pos-changed', {bookPos: this.bookPos, bookPosSeen: this.bookPosSeen});
+
             this.draw();
+
+            if (this.userBookPosChange) {
+                this.$emit('hide-tool-bar', {show: (this.bookPos == 0 || this.bookPos < this.prevBookPos)});
+                this.prevBookPos = this.bookPos;
+                this.userBookPosChange = false;
+            }
         },
         bookPosSeen: function() {
             this.$emit('book-pos-changed', {bookPos: this.bookPos, bookPosSeen: this.bookPosSeen});
@@ -99,6 +106,8 @@ class TextPage {
     lastBook = null;
     bookPos = 0;
     bookPosSeen = null;
+    prevBookPos = 0;
+    userBookPosChange = false;
 
     fontStyle = null;
     fontSize = null;
@@ -652,7 +661,7 @@ class TextPage {
         }
 
         if (this.book && this.bookPos > 0 && this.bookPos >= this.parsed.textLength) {
-            this.doEnd(true);
+            this.doEnd(true, false);
             return;
         }
 
@@ -675,7 +684,7 @@ class TextPage {
         this.debouncedDrawPageDividerAndOrnament();
 
         if (this.book && this.linesDown && this.linesDown.length < this.pageLineCount) {
-            this.doEnd(true);
+            this.doEnd(true, false);
             return;
         }
     }
@@ -911,12 +920,14 @@ class TextPage {
 
     doDown() {
         if (this.linesDown && this.linesDown.length > this.pageLineCount && this.pageLineCount > 0) {
+            this.userBookPosChange = true;
             this.bookPos = this.linesDown[1].begin;
         }
     }
 
     doUp() {
         if (this.linesUp && this.linesUp.length > 1 && this.pageLineCount > 0) {
+            this.userBookPosChange = true;
             this.bookPos = this.linesUp[1].begin;
         }
     }
@@ -929,6 +940,7 @@ class TextPage {
             if (i >= 0 && this.linesDown.length >= 2*i + (this.keepLastToFirst ? 1 : 0)) {
                 this.currentAnimation = this.pageChangeAnimation;
                 this.pageChangeDirectionDown = true;
+                this.userBookPosChange = true;
                 this.bookPos = this.linesDown[i].begin;
             } else 
                 this.doEnd();
@@ -944,6 +956,7 @@ class TextPage {
             if (i >= 0 && this.linesUp.length > i) {
                 this.currentAnimation = this.pageChangeAnimation;
                 this.pageChangeDirectionDown = false;
+                this.userBookPosChange = true;
                 this.bookPos = this.linesUp[i].begin;
             }
         }
@@ -952,10 +965,11 @@ class TextPage {
     doHome() {
         this.currentAnimation = this.pageChangeAnimation;
         this.pageChangeDirectionDown = false;
+        this.userBookPosChange = true;
         this.bookPos = 0;
     }
 
-    doEnd(noAni) {
+    doEnd(noAni, isUser = true) {
         if (this.parsed.para.length && this.pageLineCount > 0) {
             let i = this.parsed.para.length - 1;
             let lastPos = this.parsed.para[i].offset + this.parsed.para[i].length - 1;
@@ -966,6 +980,7 @@ class TextPage {
                 if (!noAni)
                     this.currentAnimation = this.pageChangeAnimation;
                 this.pageChangeDirectionDown = true;
+                this.userBookPosChange = isUser;
                 this.bookPos = lines[i].begin;
             }
         }
diff --git a/client/store/modules/reader.js b/client/store/modules/reader.js
index 53f34918..d4bb9b87 100644
--- a/client/store/modules/reader.js
+++ b/client/store/modules/reader.js
@@ -185,6 +185,7 @@ const settingDefaults = {
 
     fontShifts: {},
     showToolButton: {},
+    toolBarHideOnScroll: true,
     userHotKeys: {},
     userWallpapers: [],
 };

From 3190246f348c96957686bca2b7d4b01116f81a08 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 12 Jul 2022 01:35:19 +0700
Subject: [PATCH 34/47] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=80=D0=B5=D0=B0=D0=BA=D1=86=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20onResize?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/TextPage/TextPage.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue
index 7a1cc4f0..d03cc78e 100644
--- a/client/components/Reader/TextPage/TextPage.vue
+++ b/client/components/Reader/TextPage/TextPage.vue
@@ -163,8 +163,7 @@ class TextPage {
         }, 10);
 
         this.$root.addEventHook('resize', async() => {
-            this.$nextTick(this.onResize);
-            await utils.sleep(500);
+            await utils.sleep(200);
             this.$nextTick(this.onResize);
         });
     }
@@ -508,12 +507,25 @@ class TextPage {
     }
 
     async onResize() {
+        if (this.resizing)
+            return;
+        
+        this.resizing = true;
         try {
+            const scrolled = this.doingScrolling;
+            if (scrolled)
+                await this.stopTextScrolling();
+
             this.calcDrawProps();
             this.setBackground();
             this.draw();
+
+            if (scrolled)
+                this.startTextScrolling();
         } catch (e) {
             //
+        } finally {
+            this.resizing = false;
         }
     }
 

From c0b658d9e62904458431e7a3235ce29813d5f14b Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 12 Jul 2022 01:41:18 +0700
Subject: [PATCH 35/47] =?UTF-8?q?=D0=9A=20=D0=BF=D1=80=D0=B5=D0=B4=D1=8B?=
 =?UTF-8?q?=D0=B4=D1=83=D1=89=D0=B5=D0=BC=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/TextPage/TextPage.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue
index d03cc78e..ed475cca 100644
--- a/client/components/Reader/TextPage/TextPage.vue
+++ b/client/components/Reader/TextPage/TextPage.vue
@@ -163,6 +163,7 @@ class TextPage {
         }, 10);
 
         this.$root.addEventHook('resize', async() => {
+            this.$nextTick(this.onResize);
             await utils.sleep(200);
             this.$nextTick(this.onResize);
         });

From 988c959eba960c7b1e9c3a4b76eb365804fb47be Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 12 Jul 2022 04:05:51 +0700
Subject: [PATCH 36/47] =?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=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=BE=D0=B9=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

---
 .../RecentBooksPage/RecentBooksPage.vue       | 144 +++++++++++++++---
 client/store/modules/reader.js                |   3 +
 2 files changed, 128 insertions(+), 19 deletions(-)

diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index 6de40be9..7f38920d 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -10,11 +10,15 @@
         <a ref="download" style="display: none;" target="_blank"></a>
 
         <div id="vs-container" ref="vsContainer" class="recent-books-scroll col">
-            <div ref="header" class="scroll-header bg-blue-2">
+            <div ref="header" class="scroll-header row bg-blue-2">
+                <q-btn class="bg-white" rounded style="width: 35px; height: 35px; margin: 6px 6px 0px 6px" @click="showSameBookClick">
+                    <q-icon name="la la-caret-right" class="icon" :class="{'expanded-icon': showSameBook}" color="green-8" size="24px" />
+                </q-btn>
+
                 <q-input 
                     ref="input" v-model="search"
                     outlined dense
-                    style="position: relative; top: 4px; left: 200px; width: 350px" bg-color="white"
+                    style="position: absolute; top: 4px; left: 200px; width: 350px" bg-color="white"
                     placeholder="Найти"
                     @click.stop
                 >
@@ -31,22 +35,47 @@
                 virtual-scroll-item-size="80"
                 @virtual-scroll="onScroll"
             >
-                <div class="table-row row" :class="{even: index % 2 > 0, 'active-book': item.active}">
-                    <div class="row-part row justify-center items-center" style="width: 80px">
-                        {{ item.num }}
+                <div class="table-row row" :class="{even: index % 2 > 0, 'active-book': item.active, 'active-parent-book': item.activeParent}">
+                    <div v-show="item.inGroup" class="row-part column justify-center items-center" style="width: 40px; border-right: 1px solid #cccccc">                        
+                        <q-icon name="la la-code-branch" size="24px" style="color: green" />
                     </div>
 
-                    <div class="row-part column items-stretch break-word clickable" style="width: 350px; font-size: 80%" @click="loadBook(item)">
-                        <div class="column col">
+                    <div class="row-part column justify-center items-stretch" style="width: 80px">
+                        <div class="col row justify-center items-center clickable" @click="loadBook(item)">
+                            <q-icon name="la la-book" size="40px" style="color: #dddddd" />
+                        </div>
+
+                        <div v-show="!showSameBook && item.group && item.group.length > 0" class="row justify-center" style="font-size: 70%">
+                            {{ (item.group ? item.group.length + 1 : 0) }} верси{{ wordEnding((item.group ? item.group.length : 0), 1) }}
+                        </div>
+                    </div>
+
+                    <div class="row-part column items-stretch clickable" :style="{ 'width': (350 - 40*(+item.inGroup)) + 'px' }" style="font-size: 75%" @click="loadBook(item)">
+                        <div class="row" style="font-size: 90%">
+                            <div class="row justify-center row-info-panel" style="width: 40px">
+                                {{ item.num }}
+                            </div>
+                            <div class="row justify-center row-info-panel" style="width: 130px">
+                                Чит: {{ item.touchTime }}
+                            </div>
+                            <div class="row justify-center row-info-panel" style="width: 130px">
+                                Загр: {{ item.addTime }}
+                            </div>
+                            <div class="row justify-center row-info-panel" style="width: 1px">
+                            </div>
+                        </div>
+
+                        <div class="column col q-mt-xs break-word">
                             <div style="color: green">
                                 {{ item.desc.author }}
                             </div>
                             <div>{{ item.desc.title }}</div>
                         </div>
-                        <div class="read-bar" :style="`width: ${340*item.readPart}px`"></div>
+
+                        <div class="read-bar" :style="`width: ${(340 - 40*(+item.inGroup))*item.readPart}px`"></div>
                     </div>
 
-                    <div class="row-part column justify-center" style="width: 80px; font-size: 80%">
+                    <div class="row-part column justify-center" style="width: 80px; font-size: 75%">
                         <a v-show="isUrl(item.url)" :href="item.url" target="_blank">Оригинал</a><br>
                         <a :href="item.path" @click.prevent="downloadBook(item.path, item.fullTitle)">Скачать FB2</a>
                     </div>
@@ -155,7 +184,7 @@
 import vueComponent from '../../vueComponent.js';
 
 import path from 'path-browserify';
-//import _ from 'lodash';
+import _ from 'lodash';
 
 import * as utils from '../../../share/utils';
 import LockQueue from '../../../share/LockQueue';
@@ -168,9 +197,12 @@ const componentOptions = {
         Window,
     },
     watch: {
-        search: function() {
+        search() {
             this.updateTableData();
-        }
+        },
+        settings() {
+            this.loadSettings();
+        },
     },
 };
 class RecentBooksPage {
@@ -180,12 +212,17 @@ class RecentBooksPage {
     search = '';
     tableData = [];
     sortMethod = '';
+    showSameBook = false;
 
     created() {
+        this.commit = this.$store.commit;
+
         this.lastScrollTop1 = 0;
         this.lastScrollTop2 = 0;
 
         this.lock = new LockQueue(100);
+
+        this.loadSettings();
     }
 
     init() {
@@ -198,6 +235,16 @@ class RecentBooksPage {
         this.updateTableData();//no await
     }
 
+    loadSettings() {
+        const settings = this.settings;
+        this.showSameBook = settings.recentShowSameBook;
+        this.sortMethod = settings.recentSortMethod || 'addTimeDesc';
+    }
+
+    get settings() {
+        return this.$store.state.reader.settings;
+    }
+
     async updateTableData() {
         await this.lock.get();
         try {
@@ -214,6 +261,8 @@ class RecentBooksPage {
                 let d = new Date();
                 d.setTime(book.touchTime);
                 const touchTime = utils.formatDate(d);
+                d.setTime(book.addTime);
+                const addTime = utils.formatDate(d);
 
                 let readPart = 0;
                 let perc = '';
@@ -233,6 +282,7 @@ class RecentBooksPage {
 
                 result.push({
                     touchTime,
+                    addTime,
                     desc: {
                         author,
                         title: `${title}${perc}${textLen}`,
@@ -244,6 +294,8 @@ class RecentBooksPage {
                     key: book.key,
                     sameBookKey: book.sameBookKey,
                     active: (activeBook.key == book.key),
+                    activeParent: false,
+                    inGroup: false,
 
                     //для сортировки
                     addTimeRaw: book.addTime,
@@ -290,14 +342,21 @@ class RecentBooksPage {
 
             //группировка
             const groups = {};
-            const newResult = [];
+            const parents = {};
+            let newResult = [];
             for (const book of result) {
                 if (book.sameBookKey !== undefined) {
                     if (!groups[book.sameBookKey]) {
                         groups[book.sameBookKey] = [];
+                        parents[book.sameBookKey] = book;
+
                         book.group = groups[book.sameBookKey];
                         newResult.push(book);
                     } else {
+                        book.inGroup = true;
+                        if (book.active)
+                            parents[book.sameBookKey].activeParent = true;
+
                         groups[book.sameBookKey].push(book);
                     }
                 } else {
@@ -306,6 +365,21 @@ class RecentBooksPage {
             }
             result = newResult;
 
+            //showSameBook
+            if (this.showSameBook) {
+                newResult = [];
+                for (const book of result) {
+                    newResult.push(book);
+                    if (book.group) {
+                        for (const sameBook of book.group) {
+                            newResult.push(sameBook);
+                        }
+                    }
+                }
+
+                result = newResult;
+            }
+
             //другие стадии
             //.....
 
@@ -388,13 +462,16 @@ class RecentBooksPage {
         this.$refs.input.focus();
     }
 
-    wordEnding(num) {
-        const endings = ['ов', '', 'а', 'а', 'а', 'ов', 'ов', 'ов', 'ов', 'ов'];
+    wordEnding(num, type = 0) {
+        const endings = [
+            ['ов', '', 'а', 'а', 'а', 'ов', 'ов', 'ов', 'ов', 'ов'],
+            ['й', 'я', 'и', 'и', 'и', 'й', 'й', 'й', 'й', 'й']
+        ];
         const deci = num % 100;
         if (deci > 10 && deci < 20) {
-            return 'ов';
+            return endings[type][0];
         } else {
-            return endings[num % 10];
+            return endings[type][num % 10];
         }
     }
 
@@ -463,6 +540,16 @@ class RecentBooksPage {
         this.lastScrollTop2 = curScrollTop;
     }
 
+    showSameBookClick() {
+        this.showSameBook = !this.showSameBook;
+
+        const newSettings = _.cloneDeep(this.settings);
+        newSettings.recentShowSameBook = this.showSameBook;
+        this.commit('reader/setSettings', newSettings);
+
+        this.updateTableData();
+    }
+
     close() {
         this.$emit('recent-books-close');
     }
@@ -508,7 +595,7 @@ export default vueComponent(RecentBooksPage);
 }
 
 .break-word {
-    line-height: 150%;
+    line-height: 180%;
     overflow-wrap: break-word;
     word-wrap: break-word;
     white-space: normal;
@@ -517,13 +604,32 @@ export default vueComponent(RecentBooksPage);
 .read-bar {
     height: 3px;
     background-color: #aaaaaa;
+    margin-bottom: 2px;
 }
 
 .even {
-    background-color: #f0f0f0;
+    background-color: #f2f2f2;
 }
 
 .active-book {
     background-color: #b0f0b0 !important;
 }
+
+.active-parent-book {
+    background-color: #ffbbbb !important;
+}
+
+.icon {
+    transition: transform 0.2s;
+}
+
+.expanded-icon {
+    transform: rotate(90deg);
+}
+
+.row-info-panel {
+    line-height: 110%;
+    border-left: 1px solid #cccccc;
+    border-bottom: 1px solid #cccccc;
+}
 </style>
diff --git a/client/store/modules/reader.js b/client/store/modules/reader.js
index d4bb9b87..ab4a8972 100644
--- a/client/store/modules/reader.js
+++ b/client/store/modules/reader.js
@@ -188,6 +188,9 @@ const settingDefaults = {
     toolBarHideOnScroll: true,
     userHotKeys: {},
     userWallpapers: [],
+
+    recentShowSameBook: false,
+    recentSortMethod: '',
 };
 
 for (const font of fonts)

From 8808cc477970e49bbe3012a10351c2cc5d5626d2 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 12 Jul 2022 14:46:34 +0700
Subject: [PATCH 37/47] =?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=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=BE=D0=B9=20=D0=BF=D0=BE=20=D1=84=D0=B0?=
 =?UTF-8?q?=D0=B9=D0=BB=D0=B0=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RecentBooksPage/RecentBooksPage.vue       | 33 ++++++++++---------
 client/components/Reader/share/bookManager.js |  9 +++--
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index 7f38920d..8bdca700 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -46,20 +46,20 @@
                         </div>
 
                         <div v-show="!showSameBook && item.group && item.group.length > 0" class="row justify-center" style="font-size: 70%">
-                            {{ (item.group ? item.group.length + 1 : 0) }} верси{{ wordEnding((item.group ? item.group.length : 0), 1) }}
+                            {{ (item.group ? item.group.length + 1 : 0) }} верси{{ wordEnding((item.group ? item.group.length + 1 : 0), 1) }}
                         </div>
                     </div>
 
                     <div class="row-part column items-stretch clickable" :style="{ 'width': (350 - 40*(+item.inGroup)) + 'px' }" style="font-size: 75%" @click="loadBook(item)">
-                        <div class="row" style="font-size: 90%">
+                        <div class="row" style="font-size: 80%">
                             <div class="row justify-center row-info-panel" style="width: 40px">
                                 {{ item.num }}
                             </div>
-                            <div class="row justify-center row-info-panel" style="width: 130px">
-                                Чит: {{ item.touchTime }}
+                            <div class="row justify-center row-info-panel" style="width: 140px">
+                                Читался: {{ item.touchTime }}
                             </div>
-                            <div class="row justify-center row-info-panel" style="width: 130px">
-                                Загр: {{ item.addTime }}
+                            <div class="row justify-center row-info-panel" style="width: 140px">
+                                Загружен: {{ item.loadTime }}
                             </div>
                             <div class="row justify-center row-info-panel" style="width: 1px">
                             </div>
@@ -238,7 +238,7 @@ class RecentBooksPage {
     loadSettings() {
         const settings = this.settings;
         this.showSameBook = settings.recentShowSameBook;
-        this.sortMethod = settings.recentSortMethod || 'addTimeDesc';
+        this.sortMethod = settings.recentSortMethod || 'loadTimeDesc';
     }
 
     get settings() {
@@ -261,8 +261,9 @@ class RecentBooksPage {
                 let d = new Date();
                 d.setTime(book.touchTime);
                 const touchTime = utils.formatDate(d);
-                d.setTime(book.addTime);
-                const addTime = utils.formatDate(d);
+                const loadTimeRaw = (book.loadTime ? book.loadTime : 0);//book.addTime);
+                d.setTime(loadTimeRaw);
+                const loadTime = utils.formatDate(d);
 
                 let readPart = 0;
                 let perc = '';
@@ -282,7 +283,7 @@ class RecentBooksPage {
 
                 result.push({
                     touchTime,
-                    addTime,
+                    loadTime,
                     desc: {
                         author,
                         title: `${title}${perc}${textLen}`,
@@ -298,7 +299,7 @@ class RecentBooksPage {
                     inGroup: false,
 
                     //для сортировки
-                    addTimeRaw: book.addTime,
+                    loadTimeRaw,
                     touchTimeRaw: book.touchTime,
                     descString: `${author}${title}${perc}${textLen}`,
                 });
@@ -307,7 +308,7 @@ class RecentBooksPage {
             //нумерация
             let num = 0;
 
-            result.sort((a, b) => b.addTimeRaw - a.addTimeRaw);
+            result.sort((a, b) => b.loadTimeRaw - a.loadTimeRaw);
             for (const book of result) {
                 num++;
                 book.num = num;
@@ -326,11 +327,11 @@ class RecentBooksPage {
 
             //сортировка
             switch (this.sortMethod) {
-                case 'addTimeDesc':
-                    result.sort((a, b) => b.addTimeRaw - a.addTimeRaw);
+                case 'loadTimeDesc':
+                    result.sort((a, b) => b.loadTimeRaw - a.loadTimeRaw);
                     break;
-                case 'addTimeAsc':
-                    result.sort((a, b) => a.addTimeRaw - b.addTimeRaw);
+                case 'loadTimeAsc':
+                    result.sort((a, b) => a.loadTimeRaw - b.loadTimeRaw);
                     break;
                 case 'touchTimeDesc':
                     result.sort((a, b) => b.touchTimeRaw - a.touchTimeRaw);
diff --git a/client/components/Reader/share/bookManager.js b/client/components/Reader/share/bookManager.js
index 20f52199..5a37cea2 100644
--- a/client/components/Reader/share/bookManager.js
+++ b/client/components/Reader/share/bookManager.js
@@ -90,6 +90,8 @@ class BookManager {
 
             newRecent[newKey] = _.cloneDeep(book);
             newRecent[newKey].key = newKey;
+            if (!newRecent[newKey].loadTime)
+                newRecent[newKey].loadTime = newRecent[newKey].addTime;
         }
 
         this.recent = newRecent;
@@ -231,7 +233,7 @@ class BookManager {
     async addBook(newBook, callback) {        
         let meta = {url: newBook.url, path: newBook.path};
         meta.key = this.keyFromPath(meta.path);
-        meta.addTime = Date.now();
+        meta.addTime = Date.now();//время добавления в кеш
 
         const cb = (perc) => {
             const p = Math.round(30*perc/100);
@@ -405,7 +407,10 @@ class BookManager {
 
     async setRecentBook(value) {
         let result = this.metaOnly(value);
-        result.touchTime = Date.now();
+        result.touchTime = Date.now();//время последнего чтения
+        if (!result.loadTime)
+            result.loadTime = Date.now();//время загрузки файла
+
         result.deleted = 0;
 
         if (this.recent[result.key]) {

From 931966f4f382a17e49fbd3145d0f690cd64e8178 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 12 Jul 2022 15:05:17 +0700
Subject: [PATCH 38/47] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B8=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

---
 .../Reader/RecentBooksPage/RecentBooksPage.vue     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index 8bdca700..be7d5129 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -52,13 +52,13 @@
 
                     <div class="row-part column items-stretch clickable" :style="{ 'width': (350 - 40*(+item.inGroup)) + 'px' }" style="font-size: 75%" @click="loadBook(item)">
                         <div class="row" style="font-size: 80%">
-                            <div class="row justify-center row-info-panel" style="width: 40px">
+                            <div class="row justify-center row-info-panel" style="width: 30px">
                                 {{ item.num }}
                             </div>
-                            <div class="row justify-center row-info-panel" style="width: 140px">
+                            <div class="row justify-center row-info-panel" style="width: 130px">
                                 Читался: {{ item.touchTime }}
                             </div>
-                            <div class="row justify-center row-info-panel" style="width: 140px">
+                            <div class="row justify-center row-info-panel" style="width: 138px">
                                 Загружен: {{ item.loadTime }}
                             </div>
                             <div class="row justify-center row-info-panel" style="width: 1px">
@@ -66,7 +66,7 @@
                         </div>
 
                         <div class="column col q-mt-xs break-word">
-                            <div style="color: green">
+                            <div class="text-green-10" style="font-size: 105%">
                                 {{ item.desc.author }}
                             </div>
                             <div>{{ item.desc.title }}</div>
@@ -76,8 +76,10 @@
                     </div>
 
                     <div class="row-part column justify-center" style="width: 80px; font-size: 75%">
-                        <a v-show="isUrl(item.url)" :href="item.url" target="_blank">Оригинал</a><br>
-                        <a :href="item.path" @click.prevent="downloadBook(item.path, item.fullTitle)">Скачать FB2</a>
+                        <div>
+                            <a v-show="isUrl(item.url)" :href="item.url" target="_blank">Оригинал</a><br><br>
+                            <a :href="item.path" @click.prevent="downloadBook(item.path, item.fullTitle)">Скачать FB2</a>
+                        </div>
                     </div>
 
                     <div class="row-part column justify-center">

From 04a326c0e416dd571941328f39c0c98f9fe4e1ae Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 12 Jul 2022 15:51:43 +0700
Subject: [PATCH 39/47] =?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=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=BE=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RecentBooksPage/RecentBooksPage.vue       | 39 ++++++++++++++-----
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index be7d5129..d45453b8 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -50,28 +50,39 @@
                         </div>
                     </div>
 
-                    <div class="row-part column items-stretch clickable" :style="{ 'width': (350 - 40*(+item.inGroup)) + 'px' }" style="font-size: 75%" @click="loadBook(item)">
+                    <div class="row-part column items-stretch clickable break-word" :style="{ 'width': (350 - 40*(+item.inGroup)) + 'px' }" style="font-size: 75%" @click="loadBook(item)">
                         <div class="row" style="font-size: 80%">
-                            <div class="row justify-center row-info-panel" style="width: 30px">
+                            <div class="row justify-center row-info-top" style="width: 30px">
                                 {{ item.num }}
                             </div>
-                            <div class="row justify-center row-info-panel" style="width: 130px">
+                            <div class="row justify-center row-info-top" style="width: 130px">
                                 Читался: {{ item.touchTime }}
                             </div>
-                            <div class="row justify-center row-info-panel" style="width: 138px">
+                            <div class="row justify-center row-info-top" style="width: 138px">
                                 Загружен: {{ item.loadTime }}
                             </div>
-                            <div class="row justify-center row-info-panel" style="width: 1px">
+                            <div class="row justify-center row-info-top" style="width: 1px">
                             </div>
                         </div>
 
-                        <div class="column col q-mt-xs break-word">
+                        <div class="col q-mt-xs" :style="{ 'width': (340 - 40*(+item.inGroup)) + 'px' }">
                             <div class="text-green-10" style="font-size: 105%">
                                 {{ item.desc.author }}
                             </div>
                             <div>{{ item.desc.title }}</div>
                         </div>
 
+                        <div class="row q-mt-xs" style="font-size: 80%">
+                            <div class="row justify-center row-info-bottom" style="width: 50px">
+                                {{ item.desc.perc }}
+                            </div>
+                            <div class="row justify-center row-info-bottom" style="width: 50px">
+                                {{ item.desc.textLen }}
+                            </div>
+                            <div class="row justify-center row-info-bottom" style="width: 1px">
+                            </div>
+                        </div>
+
                         <div class="read-bar" :style="`width: ${(340 - 40*(+item.inGroup))*item.readPart}px`"></div>
                     </div>
 
@@ -273,8 +284,8 @@ class RecentBooksPage {
                 const p = (book.bookPosSeen ? book.bookPosSeen : (book.bookPos ? book.bookPos : 0));
                 if (book.textLength) {
                     readPart = p/book.textLength;
-                    perc = ` [${(readPart*100).toFixed(2)}%]`;
-                    textLen = ` ${Math.round(book.textLength/1000)}k`;
+                    perc = `${(readPart*100).toFixed(2)}%`;
+                    textLen = `${Math.round(book.textLength/1000)}k`;
                 }
 
                 const bt = utils.getBookTitle(book.fb2);
@@ -288,7 +299,9 @@ class RecentBooksPage {
                     loadTime,
                     desc: {
                         author,
-                        title: `${title}${perc}${textLen}`,
+                        title,
+                        perc,
+                        textLen,
                     },
                     readPart,
                     url: book.url,
@@ -630,9 +643,15 @@ export default vueComponent(RecentBooksPage);
     transform: rotate(90deg);
 }
 
-.row-info-panel {
+.row-info-top {
     line-height: 110%;
     border-left: 1px solid #cccccc;
     border-bottom: 1px solid #cccccc;
 }
+
+.row-info-bottom {
+    line-height: 110%;
+    border: 1px solid #cccccc;
+    border-right: 0;
+}
 </style>

From 72431f0202b42b4b04b96c820e1035897e3bf702 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 12 Jul 2022 16:51:32 +0700
Subject: [PATCH 40/47] =?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=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=BE=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/Reader.vue           | 26 +++++++++++--------
 .../RecentBooksPage/RecentBooksPage.vue       | 11 ++++----
 client/components/Reader/share/bookManager.js | 15 ++++++++---
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 749c757d..8b68ff03 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -1146,7 +1146,7 @@ class Reader {
                         });
                         book = Object.assign({}, wasOpened, {data: resp.data});
                     } catch (e) {
-                        //молчим
+                        this.$root.notify.error('Конвертированный файл не найден на сервере', 'Ошибка загрузки');
                     }
                 }
             }
@@ -1186,16 +1186,17 @@ class Reader {
                 found = (found ? _.cloneDeep(found) : found);
 
                 if (found) {
-                    //спрашиваем, надо ли объединить файлы
-                    const askResult = (wasOpened.path == found.path) || 
-                        await this.$root.stdDialog.askYesNo(`
-Файл с именем "${wasOpened.uploadFileName}" уже есть в загруженных.
-<br>Объединить позицию?`, 'Найдена похожая книга');
-
-                    if (askResult) {
-                        wasOpened.bookPos = found.bookPos;
-                        wasOpened.bookPosSeen = found.bookPosSeen;
-                        wasOpened.sameBookKey = found.sameBookKey;
+                    if (wasOpened.sameBookKey != found.sameBookKey) {
+                        //спрашиваем, надо ли объединить файлы
+                        const askResult = bookManager.keysEqual(found.path, addedBook.path) || 
+                            await this.$root.stdDialog.askYesNo(`
+    Файл с именем "${wasOpened.uploadFileName}" уже есть в загруженных.
+    <br>Объединить позицию?`, 'Найдена похожая книга');
+                        if (askResult) {
+                            wasOpened.bookPos = found.bookPos;
+                            wasOpened.bookPosSeen = found.bookPosSeen;
+                            wasOpened.sameBookKey = found.sameBookKey;
+                        }
                     }
                 } else {
                     wasOpened.sameBookKey = wasOpened.uploadFileName;
@@ -1204,6 +1205,9 @@ class Reader {
                 wasOpened.sameBookKey = addedBook.url;
             }
 
+            if (!bookManager.keysEqual(wasOpened.path, addedBook.path))
+                delete wasOpened.loadTime;
+
             // добавляем в историю
             await bookManager.setRecentBook(Object.assign(wasOpened, addedBook));
             this.mostRecentBook();
diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index d45453b8..a7cdee04 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -70,15 +70,16 @@
                                 {{ item.desc.author }}
                             </div>
                             <div>{{ item.desc.title }}</div>
+                            <!--div>{{ item.path }}</div-->
                         </div>
 
                         <div class="row q-mt-xs" style="font-size: 80%">
-                            <div class="row justify-center row-info-bottom" style="width: 50px">
-                                {{ item.desc.perc }}
-                            </div>
-                            <div class="row justify-center row-info-bottom" style="width: 50px">
+                            <div class="row justify-center row-info-bottom" style="width: 60px">
                                 {{ item.desc.textLen }}
                             </div>
+                            <div class="row justify-center row-info-bottom" style="width: 60px">
+                                {{ item.desc.perc }}
+                            </div>
                             <div class="row justify-center row-info-bottom" style="width: 1px">
                             </div>
                         </div>
@@ -285,7 +286,7 @@ class RecentBooksPage {
                 if (book.textLength) {
                     readPart = p/book.textLength;
                     perc = `${(readPart*100).toFixed(2)}%`;
-                    textLen = `${Math.round(book.textLength/1000)}k`;
+                    textLen = `${Math.floor(readPart*book.textLength/1000)}/${Math.floor(book.textLength/1000)}`;
                 }
 
                 const bt = utils.getBookTitle(book.fb2);
diff --git a/client/components/Reader/share/bookManager.js b/client/components/Reader/share/bookManager.js
index 5a37cea2..1e232d00 100644
--- a/client/components/Reader/share/bookManager.js
+++ b/client/components/Reader/share/bookManager.js
@@ -367,6 +367,13 @@ class BookManager {
     keyFromPath(bookPath) {
         return path.basename(bookPath);
     }
+
+    keysEqual(bookPath1, bookPath2) {
+        if (bookPath1 === undefined || bookPath2 === undefined)
+            return false;
+        
+        return (this.keyFromPath(bookPath1) === this.keyFromPath(bookPath2));
+    }
     //-- recent --------------------------------------------------------------
     async recentSetItem(item = null, skipCheck = false) {
         const rev = await bmRecentStoreNew.getItem('rev');
@@ -506,8 +513,8 @@ class BookManager {
 
         for (const key in this.recent) {
             const book = this.recent[key];
-            if (!book.deleted && book.url == url && book.touchTime > max) {
-                max = book.touchTime;
+            if (!book.deleted && book.url == url && book.loadTime > max) {
+                max = book.loadTime;
                 result = book;
             }
         }
@@ -521,8 +528,8 @@ class BookManager {
 
         for (const key in this.recent) {
             const book = this.recent[key];
-            if (!book.deleted && book.sameBookKey == sameKey && book.touchTime > max) {
-                max = book.touchTime;
+            if (!book.deleted && book.sameBookKey == sameKey && book.loadTime > max) {
+                max = book.loadTime;
                 result = book;
             }
         }

From b4aa6ab6c89ac1cd28f814264fe2ba297b5563fd Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 12 Jul 2022 16:58:34 +0700
Subject: [PATCH 41/47] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/RecentBooksPage/RecentBooksPage.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index a7cdee04..7a9e8474 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -336,6 +336,7 @@ class RecentBooksPage {
                 result = result.filter(item => {
                     return !search ||
                         item.touchTime.includes(search) ||
+                        item.loadTime.includes(search) ||
                         item.desc.title.toLowerCase().includes(search.toLowerCase()) ||
                         item.desc.author.toLowerCase().includes(search.toLowerCase())
                 });

From f1bf8e54ae5d3d8c43aaa06ecd70a810121ff096 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 12 Jul 2022 17:10:50 +0700
Subject: [PATCH 42/47] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20scrollToActiveB?=
 =?UTF-8?q?ook?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RecentBooksPage/RecentBooksPage.vue       | 92 +++++--------------
 1 file changed, 24 insertions(+), 68 deletions(-)

diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index 7a9e8474..51812a86 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -29,6 +29,7 @@
             </div>
 
             <q-virtual-scroll
+                ref="virtualScroll"
                 v-slot="{ item, index }"
                 :items="tableData"
                 scroll-target="#vs-container"
@@ -247,6 +248,7 @@ class RecentBooksPage {
         });
 
         this.updateTableData();//no await
+        this.scrollToActiveBook();//no await
     }
 
     loadSettings() {
@@ -407,74 +409,6 @@ class RecentBooksPage {
         }
     }
 
-    /*async updateTableData(limit) {
-        while (this.updating) await utils.sleep(100);
-        this.updating = true;
-        let result = [];
-
-        const sorted = bookManager.getSortedRecent();
-
-        let num = 0;
-        for (let i = 0; i < sorted.length; i++) {
-            const book = sorted[i];
-            if (book.deleted)
-                continue;
-
-            num++;
-            if (limit && result.length >= limit)
-                break;
-
-            let d = new Date();
-            d.setTime(book.touchTime);
-            const t = utils.formatDate(d).split(' ');
-
-            let readPart = 0;
-            let perc = '';
-            let textLen = '';
-            const p = (book.bookPosSeen ? book.bookPosSeen : (book.bookPos ? book.bookPos : 0));
-            if (book.textLength) {
-                readPart = p/book.textLength;
-                perc = ` [${(readPart*100).toFixed(2)}%]`;
-                textLen = ` ${Math.round(book.textLength/1000)}k`;
-            }
-
-            const bt = utils.getBookTitle(book.fb2);
-
-            let title = bt.bookTitle;
-            title = (title ? `"${title}"`: '');
-            const author = (bt.author ? bt.author : (bt.bookTitle ? bt.bookTitle : (book.uploadFileName ? book.uploadFileName : book.url)));
-
-            result.push({
-                num,
-                touchDateTime: book.touchTime,
-                touchDate: t[0],
-                touchTime: t[1],
-                desc: {
-                    author,
-                    title: `${title}${perc}${textLen}`,
-                },
-                readPart,
-                descString: `${author}${title}${perc}${textLen}`,//для сортировки
-                url: book.url,
-                path: book.path,
-                fullTitle: bt.fullTitle,
-                key: book.key,
-            });
-        }
-
-        const search = this.search;
-        result = result.filter(item => {
-            return !search ||
-                item.touchTime.includes(search) ||
-                item.touchDate.includes(search) ||
-                item.desc.title.toLowerCase().includes(search.toLowerCase()) ||
-                item.desc.author.toLowerCase().includes(search.toLowerCase())
-        });
-
-        this.tableData = result;
-        this.updating = false;
-    }*/
-
     resetSearch() {
         this.search = '';
         this.$refs.input.focus();
@@ -568,6 +502,28 @@ class RecentBooksPage {
         this.updateTableData();
     }
 
+    async scrollToActiveBook() {
+        await this.$nextTick();
+        
+        let activeIndex = -1;
+        let activeParentIndex = -1;
+        for (let i = 0; i < this.tableData.length; i++) {
+            const book = this.tableData[i];
+            if (book.active)
+                activeIndex = i;
+            if (book.activeParent)
+                activeParentIndex = i;
+
+            if (activeIndex >= 0 && activeParentIndex >= 0)
+                break;
+        }
+
+        const index = (activeIndex >= 0 ? activeIndex : activeParentIndex);
+        if (index >= 0) {
+            this.$refs.virtualScroll.scrollTo(index, 'center');
+        }
+    }
+
     close() {
         this.$emit('recent-books-close');
     }

From 0efbaf643aed65fbe37c585251f6ada76a55f16b Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 12 Jul 2022 17:32:19 +0700
Subject: [PATCH 43/47] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BE=D0=B1=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 8b68ff03..2b718803 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -1146,7 +1146,7 @@ class Reader {
                         });
                         book = Object.assign({}, wasOpened, {data: resp.data});
                     } catch (e) {
-                        this.$root.notify.error('Конвертированный файл не найден на сервере', 'Ошибка загрузки');
+                        this.$root.notify.error('Конвертированный файл не найден на сервере.<br>Пробуем загрузить оригинал.', 'Ошибка загрузки');
                     }
                 }
             }

From 7ffcd3fe1b2f95125400c213ee4b7f544c68950e Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 12 Jul 2022 17:33:03 +0700
Subject: [PATCH 44/47] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=BF=D0=BE=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BF=D1=80=D0=B8=20=D1=81=D0=BA=D1=80=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BB=D0=B8=D0=BD=D0=B3=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RecentBooksPage/RecentBooksPage.vue       | 60 +++++++++++++------
 1 file changed, 41 insertions(+), 19 deletions(-)

diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index 51812a86..7f3b13c7 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -15,6 +15,10 @@
                     <q-icon name="la la-caret-right" class="icon" :class="{'expanded-icon': showSameBook}" color="green-8" size="24px" />
                 </q-btn>
 
+                <q-btn class="bg-white" rounded style="width: 35px; height: 35px; margin: 6px 6px 0px 6px" @click="scrollToActiveBook">
+                    <q-icon name="la la-location-arrow" color="green-8" size="24px" />
+                </q-btn>
+
                 <q-input 
                     ref="input" v-model="search"
                     outlined dense
@@ -247,8 +251,11 @@ class RecentBooksPage {
             //this.$refs.input.focus();//плохо на планшетах
         });
 
-        this.updateTableData();//no await
-        this.scrollToActiveBook();//no await
+        (async() => {
+            this.showBar();
+            await this.updateTableData();
+            await this.scrollToActiveBook();
+        })();
     }
 
     loadSettings() {
@@ -474,10 +481,21 @@ class RecentBooksPage {
             return false;
     }
 
+    showBar() {
+        this.lastScrollTop1 = this.$refs.vsContainer.scrollTop;
+        this.$refs.header.style.position = 'sticky';
+        this.$refs.header.style.top = 0;
+    }
+
     onScroll() {
         const curScrollTop = this.$refs.vsContainer.scrollTop;
 
-        if (curScrollTop - this.lastScrollTop1 > 150) {
+        if (this.lockScroll) {
+            this.lastScrollTop1 = curScrollTop;
+            return;
+        }
+
+        if (curScrollTop - this.lastScrollTop1 > 100) {
             this.$refs.header.style.top = `-${this.$refs.header.offsetHeight}px`;
             this.$refs.header.style.transition = 'top 0.2s ease 0s';
 
@@ -503,24 +521,28 @@ class RecentBooksPage {
     }
 
     async scrollToActiveBook() {
-        await this.$nextTick();
-        
-        let activeIndex = -1;
-        let activeParentIndex = -1;
-        for (let i = 0; i < this.tableData.length; i++) {
-            const book = this.tableData[i];
-            if (book.active)
-                activeIndex = i;
-            if (book.activeParent)
-                activeParentIndex = i;
+        this.lockScroll = true;
+        try {
+            let activeIndex = -1;
+            let activeParentIndex = -1;
+            for (let i = 0; i < this.tableData.length; i++) {
+                const book = this.tableData[i];
+                if (book.active)
+                    activeIndex = i;
+                if (book.activeParent)
+                    activeParentIndex = i;
 
-            if (activeIndex >= 0 && activeParentIndex >= 0)
-                break;
-        }
+                if (activeIndex >= 0 && activeParentIndex >= 0)
+                    break;
+            }
 
-        const index = (activeIndex >= 0 ? activeIndex : activeParentIndex);
-        if (index >= 0) {
-            this.$refs.virtualScroll.scrollTo(index, 'center');
+            const index = (activeIndex >= 0 ? activeIndex : activeParentIndex);
+            if (index >= 0) {
+                this.$refs.virtualScroll.scrollTo(index, 'center');
+            }
+        } finally {
+            await utils.sleep(100);
+            this.lockScroll = false;
         }
     }
 

From 928f911d03c9a1ebd452b9eabcfe26ca838f1ce8 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 12 Jul 2022 17:53:14 +0700
Subject: [PATCH 45/47] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BF=D0=BE=D0=B4=D1=81=D0=BA=D0=B0=D0=B7?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=BA=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RecentBooksPage/RecentBooksPage.vue       | 54 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index 7f3b13c7..ede6a354 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -11,12 +11,32 @@
 
         <div id="vs-container" ref="vsContainer" class="recent-books-scroll col">
             <div ref="header" class="scroll-header row bg-blue-2">
-                <q-btn class="bg-white" rounded style="width: 35px; height: 35px; margin: 6px 6px 0px 6px" @click="showSameBookClick">
+                <q-btn class="tool-button" round @click="showSameBookClick">
                     <q-icon name="la la-caret-right" class="icon" :class="{'expanded-icon': showSameBook}" color="green-8" size="24px" />
+                    <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
+                        Показать/скрыть версии книг
+                    </q-tooltip>
                 </q-btn>
 
-                <q-btn class="bg-white" rounded style="width: 35px; height: 35px; margin: 6px 6px 0px 6px" @click="scrollToActiveBook">
+                <q-btn class="tool-button" round @click="scrollToBegin">
+                    <q-icon name="la la-arrow-up" color="green-8" size="24px" />
+                    <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
+                        В начало списка
+                    </q-tooltip>
+                </q-btn>
+
+                <q-btn class="tool-button" round @click="scrollToEnd">
+                    <q-icon name="la la-arrow-down" color="green-8" size="24px" />
+                    <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
+                        В конец списка
+                    </q-tooltip>
+                </q-btn>
+
+                <q-btn class="tool-button" round @click="scrollToActiveBook">
                     <q-icon name="la la-location-arrow" color="green-8" size="24px" />
+                    <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
+                        На текущую книгу
+                    </q-tooltip>
                 </q-btn>
 
                 <q-input 
@@ -546,6 +566,26 @@ class RecentBooksPage {
         }
     }
 
+    async scrollToBegin() {
+        this.lockScroll = true;
+        try {
+            this.$refs.virtualScroll.scrollTo(0, 'center');
+        } finally {
+            await utils.sleep(100);
+            this.lockScroll = false;
+        }
+    }
+
+    async scrollToEnd() {
+        this.lockScroll = true;
+        try {
+            this.$refs.virtualScroll.scrollTo(this.tableData.length, 'center');
+        } finally {
+            await utils.sleep(100);
+            this.lockScroll = false;
+        }
+    }
+
     close() {
         this.$emit('recent-books-close');
     }
@@ -575,6 +615,7 @@ export default vueComponent(RecentBooksPage);
     z-index: 1;
     top: 0;
     border-bottom: 2px solid #aaaaaa;
+    padding-left: 5px;
 }
 
 .table-row {
@@ -634,4 +675,13 @@ export default vueComponent(RecentBooksPage);
     border: 1px solid #cccccc;
     border-right: 0;
 }
+
+.tool-button {
+    min-width: 30px;
+    width: 30px;
+    min-height: 30px;
+    height: 30px;
+    margin: 10px 6px 0px 3px;
+    background-color: white;
+}
 </style>

From fc630923a4a11dcc154d0a8c210e609b09783d21 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 12 Jul 2022 18:50:35 +0700
Subject: [PATCH 46/47] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B9=D0=BA=D0=B0=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RecentBooksPage/RecentBooksPage.vue       | 154 ++++++++----------
 1 file changed, 67 insertions(+), 87 deletions(-)

diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
index ede6a354..c602bbdb 100644
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -39,10 +39,35 @@
                     </q-tooltip>
                 </q-btn>
 
+                <q-select
+                    ref="sortMethod"
+                    v-model="sortMethod"
+                    class="q-ml-md q-mt-xs"
+                    :options="sortMethodOptions"
+                    style="width: 180px"
+                    bg-color="white"
+                    dropdown-icon="la la-angle-down la-sm"
+                    outlined dense emit-value map-options display-value-sanitize options-sanitize
+                    options-html display-value-html
+
+                    @update:model-value="sortMethodSelected"
+                >
+                    <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
+                        Метод сортировки
+                    </q-tooltip>
+
+                    <template #selected-item="scope">
+                        <div style="height: 28px; padding-top: 2px; overflow: hidden" v-html="scope.opt.label" />
+                    </template>
+                </q-select>
+
                 <q-input 
-                    ref="input" v-model="search"
+                    ref="input"
+                    v-model="search"
+                    class="q-ml-sm q-mt-xs"
                     outlined dense
-                    style="position: absolute; top: 4px; left: 200px; width: 350px" bg-color="white"
+                    style="width: 180px"
+                    bg-color="white"
                     placeholder="Найти"
                     @click.stop
                 >
@@ -131,90 +156,6 @@
                 </div>
             </q-virtual-scroll>
         </div>
-
-        <!--q-table
-            class="recent-books-table col"
-            :rows="tableData"
-            row-key="key"
-            :columns="columns"
-            :pagination="pagination"
-            separator="cell"
-            hide-bottom
-            virtual-scroll
-            dense
-        > 
-            <template #header="props">
-                <q-tr :props="props">
-                    <q-th key="num" class="td-mp" style="width: 25px" :props="props">
-                        <span v-html="props.cols[0].label"></span>
-                    </q-th>
-                    <q-th key="date" class="td-mp break-word" style="width: 77px" :props="props">
-                        <span v-html="props.cols[1].label"></span>
-                    </q-th>
-                    <q-th key="desc" class="td-mp" style="width: 300px" :props="props" colspan="4">
-                        <q-input 
-                            ref="input" v-model="search"
-                            outlined dense style="position: absolute; top: 6px; left: 90px; width: 350px" bg-color="white"
-                            placeholder="Найти"                            
-                            @click.stop
-                        >
-                            <template #append>
-                                <q-icon v-if="search !== ''" name="la la-times" class="cursor-pointer" @click.stop="resetSearch" />
-                            </template>
-                        </q-input>
-                        <span v-html="props.cols[2].label"></span>
-                    </q-th>
-                </q-tr>
-            </template>
-
-            <template #body="props">
-                <q-tr :props="props">
-                    <q-td key="num" :props="props" class="td-mp" auto-width>
-                        <div class="break-word" style="width: 25px">
-                            {{ props.row.num }}
-                        </div>
-                    </q-td>
-
-                    <q-td key="date" auto-width :props="props" class="td-mp clickable" @click="loadBook(props.row)">
-                        <div class="break-word" style="width: 68px">
-                            {{ props.row.touchDate }}<br>
-                            {{ props.row.touchTime }}
-                        </div>
-                    </q-td>
-
-                    <q-td key="desc" auto-width :props="props" class="td-mp clickable" @click="loadBook(props.row)">
-                        <div class="break-word" style="width: 300px; font-size: 90%">
-                            <div style="color: green">
-                                {{ props.row.desc.author }}
-                            </div>
-                            <div>{{ props.row.desc.title }}</div>
-                            <div class="read-bar" :style="`width: ${300*props.row.readPart}px`"></div>
-                        </div>
-                    </q-td>
-
-                    <q-td key="links" :props="props" class="td-mp" auto-width>
-                        <div class="break-word" style="width: 75px; font-size: 90%">
-                            <a v-show="isUrl(props.row.url)" :href="props.row.url" target="_blank">Оригинал</a><br>
-                            <a :href="props.row.path" @click.prevent="downloadBook(props.row.path, props.row.fullTitle)">Скачать FB2</a>
-                        </div>
-                    </q-td>
-
-                    <q-td key="close" :props="props" class="td-mp" auto-width>
-                        <div style="width: 38px">
-                            <q-btn
-                                dense
-                                style="width: 30px; height: 30px; padding: 7px 0 7px 0; margin-left: 4px"
-                                @click="handleDel(props.row.key)"
-                            >
-                                <q-icon class="la la-times" size="14px" />
-                            </q-btn>
-                        </div>
-                    </q-td>
-                    <q-td key="last" :props="props" class="no-mp">
-                    </q-td>
-                </q-tr>
-            </template>
-        </q-table-->
     </Window>
 </template>
 
@@ -239,6 +180,9 @@ const componentOptions = {
         search() {
             this.updateTableData();
         },
+        sortMethod() {
+            this.updateTableData();
+        },
         settings() {
             this.loadSettings();
         },
@@ -271,6 +215,8 @@ class RecentBooksPage {
             //this.$refs.input.focus();//плохо на планшетах
         });
 
+        this.inited = true;
+
         (async() => {
             this.showBar();
             await this.updateTableData();
@@ -289,6 +235,9 @@ class RecentBooksPage {
     }
 
     async updateTableData() {
+        if (!this.inited)
+            return;
+
         await this.lock.get();
         try {
             let result = [];
@@ -346,7 +295,6 @@ class RecentBooksPage {
                     //для сортировки
                     loadTimeRaw,
                     touchTimeRaw: book.touchTime,
-                    descString: `${author}${title}${perc}${textLen}`,
                 });
             }
 
@@ -385,6 +333,18 @@ class RecentBooksPage {
                 case 'touchTimeAsc':
                     result.sort((a, b) => a.touchTimeRaw - b.touchTimeRaw);
                     break;
+                case 'authorDesc':
+                    result.sort((a, b) => b.desc.author.localeCompare(a.desc.author));
+                    break;
+                case 'authorAsc':
+                    result.sort((a, b) => a.desc.author.localeCompare(b.desc.author));
+                    break;
+                case 'titleDesc':
+                    result.sort((a, b) => b.desc.title.localeCompare(a.desc.title));
+                    break;
+                case 'titleAsc':
+                    result.sort((a, b) => a.desc.title.localeCompare(b.desc.title));
+                    break;
             }
 
             //группировка
@@ -540,6 +500,12 @@ class RecentBooksPage {
         this.updateTableData();
     }
 
+    sortMethodSelected() {
+        const newSettings = _.cloneDeep(this.settings);
+        newSettings.recentSortMethod = this.sortMethod;
+        this.commit('reader/setSettings', newSettings);
+    }
+
     async scrollToActiveBook() {
         this.lockScroll = true;
         try {
@@ -586,6 +552,20 @@ class RecentBooksPage {
         }
     }
 
+
+    get sortMethodOptions() {
+        return [
+            {label: '<span style="font-size: 150%">&uarr;</span> Время загрузки', value: 'loadTimeDesc'},
+            {label: '<span style="font-size: 150%">&darr;</span> Время загрузки', value: 'loadTimeAsc'},
+            {label: '<span style="font-size: 150%">&uarr;</span> Время чтения', value: 'touchTimeDesc'},
+            {label: '<span style="font-size: 150%">&darr;</span> Время чтения', value: 'touchTimeAsc'},
+            {label: '<span style="font-size: 150%">&uarr;</span> Автор', value: 'authorDesc'},
+            {label: '<span style="font-size: 150%">&darr;</span> Автор', value: 'authorAsc'},
+            {label: '<span style="font-size: 150%">&uarr;</span> Название', value: 'titleDesc'},
+            {label: '<span style="font-size: 150%">&darr;</span> Название', value: 'titleAsc'},
+        ];
+    }
+
     close() {
         this.$emit('recent-books-close');
     }

From 7e89228803a7abbcca294c203846a758657b8e8a Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 12 Jul 2022 19:07:39 +0700
Subject: [PATCH 47/47] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D0=B8=D1=8F=200.?=
 =?UTF-8?q?11.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/versionHistory.js | 22 ++++++++++++++++++++++
 package-lock.json                          |  4 ++--
 package.json                               |  2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/client/components/Reader/versionHistory.js b/client/components/Reader/versionHistory.js
index 0b054d97..00b49a3a 100644
--- a/client/components/Reader/versionHistory.js
+++ b/client/components/Reader/versionHistory.js
@@ -1,4 +1,26 @@
 export const versionHistory = [
+{
+    version: '0.11.7',
+    releaseDate: '2022-07-12',
+    showUntil: '2022-07-19',
+    content:
+`
+<ul>
+    <li>добавлено автосокрытие панели управления при листании, отключается в настройках</li>
+    <li>изменения в окне загруженных книг:</li>
+        <ul>
+            <li>добавлена группировка по версиям файла одной и той же книги</li>
+            <li>группировка происходит по имени загружаемого файла, либо по URL книги</li>
+            <li>добавлены различные методы сортировки списка загруженных книг</li>
+            <li>нумерация всегда осуществляется по времени загрузки</li>
+        </ul>
+    <li>незначительные общие изменения интерфейса, приведение к единому стилю</li>
+    <li>исправления багов</li>
+</ul>
+
+`
+},
+
 {
     version: '0.11.6',
     releaseDate: '2022-07-02',
diff --git a/package-lock.json b/package-lock.json
index 47144f71..3b35a2c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "Liberama",
-  "version": "0.11.6",
+  "version": "0.11.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "Liberama",
-      "version": "0.11.6",
+      "version": "0.11.7",
       "hasInstallScript": true,
       "license": "CC0-1.0",
       "dependencies": {
diff --git a/package.json b/package.json
index d5c5d66a..1303b588 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Liberama",
-  "version": "0.11.6",
+  "version": "0.11.7",
   "author": "Book Pauk <bookpauk@gmail.com>",
   "license": "CC0-1.0",
   "repository": "bookpauk/liberama",