Return empty hash from list if directory doesn't exist.
Conflicts: test/list.test.js
This commit is contained in:
@@ -76,6 +76,7 @@ MBTiles.registerProtocols = function(tilelive) {
|
|||||||
MBTiles.list = function(filepath, callback) {
|
MBTiles.list = function(filepath, callback) {
|
||||||
filepath = path.resolve(filepath);
|
filepath = path.resolve(filepath);
|
||||||
fs.readdir(filepath, function(err, files) {
|
fs.readdir(filepath, function(err, files) {
|
||||||
|
if (err && err.code === 'ENOENT') return callback(null, {});
|
||||||
if (err) return callback(err);
|
if (err) return callback(err);
|
||||||
for (var result = {}, i = 0; i < files.length; i++) {
|
for (var result = {}, i = 0; i < files.length; i++) {
|
||||||
var name = files[i].match(/^([\w-]+)\.mbtiles$/);
|
var name = files[i].match(/^([\w-]+)\.mbtiles$/);
|
||||||
|
|||||||
+3
-8
@@ -15,14 +15,9 @@ exports['list'] = function(beforeExit, assert) {
|
|||||||
var completed = false; beforeExit(function() { assert.ok(completed); });
|
var completed = false; beforeExit(function() { assert.ok(completed); });
|
||||||
|
|
||||||
MBTiles.list(fixtures.doesnotexist, function(err, list) {
|
MBTiles.list(fixtures.doesnotexist, function(err, list) {
|
||||||
assert.ok(err);
|
completed = true;
|
||||||
assert.ok(err.code.match(/^ENOENT/));
|
assert.equal(err, null);
|
||||||
|
assert.deepEqual(list, {});
|
||||||
MBTiles.list(fixtures.doesnotexist, function(err, list) {
|
|
||||||
completed = true;
|
|
||||||
assert.ok(err);
|
|
||||||
assert.ok(err.code.match(/^ENOENT/));
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user