exporter: maxDepth instead of recursive flag

Author: pgte

src/exporter/dir-flat.js

@@ -1,25 +1,26 @@
 'use strict'
 
 const pull = require('pull-stream')
-const CID = require('cids')
 const cat = require('pull-cat')
 
 // Logic to export a unixfs directory.
 module.exports = dirExporter
 
-function dirExporter (node, name, pathRest, resolve) {
+function dirExporter (node, path, pathRest, resolve) {
   const accepts = pathRest[0]
 
   const dir = {
-    path: name,
+    path: path,
     hash: node.multihash
   }
 
   const streams = [
     pull(
       pull.values(node.links),
       pull.map((link) => ({
-        path: name + '/' + link.name,
+        size: link.size,
+        name: link.name,
+        path: path + '/' + link.name,
         multihash: link.multihash,
         linkName: link.name,
         pathRest: pathRest.slice(1)

src/exporter/dir-hamt-sharded.js

@@ -1,18 +1,17 @@
 'use strict'
 
 const pull = require('pull-stream')
-const CID = require('cids')
 const cat = require('pull-cat')
 const cleanHash = require('./clean-multihash')
 
 // Logic to export a unixfs directory.
 module.exports = shardedDirExporter
 
-function shardedDirExporter (node, name, pathRest, resolve, dag, parent) {
+function shardedDirExporter (node, path, pathRest, resolve, dag, parent) {
   let dir
-  if (!parent || parent.path !== name) {
+  if (!parent || parent.path !== path) {
     dir = [{
-      path: name,
+      path: path,
       hash: cleanHash(node.multihash)
     }]
   }
@@ -23,7 +22,7 @@ function shardedDirExporter (node, name, pathRest, resolve, dag, parent) {
       pull.map((link) => {
         // remove the link prefix (2 chars for the bucket index)
         const p = link.name.substring(2)
-        const pp = p ? name + '/' + p : name
+        const pp = p ? path + '/' + p : path
         let accept = true
         let fromPathRest = false
 

src/exporter/file.js

@@ -7,7 +7,7 @@ const pull = require('pull-stream')
 const paramap = require('pull-paramap')
 
 // Logic to export a single (possibly chunked) unixfs file.
-module.exports = (node, name, pathRest, resolve, dag) => {
+module.exports = (node, path, pathRest, resolve, dag) => {
   function getData (node) {
     try {
       const file = UnixFS.unmarshal(node.data)
@@ -27,7 +27,7 @@ module.exports = (node, name, pathRest, resolve, dag) => {
 
   const accepts = pathRest[0]
 
-  if (accepts !== undefined && accepts !== name) {
+  if (accepts !== undefined && accepts !== path) {
     return pull.empty()
   }
 
@@ -39,7 +39,7 @@ module.exports = (node, name, pathRest, resolve, dag) => {
   const file = UnixFS.unmarshal(node.data)
   return pull.values([{
     content: content,
-    path: name,
+    path: path,
     hash: node.multihash,
     size: file.fileSize()
   }])

src/exporter/index.js

@@ -2,7 +2,6 @@
 
 const pull = require('pull-stream')
 const CID = require('cids')
-const b58Encode = require('bs58').encode
 
 const createResolver = require('./resolve').createResolver
 
@@ -37,11 +36,10 @@ function pathBaseAndRest (path) {
 }
 
 const defaultOptions = {
-  recurse: true
+  maxDepth: Infinity
 }
 
 module.exports = (path, dag, _options) => {
-
   const options = Object.assign({}, defaultOptions, _options)
 
   let dPath
@@ -51,6 +49,9 @@ module.exports = (path, dag, _options) => {
     return pull.error(err)
   }
 
+  const pathLengthToCut = join(
+    [dPath.base].concat(dPath.rest.slice(0, dPath.rest.length - 1))).length
+
   return pull(
     pull.values([{
       multihash: new CID(dPath.base),
@@ -60,21 +61,21 @@ module.exports = (path, dag, _options) => {
     }]),
     createResolver(dag, options),
     pull.map((node) => ({
+      name: node.name,
       path: finalPathFor(node),
       size: node.size,
-      hash: node.hash,
-      content: node.content
+      hash: node.hash || node.multihash,
+      content: node.content,
+      type: node.type
     }))
   )
 
-  function finalPathFor(node) {
+  function finalPathFor (node) {
     if (!dPath.rest.length) {
       return node.path
     }
 
-    const cutElements = [dPath.base].concat(dPath.rest.slice(0, dPath.rest.length - 1))
-    const lengthToCut = join(cutElements).length
-    let retPath = node.path.substring(lengthToCut)
+    let retPath = node.path.substring(pathLengthToCut)
     if (retPath.charAt(0) === '/') {
       retPath = retPath.substring(1)
     }
@@ -85,11 +86,11 @@ module.exports = (path, dag, _options) => {
   }
 }
 
-function join(paths) {
+function join (paths) {
   return paths.reduce((acc, path) => {
     if (acc.length) {
       acc += '/'
     }
     return acc + path
   }, '')
-}
+}

src/exporter/object.js

@@ -26,7 +26,3 @@ module.exports = (node, name, pathRest, resolve, dag, parent) => {
     return pull.error(new Error('invalid node type'))
   }
 }
-
-function sanitizeCID (cid) {
-  return new CID(cid.version, cid.codec, cid.multihash)
-}

src/exporter/resolve.js

@@ -18,11 +18,11 @@ module.exports = Object.assign({
 }, resolvers)
 
 function createResolver (dag, options, depth, parent) {
-  if (! depth) {
+  if (!depth) {
     depth = 0
   }
 
-  if (!options.recurse && depth > 0) {
+  if (depth > options.maxDepth) {
     return pull.map(identity)
   }
 
@@ -42,14 +42,14 @@ function createResolver (dag, options, depth, parent) {
     pull.flatten()
   )
 
-  function resolve (node, hash, pathRest, parentNode) {
+  function resolve (node, path, pathRest, parentNode) {
     const type = typeOf(node)
     const nodeResolver = resolvers[type]
     if (!nodeResolver) {
       return pull.error(new Error('Unkown node type ' + type))
     }
     const resolveDeep = createResolver(dag, options, depth + 1, node)
-    return nodeResolver(node, hash, pathRest, resolveDeep, dag, parentNode)
+    return nodeResolver(node, path, pathRest, resolveDeep, dag, parentNode)
   }
 }
 

test/exporter-subtree.js

@@ -17,7 +17,7 @@ const smallFile = loadFixture(__dirname, 'fixtures/200Bytes.txt')
 
 module.exports = (repo) => {
   describe('exporter subtree', () => {
-    this.timeout(10 * 1000)
+    // this.timeout(10 * 1000)
 
     let ipldResolver