Merge pull request #272 from ipfs/object-proto

fix: add support for protobuf in object.put
ipfs-inactive · May 13, 2016 · 0711284 · 0711284
2 parents 388264c + 819bb38
commit 0711284
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/api/object.js b/src/api/object.js
@@ -68,21 +68,24 @@ module.exports = (send) => {
       }
       const enc = options.enc || 'json'
 
-      send('object/put', enc, null, buf, (err, result) => {
+      send('object/put', null, {inputenc: enc}, buf, (err, result) => {
         if (err) {
           return callback(err)
         }
 
         if (Buffer.isBuffer(obj)) {
           if (!options.enc) {
             obj = { Data: obj, Links: [] }
-          } else {
+          } else if (options.enc === 'json') {
             obj = JSON.parse(obj.toString())
           }
         }
         let node
         if (obj.multihash) {
           node = obj
+        } else if (options.enc === 'protobuf') {
+          node = new DAGNode()
+          node.unMarshal(obj)
         } else {
           node = new DAGNode(obj.Data, obj.Links)
         }