add cli fix, cat cli fix, alias, interface-core tests

Author: nginnever

src/cli/commands/files/add.js

@@ -59,37 +59,41 @@ module.exports = Command.extend({
         if (err) {
           throw err
         }
-        const i = ipfs.files.add()
-        var filePair
-        i.on('data', (file) => {
-          console.log('added', bs58.encode(file.multihash).toString(), file.path)
-        })
-        i.once('end', () => {
-          return
-        })
-        if (res.length !== 0) {
-          const index = inPath.lastIndexOf('/')
-          parallelLimit(res.map((element) => (callback) => {
-            if (!fs.statSync(element).isDirectory()) {
-              i.write({
-                path: element.substring(index + 1, element.length),
-                stream: fs.createReadStream(element)
-              })
-            }
-            callback()
-          }), 10, (err) => {
-            if (err) {
-              throw err
-            }
-            i.end()
+        ipfs.files.add((err, i) => {
+          if (err) {
+            throw err
+          }
+          var filePair
+          i.on('data', (file) => {
+            console.log('added', bs58.encode(file.multihash).toString(), file.path)
           })
-        } else {
-          rs = fs.createReadStream(inPath)
-          inPath = inPath.substring(inPath.lastIndexOf('/') + 1, inPath.length)
-          filePair = {path: inPath, stream: rs}
-          i.write(filePair)
-          i.end()
-        }
+          i.once('end', () => {
+            return
+          })
+          if (res.length !== 0) {
+            const index = inPath.lastIndexOf('/')
+            parallelLimit(res.map((element) => (callback) => {
+              if (!fs.statSync(element).isDirectory()) {
+                i.write({
+                  path: element.substring(index + 1, element.length),
+                  stream: fs.createReadStream(element)
+                })
+              }
+              callback()
+            }), 10, (err) => {
+              if (err) {
+                throw err
+              }
+              i.end()
+            })
+          } else {
+            rs = fs.createReadStream(inPath)
+            inPath = inPath.substring(inPath.lastIndexOf('/') + 1, inPath.length)
+            filePair = {path: inPath, stream: rs}
+            i.write(filePair)
+            i.end()
+          }
+        })
       })
     })
   }

src/cli/commands/files/cat.js

@@ -31,13 +31,11 @@ module.exports = Command.extend({
         })
         return
       }
-      ipfs.files.cat(path, (err, res) => {
+      ipfs.files.cat(path, (err, file) => {
         if (err) {
           throw (err)
         }
-        res.on('data', (data) => {
-          data.stream.pipe(process.stdout)
-        })
+        file.pipe(process.stdout)
       })
     })
   }

src/core/index.js

@@ -57,5 +57,6 @@ function IPFS (repoInstance) {
   this.object = object(this)
   this.libp2p = libp2p(this)
   this.files = files(this)
+  this.cat = files(this).cat // Alias for js-ipfs-api cat
   this.bitswap = bitswap(this)
 }

src/core/ipfs/files.js

@@ -3,10 +3,11 @@
 const Importer = require('ipfs-unixfs-engine').importer
 const Exporter = require('ipfs-unixfs-engine').exporter
 const UnixFS = require('ipfs-unixfs')
+const promisify = require('promisify-es6')
 
 module.exports = function files (self) {
   return {
-    add: (arr, callback) => {
+    add: promisify((arr, callback) => {
       if (typeof arr === 'function') {
         callback = arr
         arr = undefined
@@ -15,7 +16,7 @@ module.exports = function files (self) {
         callback = function noop () {}
       }
       if (arr === undefined) {
-        return new Importer(self._dagS)
+        callback(null, new Importer(self._dagS))
       }
 
       const i = new Importer(self._dagS)
@@ -34,8 +35,13 @@ module.exports = function files (self) {
       })
 
       i.end()
-    },
-    cat: (hash, callback) => {
+    }),
+
+    cat: promisify((hash, callback) => {
+      if (typeof hash === 'function') {
+        callback = hash
+        return callback('You must supply a multihash', null)
+      }
       self._dagS.get(hash, (err, fetchedNode) => {
         if (err) {
           return callback(err, null)
@@ -45,13 +51,16 @@ module.exports = function files (self) {
           callback('This dag node is a directory', null)
         } else {
           const exportStream = Exporter(hash, self._dagS)
-          callback(null, exportStream)
+          exportStream.once('data', (object) => {
+            callback(null, object.stream)
+          })
         }
       })
-    },
-    get: (hash, callback) => {
+    }),
+
+    get: promisify((hash, callback) => {
       var exportFile = Exporter(hash, self._dagS)
       callback(null, exportFile)
-    }
+    })
   }
 }

src/http-api/resources/files.js

@@ -42,9 +42,7 @@ exports.cat = {
           Code: 0
         }).code(500)
       }
-      stream.on('data', (data) => {
-        return reply(data.stream)
-      })
+      return reply(stream)
     })
   }
 }

test/core-tests/test-files.js

@@ -1,64 +1,20 @@
 /* eslint-env mocha */
 'use strict'
 
-const bl = require('bl')
-const expect = require('chai').expect
-const Readable = require('stream').Readable
-const bs58 = require('bs58')
+const test = require('interface-ipfs-core')
 
 const IPFS = require('../../src/core')
 
-describe('files', () => {
-  let ipfs
-
-  before((done) => {
-    ipfs = new IPFS(require('./repo-path'))
-    ipfs.load(done)
-  })
-
-  it('add', (done) => {
-    const buffered = new Buffer('some data')
-    const rs = new Readable()
-    rs.push(buffered)
-    rs.push(null)
-    const arr = []
-    const filePair = {path: 'data.txt', stream: rs}
-    arr.push(filePair)
-    ipfs.files.add(arr, (err, res) => {
-      expect(err).to.not.exist
-      expect(res[0].path).to.equal('data.txt')
-      expect(res[0].size).to.equal(17)
-      expect(bs58.encode(res[0].multihash).toString()).to.equal('QmVv4Wz46JaZJeH5PMV4LGbRiiMKEmszPYY3g6fjGnVXBS')
-      done()
+const common = {
+  setup: function (cb) {
+    const ipfs = new IPFS(require('./repo-path'))
+    ipfs.load(() => {
+      cb(null, ipfs)
     })
-  })
+  },
+  teardown: function (cb) {
+    cb()
+  }
+}
 
-  it('cat', (done) => {
-    const hash = 'QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o'
-    ipfs.files.cat(hash, (err, res) => {
-      expect(err).to.not.exist
-      res.on('data', (data) => {
-        data.stream.pipe(bl((err, bldata) => {
-          expect(err).to.not.exist
-          expect(bldata.toString()).to.equal('hello world\n')
-          done()
-        }))
-      })
-    })
-  })
-
-  it('get', (done) => {
-    // TODO create non-trival get test
-    const hash = 'QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o'
-    ipfs.files.get(hash, (err, res) => {
-      expect(err).to.not.exist
-      res.on('data', (data) => {
-        data.stream.pipe(bl((err, bldata) => {
-          expect(err).to.not.exist
-          expect(bldata.toString()).to.equal('hello world\n')
-          done()
-        }))
-      })
-    })
-  })
-})
+test.files(common)