Prechádzať zdrojové kódy

Исправлен баг "Не качает книги #1", fixed #1

Book Pauk 2 rokov pred
rodič
commit
42436fabd3
1 zmenil súbory, kde vykonal 6 pridanie a 2 odobranie
  1. 6 2
      server/core/InpxParser.js

+ 6 - 2
server/core/InpxParser.js

@@ -72,7 +72,7 @@ class InpxParser {
                 await readFileCallback({fileName: inpFile, current: ++current});
                 await readFileCallback({fileName: inpFile, current: ++current});
                 const buf = await zipReader.extractToBuf(inpFile);
                 const buf = await zipReader.extractToBuf(inpFile);
                 
                 
-                await this.parseInp(buf, structure, parsedCallback);
+                await this.parseInp(buf, structure, inpFile, parsedCallback);
             }
             }
 
 
             if (this.chunk.length) {
             if (this.chunk.length) {
@@ -84,9 +84,10 @@ class InpxParser {
         }
         }
     }
     }
 
 
-    async parseInp(inpBuf, structure, parsedCallback) {
+    async parseInp(inpBuf, structure, inpFile, parsedCallback) {
         const structLen = structure.length;
         const structLen = structure.length;
         const rows = inpBuf.toString().split('\n');
         const rows = inpBuf.toString().split('\n');
+        const defaultFolder = `${path.basename(inpFile, '.inp')}.zip`;
 
 
         for (const row of rows) {
         for (const row of rows) {
             let line = row;
             let line = row;
@@ -115,6 +116,9 @@ class InpxParser {
                 rec.genre = rec.genre.split(':').filter(s => s).join(',');
                 rec.genre = rec.genre.split(':').filter(s => s).join(',');
             }
             }
 
 
+            if (!rec.folder)
+                rec.folder = defaultFolder;
+
             rec.serno = parseInt(rec.serno, 10) || 0;
             rec.serno = parseInt(rec.serno, 10) || 0;
             rec.size = parseInt(rec.size, 10) || 0;
             rec.size = parseInt(rec.size, 10) || 0;
             rec.del = parseInt(rec.del, 10) || 0;
             rec.del = parseInt(rec.del, 10) || 0;