Skip to content

Up-to-date pull #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Up-to-date pull #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03c551b
Fix undefined error
matthew-dean Apr 15, 2017
6c485b7
Fix undefined done
matthew-dean Apr 15, 2017
f4e4446
Make sure the done function is a function
matthew-dean Apr 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"files",
"file search"
],
"version": "0.3.0",
"version": "0.3.1",
"repository": {
"type": "git",
"url": "git://github.com/pvorb/node-seek.git"
Expand Down
12 changes: 8 additions & 4 deletions seek.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,17 @@ seek = function(path, query, opt, found, filter, complete) {
};

function readFileStream(err, file, done) {
if (!done || typeof done !== 'function')
done = function() { return false };

if (err) {
opt.events.error(err);
return done ? done() : false;
return done();
}

// If a file is filtered out, return
if (!opt.filter(file)) return done ? done() : false;

if (!opt.filter(file)) return done();

var bufSize = opt.bufferSize,
offset = 0,
Expand Down Expand Up @@ -183,15 +187,15 @@ seek = function(path, query, opt, found, filter, complete) {
});
readStream.on('error', function(err) {
opt.events.error(err);
return done ? done() : false;
return done();
});
readStream.on('end', function() {
// Allow user to whitelist files, even if there are no matches
var override = opt.events.scanned && opt.events.scanned(file);
if (matches.length > 0 || override)
opt.events.found(file, matches, override);

done && done();
done();
});
}

Expand Down