Add files.get command and tests.

Author: hackergrrl

src/api/get.js

@@ -1,11 +1,30 @@
 'use strict'
 
+const tarStreamToObjects = require('../tar-stream-to-objects')
+const cleanMultihash = require('../clean-multihash')
+const promisify = require('promisify-es6')
+
 module.exports = (send) => {
-  return function get (path, opts, cb) {
+  return promisify(function get (path, opts, cb) {
     if (typeof opts === 'function' && !cb) {
       cb = opts
       opts = {}
     }
-    return send('get', path, opts, null, cb)
-  }
+
+    // opts is the real callback -- 'cb' is being injected by promisify
+    if (typeof opts === 'function' && typeof cb === 'function') {
+      cb = opts
+      opts = {}
+    }
+
+    try {
+      path = cleanMultihash(path)
+    } catch (err) {
+      return cb(err)
+    }
+
+    var sendWithTransform = send.withTransform(tarStreamToObjects)
+
+    return sendWithTransform('get', path, opts, null, cb)
+  })
 }

src/load-commands.js

@@ -34,6 +34,12 @@ function requireCommands () {
     const files = require('./api/files')(send)
     files.add = require('./api/add')(send)
     files.createAddStream = require('./api/add-stream.js')(send)
+    files.get = require('./api/get')(send)
+
+    // aliases
+    cmds.add = files.add
+    cmds.createAddStream = files.createAddStream
+    cmds.get = files.get
 
     return files
   }

src/tar-stream-to-objects.js

@@ -0,0 +1,32 @@
+'use strict'
+
+const tar = require('tar-stream')
+const Readable = require('readable-stream')
+const through = require('through2')
+
+// transform tar stream into readable stream of
+// { path: 'string', content: Readable }
+module.exports = function (err, res, send, done) {
+
+  if (err) return done(err)
+
+  var ex = tar.extract()
+  res.pipe(ex)
+
+  var objStream = new Readable({ objectMode: true })
+  objStream._read = function noop () {}
+
+  ex.on('entry', function (header, stream, next) {
+    objStream.push({
+      path: header.name,
+      content: stream
+    })
+    next()
+  })
+  ex.on('finish', () => {
+    objStream.push(null)
+  })
+
+  done(null, objStream)
+}
+

test/api/get.spec.js

@@ -6,10 +6,14 @@ const expect = require('chai').expect
 const isNode = require('detect-node')
 const fs = require('fs')
 const bl = require('bl')
+const concat = require('concat-stream')
+const through = require('through2')
 
 const path = require('path')
 const streamEqual = require('stream-equal')
 
+const extract = require('tar-stream').extract
+
 let testfile
 let testfileBig
 
@@ -24,10 +28,20 @@ describe('.get', () => {
   it('get with no compression args', (done) => {
     apiClients.a
       .get('Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP', (err, res) => {
-        expect(err).to.not.exist
-        res.pipe(bl((err, bldata) => {
-          expect(err).to.not.exist
-          expect(bldata.toString()).to.contain(testfile.toString())
+
+        // accumulate the files and their content
+        var files = []
+        res.pipe(through.obj((file, enc, next) => {
+          file.content.pipe(concat((content) => {
+            files.push({
+              path: file.path,
+              content: content
+            })
+            next()
+          }))
+        }, () => {
+          expect(files).to.be.length(1)
+          expect(files[0].content.toString()).to.contain(testfile.toString())
           done()
         }))
       })
@@ -36,10 +50,20 @@ describe('.get', () => {
   it('get with archive true', (done) => {
     apiClients.a
       .get('Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP', {archive: true}, (err, res) => {
-        expect(err).to.not.exist
-        res.pipe(bl((err, bldata) => {
-          expect(err).to.not.exist
-          expect(bldata.toString()).to.contain(testfile.toString())
+
+        // accumulate the files and their content
+        var files = []
+        res.pipe(through.obj((file, enc, next) => {
+          file.content.pipe(concat((content) => {
+            files.push({
+              path: file.path,
+              content: content
+            })
+            next()
+          }))
+        }, () => {
+          expect(files).to.be.length(1)
+          expect(files[0].content.toString()).to.contain(testfile.toString())
           done()
         }))
       })