random filename generator issue fixes

ostrojs · Nov 16, 2021 · 6d38fc5 · 6d38fc5
1 parent df91056
commit 6d38fc5
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 28 deletions.
diff --git a/adapter/local.js b/adapter/local.js
@@ -1,6 +1,7 @@
 const fs = require('fs-extra')
 const CoreAdapter = require('./CoreAdapter')
 const path = require('path')
+const { v4 } = require("uuid");
 const kHandler = Symbol('handler')
 
 class Local extends CoreAdapter {
@@ -74,26 +75,37 @@ class Local extends CoreAdapter {
 
         let callback = Array.from(rest).find(arg => typeof arg == 'function')
         let location = this.applyPathPrefix($path);
-        this.ensureDirectory(this.dirname(location), () => {
-            fs.writeFile(location, $contents, (error, data) => {
-                if (typeof this[kHandler].write == 'function') {
-                    this[kHandler].write({
-                        basePath: location,
-                        path: $path,
-                        options,
-                        callback,
-                        error,
-                        content: $contents
-                    })
-                } else {
-                    callback(error, {
-                        'type': 'file',
-                        'path': location,
-                        'message': 'File created successfully'
-                    }, location)
-                }
-            })
-        });
+        fs.stat(location).then(res=>{
+            if(res.isDirectory()){
+               return path.join(location,v4())
+            }
+            return location
+        })
+        .catch(e=>location)
+        .then(location=>{
+            this.ensureDirectory(this.dirname(location), () => {
+                fs.writeFile(location, $contents, (error, data) => {
+                    if (typeof this[kHandler].write == 'function') {
+                        this[kHandler].write({
+                            basePath: location,
+                            path: $path,
+                            options,
+                            callback,
+                            error,
+                            content: $contents
+                        })
+                    } else {
+                        callback(error, {
+                            'type': 'file',
+                            'path': location,
+                            'message': 'File created successfully'
+                        }, location)
+                    }
+                })
+            });
+        })
+
+
 
     }
 

diff --git a/filesystemAdapter.js b/filesystemAdapter.js
@@ -1,5 +1,4 @@
 const path = require('path')
-const { v4 } = require("uuid");
 const FileNotFoundException = require('./FileNotFoundException')
 const FileDeleteException = require('./fileDeleteException')
 const FileUploadException = require('./fileUploadException')
@@ -69,11 +68,7 @@ class FilesystemAdapter {
     }
 
     put($path, content, options = {}) {
-        if (!options.filename) {
-            options.filename = v4()
-        }
-
-        $path = path.join($path, options.filename)
+
         return new Promise((resolve, reject) => {
             this[kAdapter].write($path, content, options, (err, data, basePath) => {
                 if (err) {
@@ -91,7 +86,7 @@ class FilesystemAdapter {
     }
 
     putFileAs($path, $file, $name, $options = {}) {
-        $options.filename = $name
+        $path = path.join($path,$name)
         return this.put($path, $file.getBufferData(), $options);
     }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ostro/filesystem",
-  "version": "0.0.0-alpha.0",
+  "version": "0.0.0-alpha.1",
   "description": "filesystem module for OstroJS",
   "main": "filesystemManager.js",
   "scripts": {