浏览代码

Merge branch 'develop' into feature/lss

Book Pauk 5 年之前
父节点
当前提交
8a9e7ab4c3
共有 4 个文件被更改,包括 15 次插入2 次删除
  1. 11 0
      client/components/Reader/versionHistory.js
  2. 1 1
      package.json
  3. 1 1
      server/core/FileDecompressor.js
  4. 2 0
      server/core/ZipStreamer.js

+ 11 - 0
client/components/Reader/versionHistory.js

@@ -1,4 +1,15 @@
 export const versionHistory = [
 export const versionHistory = [
+{
+    showUntil: '2019-10-29',
+    header: '0.7.6 (2019-10-30)',
+    content:
+`
+<ul>
+    <li>исправления багов</li>
+</ul>
+`
+},
+
 {
 {
     showUntil: '2019-10-21',
     showUntil: '2019-10-21',
     header: '0.7.5 (2019-10-22)',
     header: '0.7.5 (2019-10-22)',

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "Liberama",
   "name": "Liberama",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "engines": {
   "engines": {
     "node": ">=10.0.0"
     "node": ">=10.0.0"
   },
   },

+ 1 - 1
server/core/FileDecompressor.js

@@ -112,7 +112,7 @@ class FileDecompressor {
 
 
     async unZip(filename, outputDir) {
     async unZip(filename, outputDir) {
         const zip = new ZipStreamer();
         const zip = new ZipStreamer();
-        return await await zip.unpack(filename, outputDir);
+        return await zip.unpack(filename, outputDir);
     }
     }
 
 
     unBz2(filename, outputDir) {
     unBz2(filename, outputDir) {

+ 2 - 0
server/core/ZipStreamer.js

@@ -57,6 +57,8 @@ class ZipStreamer {
             entryCallback = (entryCallback ? entryCallback : () => {});
             entryCallback = (entryCallback ? entryCallback : () => {});
             const unzip = new unzipStream({file: zipFile});
             const unzip = new unzipStream({file: zipFile});
 
 
+            unzip.on('error', reject);
+
             let files = [];
             let files = [];
             unzip.on('extract', (en) => {
             unzip.on('extract', (en) => {
                 const entry = {path: en.name, size: en.size, compressedSize: en.compressedSize};
                 const entry = {path: en.name, size: en.size, compressedSize: en.compressedSize};