Output directories in Exporter.

Author: hackergrrl

package.json

@@ -56,7 +56,7 @@
     "block-stream2": "^1.1.0",
     "bs58": "^3.0.0",
     "debug": "^2.2.0",
-    "field-trip": "0.0.2",
+    "field-trip": "0.0.3",
     "ipfs-merkle-dag": "^0.5.0",
     "ipfs-unixfs": "^0.1.0",
     "is-ipfs": "^0.2.0",

src/exporter.js

@@ -91,32 +91,18 @@ function Exporter (hash, dagService, options) {
 
   // Logic to export a unixfs directory.
   let dirExporter = (node, name, add, done) => {
-    let init
-
     if (!add) throw new Error('add must be set')
     if (!done) throw new Error('done must be set')
 
-    var rs = new Readable()
+    this.push({content: null, path: name})
 
-    // Directory has no links
-    if (node.links.length === 0) {
-      init = false
-      rs._read = () => {
-        if (init) {
-          return
-        }
-        init = true
-        rs.push(node.data)
-        rs.push(null)
-      }
-      this.push({content: null, path: name})
-      done()
-    } else {
+    // Directory has links
+    if (node.links.length > 0) {
       node.links.forEach((link) => {
         add({ path: pathj.join(name, link.name), hash: link.hash })
       })
-      done()
     }
+    done()
   }
 
   // Traverse the DAG asynchronously

test/test-exporter.js

@@ -87,10 +87,12 @@ module.exports = function (repo) {
         expect(err).to.not.exist
       })
       testExport.pipe(concat((files) => {
-        expect(files[0].path).to.equal('QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN/200Bytes.txt')
-        expect(files[1].path).to.equal('QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN/dir-another')
-        expect(files[2].path).to.equal('QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN/level-1/200Bytes.txt')
-        expect(files[3].path).to.equal('QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN/level-1/level-2')
+        expect(files[0].path).to.equal('QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN')
+        expect(files[1].path).to.equal('QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN/200Bytes.txt')
+        expect(files[2].path).to.equal('QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN/dir-another')
+        expect(files[3].path).to.equal('QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN/level-1')
+        expect(files[4].path).to.equal('QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN/level-1/200Bytes.txt')
+        expect(files[5].path).to.equal('QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN/level-1/level-2')
         done()
       }))
     })