Now return an error when requesting the size or mime-type of a virtua…

…l or physical folder
OpenMarshal · May 31, 2017 · 12bdd45 · 12bdd45
1 parent aea18ee
commit 12bdd45
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/lib/resource/physical/PhysicalFolder.js b/lib/resource/physical/PhysicalFolder.js
@@ -12,7 +12,6 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 var IResource_1 = require("../IResource");
 var ResourceChildren_1 = require("../std/ResourceChildren");
-var StandardResource_1 = require("../std/StandardResource");
 var PhysicalResource_1 = require("./PhysicalResource");
 var Errors_1 = require("../../Errors");
 var fs = require("fs");
@@ -76,10 +75,10 @@ var PhysicalFolder = (function (_super) {
         callback(Errors_1.Errors.InvalidOperation, null);
     };
     PhysicalFolder.prototype.mimeType = function (targetSource, callback) {
-        callback(null, 'directory');
+        callback(new Error('Cannot get the mime type of a folder type resource'), null);
     };
     PhysicalFolder.prototype.size = function (targetSource, callback) {
-        StandardResource_1.StandardResource.sizeOfSubFiles(this, targetSource, callback);
+        callback(new Error('Cannot get the size of a folder type resource'), null);
     };
     PhysicalFolder.prototype.addChild = function (resource, callback) {
         var _this = this;

diff --git a/lib/resource/virtual/VirtualFolder.js b/lib/resource/virtual/VirtualFolder.js
@@ -11,7 +11,6 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var IResource_1 = require("../IResource");
-var StandardResource_1 = require("../std/StandardResource");
 var ResourceChildren_1 = require("../std/ResourceChildren");
 var VirtualResource_1 = require("./VirtualResource");
 var Errors_1 = require("../../Errors");
@@ -32,10 +31,10 @@ var VirtualFolder = (function (_super) {
         callback(Errors_1.Errors.InvalidOperation, null);
     };
     VirtualFolder.prototype.mimeType = function (targetSource, callback) {
-        callback(null, 'directory');
+        callback(new Error('Cannot get the mime type of a folder type resource'), null);
     };
     VirtualFolder.prototype.size = function (targetSource, callback) {
-        StandardResource_1.StandardResource.sizeOfSubFiles(this, targetSource, callback);
+        callback(new Error('Cannot get the size of a folder type resource'), null);
     };
     VirtualFolder.prototype.addChild = function (resource, callback) {
         var _this = this;

diff --git a/src/resource/physical/PhysicalFolder.ts b/src/resource/physical/PhysicalFolder.ts
@@ -92,11 +92,11 @@ export class PhysicalFolder extends PhysicalResource
     }
     mimeType(targetSource : boolean, callback : ReturnCallback<string>)
     {
-        callback(null, 'directory');
+        callback(new Error('Cannot get the mime type of a folder type resource'), null);
     }
     size(targetSource : boolean, callback : ReturnCallback<number>)
     {
-        StandardResource.sizeOfSubFiles(this, targetSource, callback);
+        callback(new Error('Cannot get the size of a folder type resource'), null);
     }
 
     // ****************************** Children ****************************** //

diff --git a/src/resource/virtual/VirtualFolder.ts b/src/resource/virtual/VirtualFolder.ts
@@ -34,11 +34,11 @@ export class VirtualFolder extends VirtualResource
     }
     mimeType(targetSource : boolean, callback : ReturnCallback<string>)
     {
-        callback(null, 'directory');
+        callback(new Error('Cannot get the mime type of a folder type resource'), null);
     }
     size(targetSource : boolean, callback : ReturnCallback<number>)
     {
-        StandardResource.sizeOfSubFiles(this, targetSource, callback);
+        callback(new Error('Cannot get the size of a folder type resource'), null);
     }
 
     // ****************************** Children ****************************** //