Support content as a Buffer.

Author: hackergrrl

package.json

@@ -56,8 +56,10 @@
     "debug": "^2.2.0",
     "ipfs-merkle-dag": "^0.5.0",
     "ipfs-unixfs": "^0.1.0",
+    "isstream": "^0.1.2",
     "readable-stream": "^1.1.13",
     "run-series": "^1.1.4",
+    "streamifier": "^0.1.1",
     "through2": "^2.0.0"
   },
   "contributors": [

src/importer.js

@@ -10,6 +10,8 @@ const UnixFS = require('ipfs-unixfs')
 const util = require('util')
 const bs58 = require('bs58')
 const Duplex = require('readable-stream').Duplex
+const isStream = require('isstream')
+const streamifier = require('streamifier')
 
 exports = module.exports = Importer
 
@@ -63,6 +65,18 @@ function Importer (dagService, options) {
       return
     }
 
+    // Convert a buffer to a readable stream
+    if (Buffer.isBuffer(fl.content)) {
+      const r = streamifier.createReadStream(fl.content)
+      fl.content = r
+    }
+
+    // Bail if 'content' is not readable
+    if (!isStream.isReadable(fl.content)) {
+      this.emit('error', new Error('"content" is not a Buffer nor Readable stream'))
+      return
+    }
+
     const leaves = []
     fl.content
       .pipe(fsc(CHUNK_SIZE))

test/test-importer.js

@@ -29,6 +29,17 @@ module.exports = function (repo) {
       done()
     })
 
+    it('bad input', (done) => {
+      const r = 'banana'
+      const i = new Importer(ds)
+      i.on('error', (err) => {
+        expect(err).to.exist
+        done()
+      })
+      i.write({path: '200Bytes.txt', content: r})
+      i.end()
+    })
+
     it('small file (smaller than a chunk)', (done) => {
       const buffered = smallFile
       const r = streamifier.createReadStream(buffered)
@@ -45,6 +56,21 @@ module.exports = function (repo) {
       })
     })
 
+    it('small file as buffer (smaller than a chunk)', (done) => {
+      const buffered = smallFile
+      const i = new Importer(ds)
+      i.on('data', (obj) => {
+        expect(obj.path).to.equal('200Bytes.txt')
+        expect(bs58.encode(obj.multihash)).to.equal('QmQmZQxSKQppbsWfVzBvg59Cn3DKtsNVQ94bjAxg2h3Lb8')
+        expect(obj.size).to.equal(211)
+      })
+      i.write({path: '200Bytes.txt', content: buffered})
+      i.end()
+      i.on('end', () => {
+        done()
+      })
+    })
+
     it('small file (smaller than a chunk) inside a dir', (done) => {
       const buffered = smallFile
       const r = streamifier.createReadStream(buffered)