Merge 8177908 into 7efeb76

enb · Dec 3, 2016 · 7b2e9ce · 7b2e9ce
2 parents 7efeb76 + 8177908
commit 7b2e9ce
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/techs/levels.js b/techs/levels.js
@@ -2,6 +2,7 @@
 
 const path = require('path');
 const fs = require('fs');
+const stream = require('stream');
 
 const vow = require('vow');
 const enb = require('enb');
@@ -174,34 +175,35 @@ module.exports = buildFlow.create()
         _forceScanLevel: function (levelpath) {
             return new vow.Promise((resolve, reject) => {
                 const data = {};
-                const promises = [];
 
                 walk([levelpath])
-                    .on('data', function (file) {
-                        const id = stringifyEntity(file.entity);
-
-                        promises.push(new Promise((resolve, reject) => {
-                            fs.stat(file.path, (err, stats) => {
-                                if (err) {
-                                    return reject(err);
-                                }
+                    .on('error', reject)
+                    .pipe(new stream.Writable({
+                        objectMode: true,
+                        write: function (file, encoding, callback) {
+                            tryCatch(() => {
+                                const id = stringifyEntity(file.entity);
+                                const stats = fs.statSync(file.path);
 
                                 file.isDirectory = stats.isDirectory();
                                 file.mtime = stats.mtime.getTime();
 
                                 (data[id] || (data[id] = [])).push(file);
 
-                                resolve();
-                            });
-                        }));
-                    })
+                                callback();
+                            }, callback);
+                        }
+                    }))
                     .on('error', reject)
-                    .on('end', () => {
-                        Promise.all(promises)
-                            .catch(reject)
-                            .then(() => resolve(data));
-                    });
+                    .on('finish', () => resolve(data));
             });
         }
     })
     .createTech();
+
+// try-catch optimization
+function tryCatch(tryFn, catchFn) {
+    try {
+        tryFn();
+    } catch (e) { catchFn(e); }
+}