feat: adds data-encoding argument to control data encoding

Author: achingbrain

src/cli/commands/object/get.js

@@ -7,7 +7,12 @@ module.exports = {
 
   describe: 'Get and serialize the DAG node named by <key>',
 
-  builder: {},
+  builder: {
+    'data-encoding': {
+      type: 'string',
+      default: 'base64'
+    }
+  },
 
   handler (argv) {
     argv.ipfs.object.get(argv.key, {enc: 'base58'}, (err, node) => {
@@ -16,7 +21,9 @@ module.exports = {
       }
       const nodeJSON = node.toJSON()
 
-      nodeJSON.data = nodeJSON.data ? nodeJSON.data.toString() : ''
+      if (Buffer.isBuffer(node.data)) {
+        nodeJSON.data = node.data.toString(argv['data-encoding'] || undefined)
+      }
 
       const answer = {
         Data: nodeJSON.data,

src/http/api/resources/object.js

@@ -85,7 +85,9 @@ exports.get = {
 
       const nodeJSON = node.toJSON()
 
-      nodeJSON.data = nodeJSON.data ? nodeJSON.data.toString() : ''
+      if (Buffer.isBuffer(node.data)) {
+        nodeJSON.data = node.data.toString(request.query['data-encoding'] || undefined)
+      }
 
       const answer = {
         Data: nodeJSON.data,

test/cli/object.js

@@ -41,6 +41,30 @@ describe('object', () => runOnAndOff((thing) => {
     })
   })
 
+  it('get with data', () => {
+    return ipfs('object new')
+      .then((out) => out.trim())
+      .then((hash) => ipfs(`object patch set-data ${hash} test/fixtures/test-data/hello`))
+      .then((out) => out.trim())
+      .then((hash) => ipfs(`object get ${hash}`))
+      .then((out) => {
+        const result = JSON.parse(out)
+        expect(result.Data).to.eql('aGVsbG8gd29ybGQK')
+      })
+  })
+
+  it('get while overriding data-encoding', () => {
+    return ipfs('object new')
+      .then((out) => out.trim())
+      .then((hash) => ipfs(`object patch set-data ${hash} test/fixtures/test-data/hello`))
+      .then((out) => out.trim())
+      .then((hash) => ipfs(`object get --data-encoding=utf8 ${hash}`))
+      .then((out) => {
+        const result = JSON.parse(out)
+        expect(result.Data).to.eql('hello world\n')
+      })
+  })
+
   it('put', () => {
     return ipfs('object put test/fixtures/test-data/node.json').then((out) => {
       expect(out).to.eql(