deadcxap/inpx-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/1.2.2'

Browse Source
This commit is contained in:
Book Pauk
2022-11-12 17:24:41 +07:00
parent b4da07e924 c21b8ffa0e
commit a0e4651607
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,7 +204,7 @@
</div> </div>
<div class="row justify-center"> <div class="row justify-center">
<div class="q-mb-xl q-px-sm q-py-xs bg-cyan-2 clickable2" style="border: 1px solid #aaaaaa; border-radius: 6px; white-space: nowrap;" @click="openReleasePage"> <div class="q-mb-lg q-px-sm q-py-xs bg-cyan-2 clickable2" style="border: 1px solid #aaaaaa; border-radius: 6px; white-space: nowrap;" @click="openReleasePage">
{{ projectName }} {{ projectName }}
</div> </div>
</div> </div>

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "inpx-web", "name": "inpx-web",
"version": "1.2.1", "version": "1.2.2",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "inpx-web", "name": "inpx-web",
"version": "1.2.1", "version": "1.2.2",
"hasInstallScript": true, "hasInstallScript": true,
"license": "CC0-1.0", "license": "CC0-1.0",
"dependencies": { "dependencies": {

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "inpx-web", "name": "inpx-web",
"version": "1.2.1", "version": "1.2.2",
"author": "Book Pauk <bookpauk@gmail.com>", "author": "Book Pauk <bookpauk@gmail.com>",
"license": "CC0-1.0", "license": "CC0-1.0",
"repository": "bookpauk/inpx-web", "repository": "bookpauk/inpx-web",

4
server/core/RemoteLib.js
View File

@@ -58,9 +58,9 @@ class RemoteLib {
} }
} }
async downloadBook(bookPath, downFileName) { async downloadBook(bookId) {
try { try {
const response = await await this.wsRequest({action: 'get-book-link', bookPath, downFileName}); const response = await await this.wsRequest({action: 'get-book-link', bookId});
const link = response.link; const link = response.link;
const buf = await this.down.load(`${this.remoteHost}${link}`, {decompress: false}); const buf = await this.down.load(`${this.remoteHost}${link}`, {decompress: false});

6
server/core/WebWorker.js
View File

@@ -354,7 +354,7 @@ class WebWorker {
} }
} }
async restoreBook(bookPath, downFileName) { async restoreBook(bookId, bookPath, downFileName) {
const db = this.db; const db = this.db;
let extractedFile = ''; let extractedFile = '';
@@ -364,7 +364,7 @@ class WebWorker {
extractedFile = await this.extractBook(bookPath); extractedFile = await this.extractBook(bookPath);
hash = await utils.getFileHash(extractedFile, 'sha256', 'hex'); hash = await utils.getFileHash(extractedFile, 'sha256', 'hex');
} else { } else {
hash = await this.remoteLib.downloadBook(bookPath, downFileName); hash = await this.remoteLib.downloadBook(bookId);
} }
const link = `${this.config.filesPathStatic}/${hash}`; const link = `${this.config.filesPathStatic}/${hash}`;
@@ -443,7 +443,7 @@ class WebWorker {
} }
if (!link) { if (!link) {
link = await this.restoreBook(bookPath, downFileName) link = await this.restoreBook(bookId, bookPath, downFileName)
} }
if (!link) if (!link)