Implemented the 'Gateway' in the 'StandardResource' + Fixed the 'move…

…To(...)' which was calling the the 'rename(...)' method even when the oldName and newName were equal
OpenMarshal · Jun 19, 2017 · 05fd08c · 05fd08c
1 parent 083a5c0
commit 05fd08c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/lib/resource/std/StandardResource.d.ts b/lib/resource/std/StandardResource.d.ts
@@ -1,7 +1,8 @@
 /// <reference types="node" />
 import { IResource, ReturnCallback, SimpleCallback, Return2Callback, ResourceType, ResourcePropertyValue } from '../IResource';
 import { Readable, Writable } from 'stream';
-import { FSManager } from '../../manager/FSManager';
+import { FSManager, FSPath } from '../../manager/FSManager';
+import { MethodCallArgs } from '../../server/MethodCallArgs';
 import { LockKind } from '../lock/LockKind';
 import { LockBag } from '../lock/LockBag';
 import { Lock } from '../lock/Lock';
@@ -38,6 +39,7 @@ export declare abstract class StandardResource implements IResource {
     abstract addChild(resource: IResource, callback: SimpleCallback): any;
     abstract removeChild(resource: IResource, callback: SimpleCallback): any;
     abstract getChildren(callback: ReturnCallback<IResource[]>): any;
+    gateway?(arg: MethodCallArgs, path: FSPath, callback: (error: Error, resource?: IResource) => void): any;
     protected updateLastModified(): void;
     protected removeFromParent(callback: SimpleCallback): void;
     static standardRemoveFromParent(resource: IResource, callback: SimpleCallback): void;

diff --git a/lib/resource/std/StandardResource.js b/lib/resource/std/StandardResource.js
@@ -128,8 +128,15 @@ var StandardResource = (function () {
                     StandardResource.standardRemoveFromParent(resource, function (e) {
                         if (e) {
                             callback(e);
+                            return;
                         }
-                        else {
+                        resource.webName(function (e, name) {
+                            if (e || name === newName) {
+                                parent.addChild(resource, function (e) {
+                                    callback(e);
+                                });
+                                return;
+                            }
                             resource.rename(newName, function (e, oldName, newName) {
                                 if (e)
                                     callback(e);
@@ -138,7 +145,7 @@ var StandardResource = (function () {
                                         callback(e);
                                     });
                             });
-                        }
+                        });
                     });
                 });
             });

diff --git a/src/resource/std/StandardResource.ts b/src/resource/std/StandardResource.ts
@@ -1,6 +1,7 @@
 import { IResource, ReturnCallback, SimpleCallback, Return2Callback, ResourceType, ResourcePropertyValue } from '../IResource'
 import { Readable, Writable } from 'stream'
 import { FSManager, FSPath } from '../../manager/FSManager'
+import { MethodCallArgs } from '../../server/MethodCallArgs'
 import { LockScope } from '../lock/LockScope'
 import { Workflow } from '../../helper/Workflow'
 import { LockType } from '../lock/LockType'
@@ -131,6 +132,9 @@ export abstract class StandardResource implements IResource
     abstract addChild(resource : IResource, callback : SimpleCallback)
     abstract removeChild(resource : IResource, callback : SimpleCallback)
     abstract getChildren(callback : ReturnCallback<IResource[]>)
+
+    // ****************************** Gateway ****************************** //
+    gateway?(arg : MethodCallArgs, path : FSPath, callback : (error : Error, resource ?: IResource) => void);
 
     protected updateLastModified()
     {
@@ -193,9 +197,18 @@ export abstract class StandardResource implements IResource
                                 if(e)
                                 {
                                     callback(e);
+                                    return;
                                 }
-                                else
-                                {
+
+                                resource.webName((e, name) => {
+                                    if(e || name === newName)
+                                    {
+                                        parent.addChild(resource, (e) => {
+                                            callback(e);
+                                        })
+                                        return;
+                                    }
+
                                     resource.rename(newName, (e, oldName, newName) => {
                                         if(e)
                                             callback(e);
@@ -204,7 +217,7 @@ export abstract class StandardResource implements IResource
                                                 callback(e);
                                             })
                                     })
-                                }
+                                })
                             })
                         })
                 })