coolaj86
/
fs-walk.js
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

fix #41 by reporting nodeError if first directory fails

This commit is contained in:
AJ ONeal 2015-01-05 18:15:46 -07:00
parent 01a28a0d2b
commit 0d6bda5385
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/walk.js
View File

@ -159,25 +159,31 @@
me._wfnodegroups = fnodeGroups; me._wfnodegroups = fnodeGroups;
me._wcurfiles = files; me._wcurfiles = files;
// no error, great
if (!err) { if (!err) {
me._wReadFiles(); me._wReadFiles();
return; return;
} }
// error? not first run? => directory error
if (!me._wfirstrun) { if (!me._wfirstrun) {
me.emit('directoryError', me._wcurpath, { error: err }, noop); me.emit('directoryError', me._wcurpath, { error: err }, noop);
me._wReadFiles(); me._wReadFiles();
return; return;
} }
// error? first run? => maybe a file, maybe a true error
me._wfirstrun = false; me._wfirstrun = false;
// TODO how to remove this anony?
// readdir failed, try stat (might be a file)
me._wcurpath = me._wcurpath.replace(/^.*\/$/, '');
fs[me._wStat](me._wcurpath, function (e, stat) { fs[me._wStat](me._wcurpath, function (e, stat) {
if (stat) { if (stat) {
files = [me._wcurpath.replace(/.*\//, '')]; files = [me._wcurpath];
me._wcurpath = me._wcurpath.replace(files[0], ''); me._wcurpath = me._wcurpath.replace(files[0], '');
} else {
me.emit('nodeError', me._wcurpath, { error: err }, noop);
} }
me._wReadFiles(); me._wReadFiles();