improvements

shakty · shakty · commit 307061ba3f73 · 2021-08-06T17:41:41.000+02:00
diff --git a/lib/formats/csv.js b/lib/formats/csv.js
@@ -3,7 +3,7 @@ const os = require('os');
 const path = require('path');
 
 const J = require('JSUS').JSUS;
-const { addWD, addIfNotThere } = require('../util.js');
+const { addWD, addIfNotThere, findLineBreak } = require('../util.js');
 
 module.exports = function(opts = {}) {
 
diff --git a/lib/loadDir.js b/lib/loadDir.js
@@ -3,6 +3,7 @@
     'use strict';
 
     const fs = require('fs');
+    const path = require('path');
 
     const NDDB = require('NDDB');
 
@@ -11,27 +12,44 @@
     /**
     * ### NDDB.loadDirSync
     *
-    * Load all files matching the criteria into db synchronously
+    * Synchronously load all files matching the criteria from a folder
     *
     * @param {string} dir The directory to search recursively
+    * @param {object} opts The options to search and load files
+    *
+    * @returns {NDDB} The NDDB instance for chaining
     *
     * @see NDDB.loadSync
     */
     NDDB.prototype.loadDirSync = function(dir, opts) {
 
         decorateLoadDirOpts(opts);
 
-        getFilesSync(dir, opts).forEach(file => this.loadSync(file, opts));
-
+        getFilesSync(dir, opts).forEach(file => {
+            try {
+                this.loadSync(file, opts);
+            }
+            catch(e) {
+                console.log(`\n (!) NDDB.loadDirSync: An error occurred ` +
+                            `in file: ${file}\n`);
+                throw e;
+            }
+        });
         return this;
     };
 
     /**
-    * ### NDDB.loadDir
+    * ### NDDB.loadDirSync
     *
-    * Load in the specified format and loads them into db synchronously
+    * Asynchronously load all files matching the criteria from a folder
     *
-    * @see NDDB.loadSync
+    * @param {string} dir The directory to search recursively
+    * @param {object} opts The options to search and load files
+    * @param {function} cb A callback executed when all files are loaded
+    *
+    * @returns {NDDB} The NDDB instance for chaining
+    *
+    * @see NDDB.load
     */
     NDDB.prototype.loadDir = function(dir, opts, cb) {
 
@@ -41,10 +59,20 @@
         let files = getFilesSync(dir, opts);
         let filesLeft = files.length;
 
-        files.forEach(file => this.load(file, (err) => {
-            if (err) this.throwErr('Error', 'load', err);
-            if (--filesLeft <= 0 && cb) cb(this);
-        )});
+        files.forEach(file => {
+            try {
+                this.load(file, (err) => {
+                    if (err) this.throwErr('Error', 'load', err);
+                    if (--filesLeft <= 0 && cb) cb(this);
+                });
+            }
+            catch(e) {
+                console.log(`\n (!) NDDB.loadDir: An error occurred in file: ` +
+                            `${file}\n`);
+                console.log(e.message);
+                throw e;
+            }
+        });
 
         return this;
     };
