Added the attributes to the stored properties affected by PROPPATCH

OpenMarshal · Jun 29, 2017 · f8f6e00 · f8f6e00
1 parent 9d3b03e
commit f8f6e00
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 27 deletions.
diff --git a/lib/manager/v2/fileSystem/CommonTypes.d.ts b/lib/manager/v2/fileSystem/CommonTypes.d.ts
@@ -3,6 +3,9 @@ export declare type SimpleCallback = (error?: Error) => void;
 export declare type ReturnCallback<T> = (error?: Error, data?: T) => void;
 export declare type Return2Callback<T1, T2> = (error?: Error, data1?: T1, data2?: T2) => void;
 export declare type ResourcePropertyValue = string | XMLElement | XMLElement[];
+export interface PropertyAttributes {
+    [name: string]: string;
+}
 export declare class ResourceType {
     isFile: boolean;
     isDirectory: boolean;

diff --git a/lib/manager/v2/fileSystem/PropertyManager.d.ts b/lib/manager/v2/fileSystem/PropertyManager.d.ts
@@ -1,19 +1,20 @@
-import { ReturnCallback, SimpleCallback, ResourcePropertyValue } from './CommonTypes';
+import { ReturnCallback, Return2Callback, SimpleCallback, ResourcePropertyValue, PropertyAttributes } from './CommonTypes';
 export interface PropertyBag {
-    [name: string]: ResourcePropertyValue;
+    [name: string]: {
+        value: ResourcePropertyValue;
+        attributes?: PropertyAttributes;
+    };
 }
 export interface IPropertyManager {
-    setProperty(name: string, value: ResourcePropertyValue, callback: SimpleCallback): void;
-    getProperty(name: string, callback: ReturnCallback<ResourcePropertyValue>): void;
+    setProperty(name: string, value: ResourcePropertyValue, attributes: PropertyAttributes, callback: SimpleCallback): void;
+    getProperty(name: string, callback: Return2Callback<ResourcePropertyValue, PropertyAttributes>): void;
     removeProperty(name: string, callback: SimpleCallback): void;
     getProperties(callback: ReturnCallback<PropertyBag>, byCopy?: boolean): void;
 }
 export declare class LocalPropertyManager implements IPropertyManager {
-    properties: {
-        [name: string]: ResourcePropertyValue;
-    };
-    setProperty(name: string, value: ResourcePropertyValue, callback: SimpleCallback): void;
-    getProperty(name: string, callback: ReturnCallback<ResourcePropertyValue>): void;
+    properties: PropertyBag;
+    setProperty(name: string, value: ResourcePropertyValue, attributes: PropertyAttributes, callback: SimpleCallback): void;
+    getProperty(name: string, callback: Return2Callback<ResourcePropertyValue, PropertyAttributes>): void;
     removeProperty(name: string, callback: SimpleCallback): void;
     getProperties(callback: ReturnCallback<PropertyBag>, byCopy?: boolean): void;
 }
diff --git a/lib/manager/v2/fileSystem/PropertyManager.js b/lib/manager/v2/fileSystem/PropertyManager.js
@@ -5,13 +5,16 @@ var LocalPropertyManager = (function () {
     function LocalPropertyManager() {
         this.properties = {};
     }
-    LocalPropertyManager.prototype.setProperty = function (name, value, callback) {
-        this.properties[name] = value;
+    LocalPropertyManager.prototype.setProperty = function (name, value, attributes, callback) {
+        this.properties[name] = {
+            value: value,
+            attributes: attributes
+        };
         callback(null);
     };
     LocalPropertyManager.prototype.getProperty = function (name, callback) {
         var property = this.properties[name];
-        callback(property ? null : Errors_1.Errors.PropertyNotFound, property);
+        callback(property ? null : Errors_1.Errors.PropertyNotFound, property.value, property.attributes);
     };
     LocalPropertyManager.prototype.removeProperty = function (name, callback) {
         delete this.properties[name];

diff --git a/lib/manager/v2/fileSystem/StandardMethods.js b/lib/manager/v2/fileSystem/StandardMethods.js
@@ -65,7 +65,10 @@ var StandardMethods = (function () {
                             if (e)
                                 return callback(e);
                             new Workflow_1.Workflow()
-                                .each(Object.keys(props), function (name, cb) { return pmTo.setProperty(name, props[name], cb); })
+                                .each(Object.keys(props), function (name, cb) {
+                                var prop = props[name];
+                                pmTo.setProperty(name, prop.value, prop.attributes, cb);
+                            })
                                 .error(callback)
                                 .done(function () { return callback(); });
                         });
@@ -98,7 +101,7 @@ var StandardMethods = (function () {
             var copyChildren = function (callback) {
                 fsFrom.readDir(ctx, subPathFrom, false, function (e, files) {
                     if (e)
-                        callback(e);
+                        return callback(e);
                     var subDepth = depth === -1 ? -1 : Math.max(0, depth - 1);
                     new Workflow_1.Workflow()
                         .each(files, function (file, cb) { return StandardMethods.standardCopy(ctx, subPathFrom.getChildPath(file), fsFrom, subPathTo.getChildPath(file), fsTo, overwrite, subDepth, function (e) { return cb(e); }); })

diff --git a/src/manager/v2/fileSystem/CommonTypes.ts b/src/manager/v2/fileSystem/CommonTypes.ts
@@ -18,6 +18,11 @@ export type Return2Callback<T1, T2> = (error ?: Error, data1 ?: T1, data2 ?: T2)
 
 export type ResourcePropertyValue = string | XMLElement | XMLElement[]
 
+export interface PropertyAttributes
+{
+    [name : string] : string
+}
+
 export class ResourceType
 {
     static File = new ResourceType(true, false)

diff --git a/src/manager/v2/fileSystem/PropertyManager.ts b/src/manager/v2/fileSystem/PropertyManager.ts
@@ -8,37 +8,42 @@ import { Workflow } from '../../../helper/Workflow'
 import { Errors } from '../../../Errors'
 import { Lock } from '../../../resource/lock/Lock'
 import { Path } from '../Path'
-import { ReturnCallback, SimpleCallback, ResourcePropertyValue } from './CommonTypes'
+import { ReturnCallback, Return2Callback, SimpleCallback, ResourcePropertyValue, PropertyAttributes } from './CommonTypes'
 import * as mimeTypes from 'mime-types'
 import * as crypto from 'crypto'
 
 export interface PropertyBag
 {
-    [name : string] : ResourcePropertyValue
+    [name : string] : {
+        value : ResourcePropertyValue
+        attributes ?: PropertyAttributes
+    }
 }
+
 export interface IPropertyManager
 {
-    setProperty(name : string, value : ResourcePropertyValue, callback : SimpleCallback) : void
-    getProperty(name : string, callback : ReturnCallback<ResourcePropertyValue>) : void
+    setProperty(name : string, value : ResourcePropertyValue, attributes : PropertyAttributes, callback : SimpleCallback) : void
+    getProperty(name : string, callback : Return2Callback<ResourcePropertyValue, PropertyAttributes>) : void
     removeProperty(name : string, callback : SimpleCallback) : void
     getProperties(callback : ReturnCallback<PropertyBag>, byCopy ?: boolean) : void
 }
 export class LocalPropertyManager implements IPropertyManager
 {
-    properties : {
-        [name : string] : ResourcePropertyValue
-    } = { };
+    properties : PropertyBag = { };
 
-    setProperty(name : string, value : ResourcePropertyValue, callback : SimpleCallback) : void
+    setProperty(name : string, value : ResourcePropertyValue, attributes : PropertyAttributes, callback : SimpleCallback) : void
     {
-        this.properties[name] = value;
+        this.properties[name] = {
+            value,
+            attributes
+        };
         callback(null);
     }
 
-    getProperty(name : string, callback : ReturnCallback<ResourcePropertyValue>) : void
+    getProperty(name : string, callback : Return2Callback<ResourcePropertyValue, PropertyAttributes>) : void
     {
         const property = this.properties[name];
-        callback(property ? null : Errors.PropertyNotFound, property);
+        callback(property ? null : Errors.PropertyNotFound, property.value, property.attributes);
     }
 
     removeProperty(name : string, callback : SimpleCallback) : void

diff --git a/src/manager/v2/fileSystem/StandardMethods.ts b/src/manager/v2/fileSystem/StandardMethods.ts
@@ -104,7 +104,10 @@ export abstract class StandardMethods
                                 return callback(e);
 
                             new Workflow()
-                                .each(Object.keys(props), (name, cb) => pmTo.setProperty(name, props[name], cb))
+                                .each(Object.keys(props), (name, cb) => {
+                                    const prop = props[name];
+                                    pmTo.setProperty(name, prop.value, prop.attributes, cb)
+                                })
                                 .error(callback)
                                 .done(() => callback())
                         })
@@ -146,7 +149,7 @@ export abstract class StandardMethods
             {
                 fsFrom.readDir(ctx, subPathFrom, false, (e, files) => {
                     if(e)
-                        callback(e);
+                        return callback(e);
 
                     const subDepth = depth === -1 ? -1 : Math.max(0, depth - 1);