Merge branch 'release/0.7.5a'

0.7.5b

client/components/Reader/Reader.vue

@@ -220,14 +220,19 @@ export default @Component({
         bookPos: function(newValue) {
             if (newValue !== undefined && this.activePage == 'TextPage') {
                 const textPage = this.$refs.page;
+
                 if (textPage.bookPos != newValue) {
                     textPage.bookPos = newValue;
                 }
-                this.debouncedSetRecentBook(newValue);
+
+                if (!this.scrollingActive)
+                    this.debouncedSetRecentBook(newValue);
+                else
+                    this.scrollingSetRecentBook(newValue);
             }
         },
         routeParamPos: function(newValue) {
-            if (newValue !== undefined && newValue != this.bookPos) {
+            if (!this.paramPosIgnore && newValue !== undefined && newValue != this.bookPos) {
                 this.bookPos = newValue;
             }
         },
@@ -291,10 +296,6 @@ class Reader extends Vue {
 
         this.lastActivePage = false;
 
-        this.debouncedUpdateRoute = _.debounce(() => {
-            this.updateRoute();
-        }, 1000);
-
         this.debouncedSetRecentBook = _.debounce(async(newValue) => {
             const recent = this.mostRecentBook();
             if (recent && (recent.bookPos != newValue || recent.bookPosSeen !== this.bookPosSeen)) {
@@ -302,8 +303,17 @@ class Reader extends Vue {
 
                 if (this.actionCur < 0 || (this.actionCur >= 0 && this.actionList[this.actionCur] != newValue))
                     this.addAction(newValue);
+
+                this.paramPosIgnore = true;
+                this.updateRoute();
+                await this.$nextTick();
+                this.paramPosIgnore = false;
             }
-        }, 500);
+        }, 500, {'maxWait':5000});
+
+        this.scrollingSetRecentBook = _.debounce((newValue) => {
+            this.debouncedSetRecentBook(newValue);
+        }, 15000, {'maxWait':20000});
 
         document.addEventListener('fullscreenchange', () => {
             this.fullScreenActive = (document.fullscreenElement !== null);
@@ -327,7 +337,6 @@ class Reader extends Vue {
         (async() => {
             await bookManager.init(this.settings);
             bookManager.addEventListener(this.bookManagerEvent);
-            await this.$refs.serverStorage.init();
             
             if (this.$root.rootRoute == '/reader') {
                 if (this.routeParamUrl) {
@@ -337,12 +346,15 @@ class Reader extends Vue {
                 }
             }
 
+            await this.$refs.serverStorage.init();
             this.checkSetStorageAccessKey();
             this.checkActivateDonateHelpPage();
             this.loading = false;
 
             await this.showWhatsNew();
             await this.showMigration();
+
+            this.updateRoute();
         })();
     }
 
@@ -507,10 +519,9 @@ class Reader extends Vue {
         if (event.bookPosSeen !== undefined)
             this.bookPosSeen = event.bookPosSeen;
         this.bookPos = event.bookPos;
-        this.debouncedUpdateRoute();
     }
 
-    async bookManagerEvent(eventName) {
+    async bookManagerEvent(eventName, value) {
         if (eventName == 'set-recent' || eventName == 'recent-deleted') {
             const oldBook = (this.textPage ? this.textPage.lastBook : null);
             const oldPos = (this.textPage ? this.textPage.bookPos : null);
@@ -539,6 +550,12 @@ class Reader extends Vue {
             if (this.recentBooksActive) {
                 await this.$refs.recentBooksPage.updateTableData();
             }
+
+            //сохранение в serverStorage
+            if (value) {
+                await utils.sleep(500);
+                await this.$refs.serverStorage.saveRecent(value);
+            }
         }
     }
 
@@ -648,6 +665,10 @@ class Reader extends Vue {
                 page.stopTextScrolling();
             }
         }
+
+        if (!this.scrollingActive) {
+            this.scrollingSetRecentBook.flush();
+        }
     }
 
     stopSearch() {

client/components/Reader/ServerStorage/ServerStorage.vue

@@ -49,10 +49,6 @@ class ServerStorage extends Vue {
             this.saveSettings();
         }, 500);
 
-        this.debouncedSaveRecent = _.debounce((itemKey) => {
-            this.saveRecent(itemKey);
-        }, 1000);
-
         this.debouncedNotifySuccess = _.debounce(() => {
             this.success('Данные синхронизированы с сервером');
         }, 1000);
@@ -81,8 +77,6 @@ class ServerStorage extends Vue {
             } else {
                 await this.serverStorageKeyChanged();
             }
-
-            bookManager.addEventListener(this.bookManagerEvent);
         } finally {
             this.inited = true;
         }
@@ -103,17 +97,6 @@ class ServerStorage extends Vue {
         this.cachedRecentMod = value;
     }
 
-    async bookManagerEvent(eventName, itemKey) {
-        if (!this.serverSyncEnabled)
-            return;
-
-        if (eventName == 'recent-changed') {            
-            if (itemKey) {
-                this.debouncedSaveRecent(itemKey);
-            }
-        }
-    }
-
     async generateNewServerStorageKey() {
         const key = utils.toBase58(utils.randomArray(32));
         this.commit('reader/setServerStorageKey', key);
@@ -422,6 +405,11 @@ class ServerStorage extends Vue {
                 if (md.key && result[md.key])
                     result[md.key] = utils.applyObjDiff(result[md.key], md.mod);
 
+                if (!bookManager.loaded) {
+                    this.warning('Ожидание загрузки списка книг перед синхронизацией');
+                    while (!bookManager.loaded) await utils.sleep(100);
+                }
+
                 if (newRecent.rev != this.cachedRecent.rev)
                     await this.setCachedRecent(newRecent);
                 if (newRecentPatch.rev != this.cachedRecentPatch.rev)
@@ -429,11 +417,6 @@ class ServerStorage extends Vue {
                 if (newRecentMod.rev != this.cachedRecentMod.rev)
                     await this.setCachedRecentMod(newRecentMod);
 
-                if (!bookManager.loaded) {
-                    this.warning('Ожидание загрузки списка книг перед синхронизацией');
-                    while (!bookManager.loaded) await utils.sleep(100);
-                }
-
                 await bookManager.setRecent(result);
             } else {
                 this.warning(`Неверный ответ сервера: ${recent.state}`);
@@ -449,67 +432,74 @@ class ServerStorage extends Vue {
     }
 
     async saveRecent(itemKey, recurse) {
+        while (!this.inited || this.savingRecent)
+            await utils.sleep(100);
+
         if (!this.keyInited || !this.serverSyncEnabled || this.savingRecent)
             return;
 
-        const bm = bookManager;
+        this.savingRecent = true;
+        try {        
+            const bm = bookManager;
 
-        let needSaveRecent = false;
-        let needSaveRecentPatch = false;
-        let needSaveRecentMod = false;
+            let needSaveRecent = false;
+            let needSaveRecentPatch = false;
+            let needSaveRecentMod = false;
 
-        //newRecentMod
-        let newRecentMod = {};
-        if (itemKey && this.cachedRecentPatch.data[itemKey] && this.prevItemKey == itemKey) {
-            newRecentMod = _.cloneDeep(this.cachedRecentMod);
-            newRecentMod.rev++;
+            //newRecentMod
+            let newRecentMod = {};
+            if (itemKey && this.cachedRecentPatch.data[itemKey] && this.prevItemKey == itemKey) {
+                newRecentMod = _.cloneDeep(this.cachedRecentMod);
+                newRecentMod.rev++;
 
-            newRecentMod.data.key = itemKey;
-            newRecentMod.data.mod = utils.getObjDiff(this.cachedRecentPatch.data[itemKey], bm.recent[itemKey]);
-            needSaveRecentMod = true;
-        }
-        this.prevItemKey = itemKey;
+                newRecentMod.data.key = itemKey;
+                newRecentMod.data.mod = utils.getObjDiff(this.cachedRecentPatch.data[itemKey], bm.recent[itemKey]);
+                needSaveRecentMod = true;
+            }
+            this.prevItemKey = itemKey;
 
-        //newRecentPatch
-        let newRecentPatch = {};
-        if (itemKey && !needSaveRecentMod) {
-            newRecentPatch = _.cloneDeep(this.cachedRecentPatch);
-            newRecentPatch.rev++;
-            newRecentPatch.data[itemKey] = bm.recent[itemKey];
+            //newRecentPatch
+            let newRecentPatch = {};
+            if (itemKey && !needSaveRecentMod) {
+                newRecentPatch = _.cloneDeep(this.cachedRecentPatch);
+                newRecentPatch.rev++;
+                newRecentPatch.data[itemKey] = bm.recent[itemKey];
 
-            let applyMod = this.cachedRecentMod.data;
-            if (applyMod && applyMod.key && newRecentPatch.data[applyMod.key])
-                newRecentPatch.data[applyMod.key] = utils.applyObjDiff(newRecentPatch.data[applyMod.key], applyMod.mod);
+                let applyMod = this.cachedRecentMod.data;
+                if (applyMod && applyMod.key && newRecentPatch.data[applyMod.key])
+                    newRecentPatch.data[applyMod.key] = utils.applyObjDiff(newRecentPatch.data[applyMod.key], applyMod.mod);
 
-            newRecentMod = {rev: this.cachedRecentMod.rev + 1, data: {}};
-            needSaveRecentPatch = true;
-            needSaveRecentMod = true;
-        }
+                newRecentMod = {rev: this.cachedRecentMod.rev + 1, data: {}};
+                needSaveRecentPatch = true;
+                needSaveRecentMod = true;
+            }
 
-        //newRecent
-        let newRecent = {};
-        if (!itemKey || (needSaveRecentPatch && Object.keys(newRecentPatch.data).length > 10)) {
-            newRecent = {rev: this.cachedRecent.rev + 1, data: bm.recent};
-            newRecentPatch = {rev: this.cachedRecentPatch.rev + 1, data: {}};
-            newRecentMod = {rev: this.cachedRecentMod.rev + 1, data: {}};
-            needSaveRecent = true;
-            needSaveRecentPatch = true;
-            needSaveRecentMod = true;
-        }
+            //newRecent
+            let newRecent = {};
+            if (!itemKey || (needSaveRecentPatch && Object.keys(newRecentPatch.data).length > 10)) {
+                //ждем весь bm.recent
+                while (!bookManager.loaded)
+                    await utils.sleep(100);
 
-        //query
-        let query = {};
-        if (needSaveRecent) {
-            query = {recent: newRecent, recentPatch: newRecentPatch, recentMod: newRecentMod};
-        } else if (needSaveRecentPatch) {
-            query = {recentPatch: newRecentPatch, recentMod: newRecentMod};
-        } else {
-            query = {recentMod: newRecentMod};
-        }
+                newRecent = {rev: this.cachedRecent.rev + 1, data: bm.recent};
+                newRecentPatch = {rev: this.cachedRecentPatch.rev + 1, data: {}};
+                newRecentMod = {rev: this.cachedRecentMod.rev + 1, data: {}};
+                needSaveRecent = true;
+                needSaveRecentPatch = true;
+                needSaveRecentMod = true;
+            }
 
-        //сохранение
-        this.savingRecent = true;        
-        try {
+            //query
+            let query = {};
+            if (needSaveRecent) {
+                query = {recent: newRecent, recentPatch: newRecentPatch, recentMod: newRecentMod};
+            } else if (needSaveRecentPatch) {
+                query = {recentPatch: newRecentPatch, recentMod: newRecentMod};
+            } else {
+                query = {recentMod: newRecentMod};
+            }
+
+            //сохранение
             let result = {state: ''};
 
             try {

client/components/Reader/versionHistory.js

@@ -1,7 +1,7 @@
 export const versionHistory = [
 {
-    showUntil: '2019-10-20',
-    header: '0.7.4 (2019-10-21)',
+    showUntil: '2019-10-21',
+    header: '0.7.5 (2019-10-22)',
     content:
 `
 <ul>

docs/omnireader/old/index.html

@@ -153,7 +153,7 @@
 			<p>- ðåãèñòðàöèÿ íå òðåáóåòñÿ
 
 		<br><br> êà÷åñòâå URL ìîæíî çàäàâàòü html-ñòðàíè÷êó ñ êíèãîé, ëèáî ïðÿìóþ ññûëêó íà ôàéë èç îíëàéí-áèáëèîòåêè (íàïðèìåð, ñêîïèðîâàâ àäðåñ ññûëêè èëè êíîïêè "ñêà÷àòü fb2").
-				Ïîääåðæèâàåìûå ôîðìàòû: <strong>html, txt, fb2, fb2.zip è äðóãèå</strong>
+				Ïîääåðæèâàåìûå ôîðìàòû: <b>fb2, html, txt, rtf, doc, docx, pdf, epub, mobi</b> è ñæàòèå: <b>zip, bz2, gz</b>
 
 		<br><br>Âû ìîæåòå äîáàâèòü â ñâîé áðàóçåð çàêëàäêó, óêàçàâ â åå ñâîéñòâàõ âìåñòî àäðåñà ñëåäóþùèé êîä:
 		<br><p><strong>javascript:location.href='http://old.omnireader.ru/?url='+location.href;</strong>

docs/omnireader/omnireader

@@ -15,17 +15,20 @@ server {
   gzip_types *;
 
   location /api {
-    proxy_pass http://localhost:44081;
-  }
-
-  location /tmp {
-    root /home/liberama/public;
-    add_header Content-Type text/xml;
-    add_header Content-Encoding gzip;
+    proxy_pass http://127.0.0.1:44081;
   }
 
   location / {
     root /home/liberama/public;
+
+    location /tmp {
+      add_header Content-Type text/xml;
+      add_header Content-Encoding gzip;
+    }
+
+    location ~* \.(?:manifest|appcache|html)$ {
+      expires -1;
+    }
   }
 }
 
@@ -41,7 +44,7 @@ server {
   gzip_types *;
 
   location /api {
-    proxy_pass http://localhost:44081;
+    proxy_pass http://127.0.0.1:44081;
   }
 
   location /tmp {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Liberama",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "engines": {
     "node": ">=10.0.0"
   },