From 03c551b290ec32fefb64022270248942b905b2a8 Mon Sep 17 00:00:00 2001 From: Matthew Dean Date: Fri, 14 Apr 2017 19:23:16 -0700 Subject: [PATCH 1/3] Fix undefined error --- seek.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/seek.js b/seek.js index 68495ff..d09f4a4 100644 --- a/seek.js +++ b/seek.js @@ -146,13 +146,16 @@ seek = function(path, query, opt, found, filter, complete) { }; function readFileStream(err, file, done) { + if (!done) 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, @@ -183,7 +186,7 @@ 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 @@ -191,7 +194,7 @@ seek = function(path, query, opt, found, filter, complete) { if (matches.length > 0 || override) opt.events.found(file, matches, override); - done && done(); + done(); }); } From 6c485b7884cea06876ac0d536475bf1a25a60f29 Mon Sep 17 00:00:00 2001 From: Matthew Dean Date: Fri, 14 Apr 2017 19:23:50 -0700 Subject: [PATCH 2/3] Fix undefined done --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e1eb0a0..1afede2 100644 --- a/package.json +++ b/package.json @@ -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" From f4e44467a8147fae27c0abf6e0efe89e28904882 Mon Sep 17 00:00:00 2001 From: Matthew Dean Date: Fri, 14 Apr 2017 19:34:45 -0700 Subject: [PATCH 3/3] Make sure the done function is a function --- seek.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/seek.js b/seek.js index d09f4a4..7d174d7 100644 --- a/seek.js +++ b/seek.js @@ -146,7 +146,8 @@ seek = function(path, query, opt, found, filter, complete) { }; function readFileStream(err, file, done) { - if (!done) done = function() { return false }; + if (!done || typeof done !== 'function') + done = function() { return false }; if (err) { opt.events.error(err);