Merge pull request #845 from veliovgroup/dev

📦 v2.2.1

-  👨‍💻 Fix #842, a newly detected bug by @chrschae; Fixing case when `namingFunction` returns new nested path cause exception in `.write()` and `.load()` methods

.versions

@@ -21,7 +21,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-local-test:ostrio:[email protected].0
+local-test:ostrio:[email protected].1
 [email protected]
 [email protected]
 [email protected]
@@ -35,7 +35,7 @@ [email protected]
 [email protected]
 [email protected]
 ostrio:[email protected]
-ostrio:[email protected].0
+ostrio:[email protected].1
 [email protected]
 [email protected]
 [email protected]

package.js

@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ostrio:files',
-  version: '2.2.0',
+  version: '2.2.1',
   summary: 'Upload files to a server or 3rd party storage: AWS:S3, GridFS, DropBox, and other',
   git: 'https://github.com/veliovgroup/Meteor-Files',
   documentation: 'README.md'

server.js

@@ -1254,9 +1254,12 @@ class FilesCollection extends FilesCollectionCore {
 
     result._id = fileId;
 
-    fs.stat(opts.path, (statErr, stats) => {
+    fs.stat(opts.path, (statError, stats) => {
       bound(() => {
-        if (statErr || !stats.isFile()) {
+        if (statError || !stats.isFile()) {
+          const paths = opts.path.split('/');
+          paths.pop();
+          fs.mkdirSync(paths.join('/'), { recursive: true });
           fs.writeFileSync(opts.path, '');
         }
 
@@ -1364,9 +1367,12 @@ class FilesCollection extends FilesCollectionCore {
       });
     };
 
-    fs.stat(opts.path, (statErr, stats) => {
+    fs.stat(opts.path, (statError, stats) => {
       bound(() => {
-        if (statErr || !stats.isFile()) {
+        if (statError || !stats.isFile()) {
+          const paths = opts.path.split('/');
+          paths.pop();
+          fs.mkdirSync(paths.join('/'), { recursive: true });
           fs.writeFileSync(opts.path, '');
         }
 
@@ -1394,10 +1400,10 @@ class FilesCollection extends FilesCollectionCore {
               });
 
               if (!result.size) {
-                fs.stat(opts.path, (statError, newStats) => {
+                fs.stat(opts.path, (statErrorOnEnd, newStats) => {
                   bound(() => {
-                    if (statError) {
-                      callback && callback(statError);
+                    if (statErrorOnEnd) {
+                      callback && callback(statErrorOnEnd);
                     } else {
                       result.versions.original.size = (result.size = newStats.size);
                       storeResult(result, callback);

write-stream.js

@@ -47,6 +47,7 @@ export default class WriteStream {
             fs.mkdirSync(paths.join('/'), { recursive: true });
             fs.writeFileSync(this.path, '');
           }
+
           fs.open(this.path, 'r+', this.permissions, (oError, fd) => {
             bound(() => {
               if (oError) {