Added the support of a string and a buffer as value in the 'addSubTre…

…e' method
OpenMarshal · Sep 4, 2017 · 3380374 · 3380374
1 parent 0f2c1d9
commit 3380374
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 10 deletions.
diff --git a/lib/manager/v2/fileSystem/CommonTypes.d.ts b/lib/manager/v2/fileSystem/CommonTypes.d.ts
@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { XMLElement } from 'xml-js-builder';
 export declare type SimpleCallback = (error?: Error) => void;
 export declare type ReturnCallback<T> = (error?: Error, data?: T) => void;
@@ -17,5 +18,5 @@ export declare class ResourceType {
 }
 export declare type OpenWriteStreamMode = 'mustCreate' | 'canCreate' | 'mustExist' | 'canCreateIntermediates' | 'mustCreateIntermediates';
 export interface SubTree {
-    [name: string]: ResourceType | SubTree;
+    [name: string]: ResourceType | SubTree | string | Buffer;
 }
diff --git a/lib/manager/v2/fileSystem/FileSystem.d.ts b/lib/manager/v2/fileSystem/FileSystem.d.ts
@@ -486,7 +486,7 @@ export declare abstract class FileSystem implements ISerializableFileSystem {
      * @param resourceType Type of the resource to add.
      * @param callback Returns an error if one occured.
      */
-    addSubTree(ctx: RequestContext, resourceType: ResourceType, callback: SimpleCallback): any;
+    addSubTree(ctx: RequestContext, resourceType: ResourceType | string | Buffer, callback: SimpleCallback): any;
     /**
      * Add a sub-tree to the file system.
      *
@@ -506,7 +506,7 @@ export declare abstract class FileSystem implements ISerializableFileSystem {
      * @param resourceType Type of the resource to add.
      * @param callback Returns an error if one occured.
      */
-    addSubTree(ctx: RequestContext, rootPath: Path | string, resourceType: ResourceType, callback: SimpleCallback): any;
+    addSubTree(ctx: RequestContext, rootPath: Path | string, resourceType: ResourceType | string | Buffer, callback: SimpleCallback): any;
     /**
      * Search for locks in the parents, starting at the 'startPath' path.
      *

diff --git a/lib/manager/v2/fileSystem/FileSystem.js b/lib/manager/v2/fileSystem/FileSystem.js
@@ -942,12 +942,26 @@ var FileSystem = (function () {
         if (tree.constructor === CommonTypes_1.ResourceType) {
             this.create(ctx, rootPath, tree, callback);
         }
+        else if (tree.constructor === String || tree.constructor === Buffer) {
+            var data_1 = tree;
+            this.openWriteStream(ctx, rootPath, 'mustCreate', true, data_1.length, function (e, w, created) {
+                if (e)
+                    return callback(e);
+                w.end(data_1);
+                w.on('error', function (e) {
+                    callback(e);
+                });
+                w.on('finish', function () {
+                    callback();
+                });
+            });
+        }
         else {
             new Workflow_1.Workflow()
                 .each(Object.keys(tree), function (name, cb) {
                 var value = tree[name];
                 var childPath = rootPath.getChildPath(name);
-                if (value.constructor === CommonTypes_1.ResourceType)
+                if (value.constructor === CommonTypes_1.ResourceType || value.constructor === String || value.constructor === Buffer)
                     _this.addSubTree(ctx, childPath, value, cb);
                 else
                     _this.addSubTree(ctx, childPath, CommonTypes_1.ResourceType.Directory, function (e) {

diff --git a/src/manager/v2/fileSystem/CommonTypes.ts b/src/manager/v2/fileSystem/CommonTypes.ts
@@ -39,5 +39,5 @@ export type OpenWriteStreamMode = 'mustCreate' | 'canCreate' | 'mustExist' | 'ca
 
 export interface SubTree
 {
-    [name : string] : ResourceType | SubTree
+    [name : string] : ResourceType | SubTree | string | Buffer
 }
diff --git a/src/manager/v2/fileSystem/FileSystem.ts b/src/manager/v2/fileSystem/FileSystem.ts
@@ -1430,7 +1430,7 @@ export abstract class FileSystem implements ISerializableFileSystem
      * @param resourceType Type of the resource to add.
      * @param callback Returns an error if one occured.
      */
-    addSubTree(ctx : RequestContext, resourceType : ResourceType, callback : SimpleCallback)
+    addSubTree(ctx : RequestContext, resourceType : ResourceType | string | Buffer, callback : SimpleCallback)
     /**
      * Add a sub-tree to the file system.
      * 
@@ -1450,8 +1450,8 @@ export abstract class FileSystem implements ISerializableFileSystem
      * @param resourceType Type of the resource to add.
      * @param callback Returns an error if one occured.
      */
-    addSubTree(ctx : RequestContext, rootPath : Path | string, resourceType : ResourceType, callback : SimpleCallback)
-    addSubTree(ctx : RequestContext, _rootPath : Path | string | SubTree | ResourceType | SimpleCallback, _tree : SubTree | ResourceType | SimpleCallback, _callback ?: SimpleCallback)
+    addSubTree(ctx : RequestContext, rootPath : Path | string, resourceType : ResourceType | string | Buffer, callback : SimpleCallback)
+    addSubTree(ctx : RequestContext, _rootPath : Path | string | SubTree | ResourceType | SimpleCallback | string | Buffer, _tree : SubTree | ResourceType | SimpleCallback | string | Buffer, _callback ?: SimpleCallback)
     {
         const tree = _callback ? _tree as SubTree | ResourceType : _rootPath as SubTree | ResourceType;
         const rootPath = _callback ? new Path(_rootPath as Path | string) : new Path('/');
@@ -1462,14 +1462,30 @@ export abstract class FileSystem implements ISerializableFileSystem
         {
             this.create(ctx, rootPath, tree as ResourceType, callback);
         }
+        else if(tree.constructor === String || tree.constructor === Buffer)
+        {
+            const data : String | Buffer = tree as any;
+            this.openWriteStream(ctx, rootPath, 'mustCreate', true, data.length, (e, w, created) => {
+                if(e)
+                    return callback(e);
+
+                w.end(data);
+                w.on('error', (e) => {
+                    callback(e);
+                })
+                w.on('finish', () => {
+                    callback();
+                })
+            })
+        }
         else
         {
             new Workflow()
                 .each(Object.keys(tree), (name, cb) => {
                     const value = tree[name];
                     const childPath = rootPath.getChildPath(name);
-                    if(value.constructor === ResourceType)
-                        this.addSubTree(ctx, childPath, value as ResourceType, cb)
+                    if(value.constructor === ResourceType || value.constructor === String || value.constructor === Buffer)
+                        this.addSubTree(ctx, childPath, value, cb)
                     else
                         this.addSubTree(ctx, childPath, ResourceType.Directory, (e) => {
                             if(e)