diff --git a/package-lock.json b/package-lock.json index 0b7db06..6b93df6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "inpx-web", - "version": "1.1.0", + "version": "1.1.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "inpx-web", - "version": "1.1.0", + "version": "1.1.1", "hasInstallScript": true, "license": "CC0-1.0", "dependencies": { diff --git a/package.json b/package.json index 0905092..c2c7d4b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "inpx-web", - "version": "1.1.0", + "version": "1.1.1", "author": "Book Pauk ", "license": "CC0-1.0", "repository": "bookpauk/inpx-web", diff --git a/server/core/RemoteLib.js b/server/core/RemoteLib.js index 5bd0238..122cdd9 100644 --- a/server/core/RemoteLib.js +++ b/server/core/RemoteLib.js @@ -65,7 +65,7 @@ class RemoteLib { 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); diff --git a/server/core/WebWorker.js b/server/core/WebWorker.js index 03c3a04..05ee501 100644 --- a/server/core/WebWorker.js +++ b/server/core/WebWorker.js @@ -370,12 +370,14 @@ class WebWorker { const bookFileDesc = `${bookFile}.json`; if (!await fs.pathExists(bookFile) || !await fs.pathExists(bookFileDesc)) { - await fs.ensureDir(path.dirname(bookFile)); - - const tmpFile = `${this.config.tempDir}/${utils.randomHexString(30)}`; - await utils.gzipFile(extractedFile, tmpFile, 4); - await fs.remove(extractedFile); - await fs.move(tmpFile, bookFile, {overwrite: true}); + if (!await fs.pathExists(bookFile) && extractedFile) { + const tmpFile = `${this.config.tempDir}/${utils.randomHexString(30)}`; + await utils.gzipFile(extractedFile, tmpFile, 4); + await fs.remove(extractedFile); + await fs.move(tmpFile, bookFile, {overwrite: true}); + } else { + await utils.touchFile(bookFile); + } await fs.writeFile(bookFileDesc, JSON.stringify({bookPath, downFileName})); } else { @@ -411,9 +413,10 @@ class WebWorker { const rows = await db.select({table: 'file_hash', where: `@@id(${db.esc(bookPath)})`}); if (rows.length) {//хеш найден по bookPath 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}`; } } diff --git a/server/core/utils.js b/server/core/utils.js index 9adbe00..747b524 100644 --- a/server/core/utils.js +++ b/server/core/utils.js @@ -105,7 +105,10 @@ function gzipFile(inputFile, outputFile, level = 1) { const input = fs.createReadStream(inputFile); const output = fs.createWriteStream(outputFile); - input.pipe(gzip).pipe(output).on('finish', (err) => { + input.on('error', reject) + .pipe(gzip).on('error', reject) + .pipe(output).on('error', reject) + .on('finish', (err) => { if (err) reject(err); else resolve(); });