fix: exporter: when subtree is specified, result paths are not complete

Author: pgte

src/exporter/dir-flat.js

@@ -10,15 +10,14 @@ const cat = require('pull-cat')
 module.exports = dirExporter
 
 function dirExporter (node, name, pathRest, ipldResolver, resolve, parent) {
-  const accepts = pathRest.shift()
+  const accepts = pathRest[0]
 
   const dir = {
     path: name,
     hash: node.multihash
   }
 
-  return cat([
-    pull.values([dir]),
+  const streams = [
     pull(
       pull.values(node.links),
       pull.map((link) => ({
@@ -32,9 +31,18 @@ function dirExporter (node, name, pathRest, ipldResolver, resolve, parent) {
           return cb(err)
         }
 
-        cb(null, resolve(n.value, item.path, pathRest, ipldResolver, name, parent))
+        cb(null, resolve(n.value, accepts || item.path, pathRest, ipldResolver, name, parent))
       })),
       pull.flatten()
     )
-  ])
+  ]
+
+  // place dir before if not specifying subtree
+  if (!pathRest.length) {
+    streams.unshift(pull.values([dir]))
+  }
+
+  pathRest.shift()
+
+  return cat(streams)
 }

src/exporter/dir-hamt-sharded.js

@@ -19,21 +19,23 @@ function shardedDirExporter (node, name, pathRest, ipldResolver, resolve, parent
     }]
   }
 
-  return cat([
-    pull.values(dir),
+  const streams = [
     pull(
       pull.values(node.links),
       pull.map((link) => {
         // remove the link prefix (2 chars for the bucket index)
         const p = link.name.substring(2)
         const pp = p ? path.join(name, p) : name
         let accept = true
+        let fromPathRest = false
 
         if (p && pathRest.length) {
+          fromPathRest = true
           accept = (p === pathRest[0])
         }
         if (accept) {
           return {
+            fromPathRest: fromPathRest,
             name: p,
             path: pp,
             hash: link.multihash,
@@ -49,9 +51,22 @@ function shardedDirExporter (node, name, pathRest, ipldResolver, resolve, parent
           return cb(err)
         }
 
-        cb(null, resolve(n.value, item.path, item.pathRest, ipldResolver, (dir && dir[0]) || parent))
+        cb(
+          null,
+          resolve(
+            n.value,
+            item.fromPathRest ? item.name : item.path,
+            item.pathRest,
+            ipldResolver,
+            (dir && dir[0]) || parent))
       })),
       pull.flatten()
     )
-  ])
+  ]
+
+  if (!pathRest.length) {
+    streams.unshift(pull.values(dir))
+  }
+
+  return cat(streams)
 }

test/test-dirbuilder-sharding.js

@@ -344,15 +344,12 @@ module.exports = (repo) => {
 
         function collected (err, nodes) {
           expect(err).to.not.exist()
-          expect(nodes.length).to.equal(4)
+          expect(nodes.length).to.equal(1)
           expect(nodes.map((node) => node.path)).to.deep.equal([
-            'QmTm3ZdKxyDLvcEePEvGfB2QReXsiAF7f39yjRcWwWrA6d',
-            'QmTm3ZdKxyDLvcEePEvGfB2QReXsiAF7f39yjRcWwWrA6d/big',
-            'QmTm3ZdKxyDLvcEePEvGfB2QReXsiAF7f39yjRcWwWrA6d/big/big',
-            'QmTm3ZdKxyDLvcEePEvGfB2QReXsiAF7f39yjRcWwWrA6d/big/big/2000'
+            '2000'
           ])
           pull(
-            nodes[3].content,
+            nodes[0].content,
             pull.collect((err, content) => {
               expect(err).to.not.exist()
               expect(content.toString()).to.equal('2000')

test/test-export-subtree.js

@@ -32,14 +32,27 @@ module.exports = (repo) => {
       pull(
         exporter(hash, ipldResolver),
         pull.collect((err, files) => {
+          expect(err).to.not.exist()
+          expect(files.length).to.equal(1)
+          expect(files[0].path).to.equal('200Bytes.txt')
+          fileEql(files[0], smallFile, done)
+        })
+      )
+    })
+
+    it('export dir 1 level down', (done) => {
+      const hash = 'QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN/level-1'
+
+      pull(
+        exporter(hash, ipldResolver),
+        pull.collect((err, files) => {
+          console.log(files)
           expect(err).to.not.exist()
           expect(files.length).to.equal(3)
-          expect(files[0].path).to.equal('QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN')
-          expect(files[0].content).to.not.exist()
-          expect(files[1].path).to.equal('QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN/level-1')
-          expect(files[1].content).to.not.exist()
-          expect(files[2].path).to.equal('QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN/level-1/200Bytes.txt')
-          fileEql(files[2], smallFile, done)
+          expect(files[0].path).to.equal('level-1')
+          expect(files[1].path).to.equal('level-1/200Bytes.txt')
+          expect(files[2].path).to.equal('level-1/level-2')
+          fileEql(files[1], smallFile, done)
         })
       )
     })
@@ -51,9 +64,7 @@ module.exports = (repo) => {
         exporter(hash, ipldResolver),
         pull.collect((err, files) => {
           expect(err).to.not.exist()
-          expect(files.length).to.equal(1)
-          expect(files[0].path).to.equal('QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN')
-          expect(files[0].content).to.not.exist()
+          expect(files.length).to.equal(0)
           done()
         })
       )
@@ -69,13 +80,9 @@ module.exports = (repo) => {
           exporter(nodeCID + '/a/file/level-1/200Bytes.txt', ipldResolver),
           pull.collect((err, files) => {
             expect(err).to.not.exist()
-            expect(files.length).to.equal(3)
-            expect(files[0].path).to.equal('zdpuAzp9okHgbLQdmusXn8cRjr9js6nAM4JrvKDeqp2XEkFzD/a/file')
-            expect(files[0].content).to.not.exist()
-            expect(files[1].path).to.equal('zdpuAzp9okHgbLQdmusXn8cRjr9js6nAM4JrvKDeqp2XEkFzD/a/file/level-1')
-            expect(files[1].content).to.not.exist()
-            expect(files[2].path).to.equal('zdpuAzp9okHgbLQdmusXn8cRjr9js6nAM4JrvKDeqp2XEkFzD/a/file/level-1/200Bytes.txt')
-            fileEql(files[2], smallFile, done)
+            expect(files.length).to.equal(1)
+            expect(files[0].path).to.equal('200Bytes.txt')
+            fileEql(files[0], smallFile, done)
           })
         )
       })