Merge pull request #291 from ipfs/feature/createAddStream

feature - createAddStream

Author: daviddias

package.json

@@ -32,7 +32,7 @@
     "aegir": "^3.2.0",
     "chai": "^3.5.0",
     "gulp": "^3.9.1",
-    "interface-ipfs-core": "^0.2.0",
+    "interface-ipfs-core": "^0.2.2",
     "ipfsd-ctl": "^0.14.0",
     "pre-commit": "^1.1.2",
     "stream-equal": "^0.1.8",
@@ -93,4 +93,4 @@
     "url": "https://github.com/ipfs/js-ipfs-api/issues"
   },
   "homepage": "https://github.com/ipfs/js-ipfs-api"
-}
+}

src/api/add-stream.js

@@ -0,0 +1,36 @@
+'use strict'
+
+const addCmd = require('./add.js')
+const Duplex = require('stream').Duplex
+const promisify = require('promisify-es6')
+
+module.exports = (send) => {
+  const add = addCmd(send)
+
+  return promisify(function createAddStream (callback) {
+    const tuples = []
+
+    const ds = new Duplex({ objectMode: true })
+    ds._read = (n) => {}
+
+    ds._write = (file, enc, next) => {
+      tuples.push(file)
+      next()
+    }
+
+    ds.end = () => {
+      add(tuples, (err, res) => {
+        if (err) {
+          return ds.emit('error', err)
+        }
+
+        res.forEach((tuple) => {
+          ds.push(tuple)
+        })
+
+        ds.push(null)
+      })
+    }
+    callback(null, ds)
+  })
+}

src/get-files-stream.js

@@ -10,7 +10,7 @@ function headers (file) {
     'Content-Disposition': `file; filename="${name}"`
   }
 
-  if (file.dir) {
+  if (file.dir || !file.content) {
     header['Content-Type'] = 'application/x-directory'
   } else if (file.symlink) {
     header['Content-Type'] = 'application/symlink'
@@ -106,6 +106,11 @@ function getFilesStream (files, opts) {
       return loadPaths(opts, file)
     }
 
+    if (file.path && !file.content) {
+      file.dir = true
+      return file
+    }
+
     if (file.path && (file.content || file.dir)) {
       return file
     }

src/load-commands.js

@@ -1,7 +1,7 @@
 'use strict'
 
 function requireCommands () {
-  var cmds = {
+  const cmds = {
     bitswap: require('./api/bitswap'),
     block: require('./api/block'),
     cat: require('./api/cat'),
@@ -28,6 +28,10 @@ function requireCommands () {
   cmds.files = function (send) {
     const files = require('./api/files')(send)
     files.add = require('./api/add')(send)
+    files.createAddStream = require('./api/add-stream.js')(send)
+    // aliases
+    cmds.add = files.add
+    cmds.createAddStream = files.createAddStream
     return files
   }
 

src/request-api.js

@@ -144,8 +144,11 @@ exports = module.exports = function getRequestAPI (config) {
         return p.then((res) => {
           return new Promise(function (resolve, reject) {
             transform(null, res, send, function (err, res) {
-              if (err) reject(err)
-              else resolve(res)
+              if (err) {
+                reject(err)
+              } else {
+                resolve(res)
+              }
             })
           })
         })