The 'mimeType' method of the implemented resources now return the con…

…tent type instead of the mime-type only
OpenMarshal · Jun 14, 2017 · d1247af · d1247af
1 parent 787ed4e
commit d1247af
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 6 deletions.
diff --git a/lib/resource/physical/PhysicalFile.js b/lib/resource/physical/PhysicalFile.js
@@ -70,7 +70,7 @@ var PhysicalFile = (function (_super) {
         });
     };
     PhysicalFile.prototype.mimeType = function (targetSource, callback) {
-        var mt = mimeTypes.lookup(this.realPath);
+        var mt = mimeTypes.contentType(this.realPath);
         callback(null, mt ? mt : 'application/octet-stream');
     };
     PhysicalFile.prototype.size = function (targetSource, callback) {

diff --git a/lib/resource/virtual/VirtualFile.js b/lib/resource/virtual/VirtualFile.js
@@ -77,7 +77,7 @@ var VirtualFile = (function (_super) {
         callback(null, new VirtualFileReadable(this.content));
     };
     VirtualFile.prototype.mimeType = function (targetSource, callback) {
-        var mt = mimeTypes.lookup(this.name);
+        var mt = mimeTypes.contentType(this.name);
         callback(null, mt ? mt : 'application/octet-stream');
     };
     VirtualFile.prototype.size = function (targetSource, callback) {

diff --git a/lib/resource/virtualStored/VirtualStoredFile.js b/lib/resource/virtualStored/VirtualStoredFile.js
@@ -73,7 +73,7 @@ var VirtualStoredFile = (function (_super) {
         this.fsManager.contentManager.read(this.contentUid, callback);
     };
     VirtualStoredFile.prototype.mimeType = function (targetSource, callback) {
-        var mt = mimeTypes.lookup(this.name);
+        var mt = mimeTypes.contentType(this.name);
         callback(null, mt ? mt : 'application/octet-stream');
     };
     VirtualStoredFile.prototype.size = function (targetSource, callback) {

diff --git a/lib/server/webDAVServer/Resource.js b/lib/server/webDAVServer/Resource.js
@@ -66,6 +66,11 @@ function addResourceTree(_rootResource, _resoureceTree, _callback) {
         resoureceTree = _resoureceTree;
         rootResource = _rootResource;
     }
+    var cb = callback;
+    callback = function (e) {
+        if (cb)
+            cb(e);
+    };
     if (resoureceTree.constructor === Array) {
         var array = resoureceTree;
         if (array.length === 0) {

diff --git a/src/resource/physical/PhysicalFile.ts b/src/resource/physical/PhysicalFile.ts
@@ -77,7 +77,7 @@ export class PhysicalFile extends PhysicalResource
     }
     mimeType(targetSource : boolean, callback : ReturnCallback<string>)
     {
-        const mt = mimeTypes.lookup(this.realPath);
+        const mt = mimeTypes.contentType(this.realPath);
         callback(null, mt ? mt as string : 'application/octet-stream');
     }
     size(targetSource : boolean, callback : ReturnCallback<number>)

diff --git a/src/resource/virtual/VirtualFile.ts b/src/resource/virtual/VirtualFile.ts
@@ -85,7 +85,7 @@ export class VirtualFile extends VirtualResource
     }
     mimeType(targetSource : boolean, callback : ReturnCallback<string>)
     {
-        const mt = mimeTypes.lookup(this.name);
+        const mt = mimeTypes.contentType(this.name);
         callback(null, mt ? mt as string : 'application/octet-stream');
     }
     size(targetSource : boolean, callback : ReturnCallback<number>)

diff --git a/src/resource/virtualStored/VirtualStoredFile.ts b/src/resource/virtualStored/VirtualStoredFile.ts
@@ -84,7 +84,7 @@ export class VirtualStoredFile extends VirtualStoredResource
     }
     mimeType(targetSource : boolean, callback : ReturnCallback<string>)
     {
-        const mt = mimeTypes.lookup(this.name);
+        const mt = mimeTypes.contentType(this.name);
         callback(null, mt ? mt as string : 'application/octet-stream');
     }
     size(targetSource : boolean, callback : ReturnCallback<number>)

diff --git a/src/server/webDAVServer/Resource.ts b/src/server/webDAVServer/Resource.ts
@@ -85,6 +85,12 @@ export function addResourceTree(_rootResource : IResource | ResourceTreeNode, _r
         rootResource = _rootResource as IResource;
     }
 
+    const cb = callback;
+    callback = (e) => {
+        if(cb)
+            cb(e);
+    }
+
     if(resoureceTree.constructor === Array)
     {
         const array = resoureceTree as any[];