From 90581189cd939440b7923545636a6dbb2af1881b Mon Sep 17 00:00:00 2001
From: Friedel Ziegelmayer <dignifiedquire@gmail.com>
Date: Sat, 10 Dec 2016 21:31:37 +0100
Subject: [PATCH] feat(object): add template option to object.new

---
 src/cli/commands/object/new.js   |  4 ++--
 src/core/components/object.js    | 20 ++++++++++++++++++--
 src/http-api/resources/object.js |  3 ++-
 test/cli/test-object.js          |  8 ++++++++
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/cli/commands/object/new.js b/src/cli/commands/object/new.js
index ec2853ec3c..6a9d27b0df 100644
--- a/src/cli/commands/object/new.js
+++ b/src/cli/commands/object/new.js
@@ -7,7 +7,7 @@ const log = debug('cli:object')
 log.error = debug('cli:object:error')
 
 module.exports = {
-  command: 'new',
+  command: 'new [<template>]',
 
   describe: 'Create new ipfs objects',
 
@@ -16,7 +16,7 @@ module.exports = {
   handler (argv) {
     waterfall([
       (cb) => utils.getIPFS(cb),
-      (ipfs, cb) => ipfs.object.new(cb)
+      (ipfs, cb) => ipfs.object.new(argv.template, cb)
     ], (err, node) => {
       if (err) {
         throw err
diff --git a/src/core/components/object.js b/src/core/components/object.js
index 86f851798d..da0b4b65a9 100644
--- a/src/core/components/object.js
+++ b/src/core/components/object.js
@@ -7,6 +7,8 @@ const DAGNode = dagPB.DAGNode
 const DAGLink = dagPB.DAGLink
 const CID = require('cids')
 const mh = require('multihashes')
+const Unixfs = require('ipfs-unixfs')
+const assert = require('assert')
 
 function normalizeMultihash (multihash, enc) {
   if (typeof multihash === 'string') {
@@ -91,8 +93,22 @@ module.exports = function object (self) {
   }
 
   return {
-    new: promisify((callback) => {
-      DAGNode.create(new Buffer(0), (err, node) => {
+    new: promisify((template, callback) => {
+      if (typeof template === 'function') {
+        callback = template
+        template = undefined
+      }
+
+      let data
+
+      if (template) {
+        assert(template === 'unixfs-dir', 'unkown template')
+        data = (new Unixfs('directory')).marshal()
+      } else {
+        data = new Buffer(0)
+      }
+
+      DAGNode.create(data, (err, node) => {
         if (err) {
           return callback(err)
         }
diff --git a/src/http-api/resources/object.js b/src/http-api/resources/object.js
index 112735591b..a68132cf83 100644
--- a/src/http-api/resources/object.js
+++ b/src/http-api/resources/object.js
@@ -34,8 +34,9 @@ exports.parseKey = (request, reply) => {
 
 exports.new = (request, reply) => {
   const ipfs = request.server.app.ipfs
+  const template = request.query.arg
 
-  ipfs.object.new((err, node) => {
+  ipfs.object.new(template, (err, node) => {
     if (err) {
       log.error(err)
       return reply({
diff --git a/test/cli/test-object.js b/test/cli/test-object.js
index 383b32457b..c109f9cd2e 100644
--- a/test/cli/test-object.js
+++ b/test/cli/test-object.js
@@ -17,6 +17,14 @@ describe('object', () => {
       })
     })
 
+    it('new unixfs-dir', () => {
+      return ipfs('object new unixfs-dir').then((out) => {
+        expect(out).to.be.eql(
+          'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn'
+        )
+      })
+    })
+
     it('get', () => {
       return ipfs('object get QmdfTbBqBPQ7VNxZEYEj14VmRuZBkqFbiwReogJgS1zR1n').then((out) => {
         const result = JSON.parse(out)