Merge pull request #32 from tonysoft/master
Issues involved in "getFiles"
This commit is contained in:
commit
2cd6888c16
|
@ -1,11 +1,30 @@
|
||||||
{
|
{
|
||||||
"rackspace": {
|
"storage-rackspace": {
|
||||||
|
"name": "storage",
|
||||||
|
"connector": "loopback-component-storage",
|
||||||
"username": "strongloop",
|
"username": "strongloop",
|
||||||
"apiKey": "a51076644fc37583bd87dd648b58777e",
|
"apiKey": "a51076644fc37583bd87dd648b58777e",
|
||||||
"region": "DFW"
|
"region": "DFW"
|
||||||
},
|
},
|
||||||
"amazon": {
|
"storage-amazon": {
|
||||||
|
"name": "storage",
|
||||||
|
"connector": "loopback-component-storage",
|
||||||
"keyId": "AKIAJXSYYW7EAWTJYMLA",
|
"keyId": "AKIAJXSYYW7EAWTJYMLA",
|
||||||
"key": "TkW/9i7nNsOEg/vvYS4P/zexNrzDvkjQp3NwF7J7"
|
"key": "TkW/9i7nNsOEg/vvYS4P/zexNrzDvkjQp3NwF7J7"
|
||||||
|
},
|
||||||
|
"storage-filesystem": {
|
||||||
|
"name": "storage",
|
||||||
|
"connector": "loopback-component-storage",
|
||||||
|
"provider": "filesystem",
|
||||||
|
"root": "./server/storage"
|
||||||
|
},
|
||||||
|
"storage-azure": {
|
||||||
|
"name": "storage",
|
||||||
|
"connector": "loopback-component-storage",
|
||||||
|
"provider": "azure",
|
||||||
|
"protocol": "http",
|
||||||
|
"serversUrl": "blob.core.windows.net",
|
||||||
|
"storageAccount": "yourAzureAccount",
|
||||||
|
"storageAccessKey": "yourAzureKey"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -199,6 +199,7 @@ FileSystemProvider.prototype.getFiles = function (container, options, cb) {
|
||||||
if (!validateName(container, cb)) return;
|
if (!validateName(container, cb)) return;
|
||||||
var dir = path.join(this.root, container);
|
var dir = path.join(this.root, container);
|
||||||
fs.readdir(dir, function (err, entries) {
|
fs.readdir(dir, function (err, entries) {
|
||||||
|
entries = entries || [];
|
||||||
var files = [];
|
var files = [];
|
||||||
var tasks = [];
|
var tasks = [];
|
||||||
entries.forEach(function (f) {
|
entries.forEach(function (f) {
|
||||||
|
|
|
@ -155,6 +155,11 @@ StorageService.prototype.downloadStream = function (container, file, options, cb
|
||||||
* @param {Object[]} files An array of file metadata objects
|
* @param {Object[]} files An array of file metadata objects
|
||||||
*/
|
*/
|
||||||
StorageService.prototype.getFiles = function (container, options, cb) {
|
StorageService.prototype.getFiles = function (container, options, cb) {
|
||||||
|
if(typeof options === 'function' && !cb) {
|
||||||
|
// options argument is not present
|
||||||
|
cb = options;
|
||||||
|
options = {};
|
||||||
|
}
|
||||||
return this.client.getFiles(container, options, function (err, files) {
|
return this.client.getFiles(container, options, function (err, files) {
|
||||||
if (err) {
|
if (err) {
|
||||||
cb(err, files);
|
cb(err, files);
|
||||||
|
|
Loading…
Reference in New Issue