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

Исправления багов скачивания файла в режиме RemoteLib

Browse Source
This commit is contained in:
Book Pauk
2022-11-01 01:53:39 +07:00
parent b56eeaa024
commit 037d1aa022
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/RemoteLib.js
View File

@@ -65,7 +65,7 @@ class RemoteLib {
const buf = await this.down.load(`${this.remoteHost}${link}`, {decompress: false}); const buf = await this.down.load(`${this.remoteHost}${link}`, {decompress: false});
const publicPath = `${this.config.publicDir}${link}`; const publicPath = `${this.config.publicFilesDir}${link}`;
await fs.writeFile(publicPath, buf); await fs.writeFile(publicPath, buf);

19
server/core/WebWorker.js
View File

@@ -370,12 +370,14 @@ class WebWorker {
const bookFileDesc = `${bookFile}.json`; const bookFileDesc = `${bookFile}.json`;
if (!await fs.pathExists(bookFile) || !await fs.pathExists(bookFileDesc)) { if (!await fs.pathExists(bookFile) || !await fs.pathExists(bookFileDesc)) {
await fs.ensureDir(path.dirname(bookFile)); if (!await fs.pathExists(bookFile) && extractedFile) {
const tmpFile = `${this.config.tempDir}/${utils.randomHexString(30)}`;
const tmpFile = `${this.config.tempDir}/${utils.randomHexString(30)}`; await utils.gzipFile(extractedFile, tmpFile, 4);
await utils.gzipFile(extractedFile, tmpFile, 4); await fs.remove(extractedFile);
await fs.remove(extractedFile); await fs.move(tmpFile, bookFile, {overwrite: true});
await fs.move(tmpFile, bookFile, {overwrite: true}); } else {
await utils.touchFile(bookFile);
}
await fs.writeFile(bookFileDesc, JSON.stringify({bookPath, downFileName})); await fs.writeFile(bookFileDesc, JSON.stringify({bookPath, downFileName}));
} else { } else {
@@ -411,9 +413,10 @@ class WebWorker {
const rows = await db.select({table: 'file_hash', where: `@@id(${db.esc(bookPath)})`}); const rows = await db.select({table: 'file_hash', where: `@@id(${db.esc(bookPath)})`});
if (rows.length) {//хеш найден по bookPath if (rows.length) {//хеш найден по bookPath
const hash = rows[0].hash; const hash = rows[0].hash;
const bookFileDesc = `${this.config.filesDir}/${hash}.json`; const bookFile = `${this.config.filesDir}/${hash}`;
const bookFileDesc = `${bookFile}.json`;
if (await fs.pathExists(bookFileDesc)) { if (await fs.pathExists(bookFile) && await fs.pathExists(bookFileDesc)) {
link = `${this.config.filesPathStatic}/${hash}`; link = `${this.config.filesPathStatic}/${hash}`;
} }
} }