deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Book Pauk
2022-07-10 17:31:21 +07:00
parent c878ce432f
commit 5edeed0747
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/components/Reader/Reader.vue
View File

@@ -1091,7 +1091,7 @@ class Reader {
progress.setState({state: 'parse'}); progress.setState({state: 'parse'});
// есть ли среди недавних // есть ли среди недавних
let wasOpened = bookManager.findRecentByUrl(url); let wasOpened = bookManager.findRecentByUrlAndPath(url, opts.path);
wasOpened = (wasOpened ? wasOpened : {}); wasOpened = (wasOpened ? wasOpened : {});
const bookPos = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos); const bookPos = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos);
const bookPosSeen = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPosSeen); const bookPosSeen = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPosSeen);

11
client/components/Reader/RecentBooksPage/RecentBooksPage.vue
View File

@@ -29,7 +29,8 @@
<span v-html="props.cols[1].label"></span> <span v-html="props.cols[1].label"></span>
</q-th> </q-th>
<q-th key="desc" class="td-mp" style="width: 300px" :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" <q-input
ref="input" v-model="search"
outlined dense rounded style="position: absolute; top: 6px; left: 90px; width: 350px" bg-color="white" outlined dense rounded style="position: absolute; top: 6px; left: 90px; width: 350px" bg-color="white"
placeholder="Найти" placeholder="Найти"
@click.stop @click.stop
@@ -51,14 +52,14 @@
</div> </div>
</q-td> </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"> <div class="break-word" style="width: 68px">
{{ props.row.touchDate }}<br> {{ props.row.touchDate }}<br>
{{ props.row.touchTime }} {{ props.row.touchTime }}
</div> </div>
</q-td> </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 class="break-word" style="width: 300px; font-size: 90%">
<div style="color: green"> <div style="color: green">
{{ props.row.desc.author }} {{ props.row.desc.author }}
@@ -311,8 +312,8 @@ class RecentBooksPage {
this.close(); this.close();
} }
loadBook(url) { loadBook(row) {
this.$emit('load-book', {url}); this.$emit('load-book', {url: row.url, path: row.path});
this.close(); this.close();
} }

4
client/components/Reader/share/bookManager.js
View File

@@ -485,13 +485,13 @@ class BookManager {
return result; return result;
} }
findRecentByUrl(url) { findRecentByUrlAndPath(url, bookPath) {
let max = 0; let max = 0;
let result = null; let result = null;
for (const key in this.recent) { for (const key in this.recent) {
const book = this.recent[key]; 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; max = book.addTime;
result = book; result = book;
} }