From 4e8773ecde322da6a60115c1a70563ed5620be18 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 25 Mar 2019 12:51:01 +0700
Subject: [PATCH 1/5] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue
index c8a4b91b..67ee8932 100644
--- a/client/components/Reader/SettingsPage/SettingsPage.vue
+++ b/client/components/Reader/SettingsPage/SettingsPage.vue
@@ -452,7 +452,7 @@
                     </el-tab-pane>
                     <!-- Сброс ------------------------------------------------------------------------->
                     <el-tab-pane label="Сброс">
-                        <el-button @click="setDefaults">Установить по-умолчанию</el-button>
+                        <el-button @click="setDefaults">Установить по умолчанию</el-button>
                     </el-tab-pane>
 
                 </el-tabs>

From 5a19cca407948aaa188e8c2e61ec6b5b5670fbc5 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 25 Mar 2019 12:53:50 +0700
Subject: [PATCH 2/5] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue
index edf0e182..6ac25e0b 100644
--- a/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue
+++ b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue
@@ -4,7 +4,8 @@
         <ul>
             <li>загрузка любой страницы интернета</li>
             <li>изменение цвета фона, текста, размер и тип шрифта и прочее</li>
-            <li>установка и запоминание текущей позиции и настроек в браузере (в будущем планируется сохранение и на сервер)</li>
+            <li>установка и запоминание текущей позиции и настроек в браузере и на сервере</li>
+            <li>синхронизация данных (настроек и читаемых книг) между различными устройствами</li>
             <li>кэширование файлов книг на клиенте и на сервере</li>
             <li>открытие книг с локального диска</li>
             <li>плавный скроллинг текста</li>

From 2a0d1dcfce980dbe08f41170f6df8eddd1b4d2fd Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 25 Mar 2019 13:06:48 +0700
Subject: [PATCH 3/5] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=B1=D0=B0=D0=B3=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reader/ServerStorage/ServerStorage.vue     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/client/components/Reader/ServerStorage/ServerStorage.vue b/client/components/Reader/ServerStorage/ServerStorage.vue
index ac7810a1..bff2f2df 100644
--- a/client/components/Reader/ServerStorage/ServerStorage.vue
+++ b/client/components/Reader/ServerStorage/ServerStorage.vue
@@ -37,6 +37,7 @@ export default @Component({
 class ServerStorage extends Vue {
     created() {
         this.inited = false;
+        this.keyInited = false;
         this.commit = this.$store.commit;
         this.prevServerStorageKey = null;
         this.$root.$on('generateNewServerStorageKey', () => {this.generateNewServerStorageKey()});
@@ -88,7 +89,8 @@ class ServerStorage extends Vue {
         if (this.prevServerStorageKey != this.serverStorageKey) {
             this.prevServerStorageKey = this.serverStorageKey;
             this.hashedStorageKey = utils.toBase58(cryptoUtils.sha256(this.serverStorageKey));
-
+            this.keyInited = true;
+            
             await this.loadProfiles(force);
             this.checkCurrentProfile();
             await this.currentProfileChanged(force);
@@ -163,7 +165,7 @@ class ServerStorage extends Vue {
     }
 
     async loadSettings(force) {
-        if (!this.serverSyncEnabled || !this.currentProfile)
+        if (!this.keyInited || !this.serverSyncEnabled || !this.currentProfile)
             return;
 
         const setsId = `settings-${this.currentProfile}`;
@@ -206,7 +208,7 @@ class ServerStorage extends Vue {
     }
 
     async saveSettings() {
-        if (!this.serverSyncEnabled || !this.currentProfile || this.savingSettings)
+        if (!this.keyInited || !this.serverSyncEnabled || !this.currentProfile || this.savingSettings)
             return;
 
         const diff = utils.getObjDiff(this.oldSettings, this.settings);
@@ -252,7 +254,7 @@ class ServerStorage extends Vue {
     }
 
     async loadProfiles(force) {
-        if (!this.serverSyncEnabled)
+        if (!this.keyInited || !this.serverSyncEnabled)
             return;
 
         const oldRev = this.profilesRev;
@@ -294,7 +296,7 @@ class ServerStorage extends Vue {
     }
 
     async saveProfiles() {
-        if (!this.serverSyncEnabled || this.savingProfiles)
+        if (!this.keyInited || !this.serverSyncEnabled || this.savingProfiles)
             return;
 
         const diff = utils.getObjDiff(this.oldProfiles, this.profiles);
@@ -346,7 +348,7 @@ class ServerStorage extends Vue {
     }
 
     async loadRecent(force) {
-        if (!this.serverSyncEnabled)
+        if (!this.keyInited || !this.serverSyncEnabled)
             return;
 
         const oldRev = bookManager.recentRev;
@@ -416,7 +418,7 @@ class ServerStorage extends Vue {
     }
 
     async saveRecent() {
-        if (!this.serverSyncEnabled || this.savingRecent)
+        if (!this.keyInited || !this.serverSyncEnabled || this.savingRecent)
             return;
 
         const bm = bookManager;
@@ -462,7 +464,7 @@ class ServerStorage extends Vue {
     }
 
     async saveRecentLast(force = false) {
-        if (!this.serverSyncEnabled || this.savingRecentLast)
+        if (!this.keyInited || !this.serverSyncEnabled || this.savingRecentLast)
             return;
 
         const bm = bookManager;

From 77c68d4e1159fa1aadca087c75af3a95bbe07e2f Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 25 Mar 2019 14:03:50 +0700
Subject: [PATCH 4/5] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=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

---
 .../Reader/ServerStorage/ServerStorage.vue    |  2 +-
 client/components/Reader/share/bookManager.js | 30 ++++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/client/components/Reader/ServerStorage/ServerStorage.vue b/client/components/Reader/ServerStorage/ServerStorage.vue
index bff2f2df..d59b598d 100644
--- a/client/components/Reader/ServerStorage/ServerStorage.vue
+++ b/client/components/Reader/ServerStorage/ServerStorage.vue
@@ -90,7 +90,7 @@ class ServerStorage extends Vue {
             this.prevServerStorageKey = this.serverStorageKey;
             this.hashedStorageKey = utils.toBase58(cryptoUtils.sha256(this.serverStorageKey));
             this.keyInited = true;
-            
+
             await this.loadProfiles(force);
             this.checkCurrentProfile();
             await this.currentProfileChanged(force);
diff --git a/client/components/Reader/share/bookManager.js b/client/components/Reader/share/bookManager.js
index 49bab084..59ad205e 100644
--- a/client/components/Reader/share/bookManager.js
+++ b/client/components/Reader/share/bookManager.js
@@ -79,19 +79,22 @@ class BookManager {
             }
         }
 
-        let key = null;
-        len = await bmRecentStore.length();
-        for (let i = 0; i < len; i++) {
-            key = await bmRecentStore.key(i);
-            if (key) {
-                let r = await bmRecentStore.getItem(key);
-                if (_.isObject(r) && r.key) {
-                    this.recent[r.key] = r;
+        //"ленивая" загрузка
+        (async() => {
+            let key = null;
+            len = await bmRecentStore.length();
+            for (let i = 0; i < len; i++) {
+                key = await bmRecentStore.key(i);
+                if (key) {
+                    let r = await bmRecentStore.getItem(key);
+                    if (_.isObject(r) && r.key) {
+                        this.recent[r.key] = r;
+                    }
+                } else  {
+                    await bmRecentStore.removeItem(key);
                 }
-            } else  {
-                await bmRecentStore.removeItem(key);
             }
-        }
+        })();
 
         //размножение для дебага
         /*if (key) {
@@ -410,6 +413,11 @@ class BookManager {
         this.recentLast = value;
         await bmCacheStore.setItem('recent-last', this.recentLast);
         if (value && value.key) {
+            //гарантия переключения книги
+            const mostRecent = this.mostRecentBook();
+            if (mostRecent)
+                this.recent[mostRecent.key].touchTime = value.touchTime - 1;
+
             this.recent[value.key] = value;
             await bmRecentStore.setItem(value.key, value);
             await bmCacheStore.setItem('recent', this.recent);

From 1de9ddd3944c94c0a559f6fae59e5b62937efca6 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 25 Mar 2019 14:04:16 +0700
Subject: [PATCH 5/5] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D0=B8=D1=8F=200.6.?=
 =?UTF-8?q?5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a456c383..0a58b078 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Liberama",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "engines": {
     "node": ">=10.0.0"
   },