Изменение механизма хранения книг

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});
                 });
 

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();
     }
 

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;
             }