Handle error when calling generateFileName

Author: js3692

lib/stores/DataStore.js

@@ -58,15 +58,7 @@ class DataStore {
             }
 
             const file_id = this.generateFileName(req);
-
-            let file;
-            try {
-                file = new File(file_id, upload_length, upload_defer_length, upload_metadata);
-            }
-            catch (instantiationError) {
-                console.error(instantiationError);
-                return reject(500);
-            }
+            const file = new File(file_id, upload_length, upload_defer_length, upload_metadata);
 
             return resolve(file);
         });

lib/stores/FileStore.js

@@ -51,21 +51,22 @@ class FileStore extends DataStore {
             const upload_length = req.headers['upload-length'];
             const upload_defer_length = req.headers['upload-defer-length'];
             const upload_metadata = req.headers['upload-metadata'];
-
+            console.log(upload_length, upload_defer_length, 'haah')
             if (upload_length === undefined && upload_defer_length === undefined) {
                 return reject(412);
             }
 
-            const file_id = this.generateFileName(req);
-            let file;
+            let file_id;
             try {
-                file = new File(file_id, upload_length, upload_defer_length, upload_metadata);
+                file_id = this.generateFileName(req);
             }
-            catch (instantiationError) {
-                console.error(instantiationError);
+            catch (generateError) {
+                console.warn('[FileStore] create: check your namingFunction. Error', generateError);
                 return reject(500);
             }
 
+            const file = new File(file_id, upload_length, upload_defer_length, upload_metadata);
+
             return fs.open(`${this.directory}/${file.id}`, 'w', (err, fd) => {
                 if (err) {
                     console.warn('[FileStore] create: Error', err);