From 02ae2555f31260a8323619dc475c1f56b50d48b4 Mon Sep 17 00:00:00 2001 From: Wil Chung Date: Sat, 8 Mar 2014 01:09:15 -0800 Subject: [PATCH 1/2] bugfix: tree.find doesn't look deeper than 1 level --- src/tree.coffee | 9 ++++++++- test/tree.test.coffee | 11 +++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/tree.coffee b/src/tree.coffee index c0c5d5f..bf3607c 100644 --- a/src/tree.coffee +++ b/src/tree.coffee @@ -58,12 +58,19 @@ module.exports = class Tree # find: (file, callback) -> if /\//.test file - [dir, rest] = file.split "/", 2 + console.log "looking for tree" + path_components = file.split "/" + dir = path_components[0] + rest = path_components.slice(1, path_components.length).join("/") + console.log dir, rest @trees (err, _trees) => + console.log _trees.map (e) -> e.name for tree in _trees + console.log tree.name == dir return tree.find rest, callback if tree.name == dir return callback null, null else + console.log "looking for blob" @contents (err, children) -> return callback err if err for child in children diff --git a/test/tree.test.coffee b/test/tree.test.coffee index f10555b..bb25591 100644 --- a/test/tree.test.coffee +++ b/test/tree.test.coffee @@ -118,6 +118,17 @@ describe "Tree", -> blob.should.be.an.instanceof Blob blob.name.should.eql "hi.txt" + #describe "find inside nested directory", -> + # blob = null + # before (done) -> + # tree.find "some/nested/nested_file.txt", (err, _blob) -> + # blob = _blob + # done err + + # it "finds the Blob", -> + # blob.should.be.an.instancedof Blob + # blob.name.should.eql "nested_file.txt" + describe "find a nonexistant file", -> subtree = null before (done) -> From 19fd706620e95260bf662bc490c353f023a807de Mon Sep 17 00:00:00 2001 From: Wil Chung Date: Mon, 10 Mar 2014 17:09:17 -0700 Subject: [PATCH 2/2] remove debugging printouts in tree find --- src/tree.coffee | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/tree.coffee b/src/tree.coffee index bf3607c..275b9ab 100644 --- a/src/tree.coffee +++ b/src/tree.coffee @@ -58,19 +58,14 @@ module.exports = class Tree # find: (file, callback) -> if /\//.test file - console.log "looking for tree" path_components = file.split "/" dir = path_components[0] rest = path_components.slice(1, path_components.length).join("/") - console.log dir, rest @trees (err, _trees) => - console.log _trees.map (e) -> e.name for tree in _trees - console.log tree.name == dir return tree.find rest, callback if tree.name == dir return callback null, null else - console.log "looking for blob" @contents (err, children) -> return callback err if err for child in children