refactor: modularize files api(ipfs-inactive#544)

src/api/add.js → src/api/files/add.js

@@ -2,7 +2,7 @@
 
 const isStream = require('isstream')
 const promisify = require('promisify-es6')
-const DAGNodeStream = require('../dagnode-stream')
+const DAGNodeStream = require('../../dagnode-stream')
 
 module.exports = (send) => {
   return promisify((files, callback) => {

src/api/cat.js → src/api/files/cat.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const promisify = require('promisify-es6')
-const cleanCID = require('../clean-cid')
+const cleanCID = require('../../clean-cid')
 const v = require('is-ipfs')
 
 module.exports = (send) => {

src/api/files/cp.js

@@ -0,0 +1,17 @@
+'use strict'
+
+const promisify = require('promisify-es6')
+
+module.exports = (send) => {
+  return promisify((args, opts, callback) => {
+    if (typeof (opts) === 'function') {
+      callback = opts
+      opts = {}
+    }
+    send({
+      path: 'files/cp',
+      args: args,
+      qs: opts
+    }, callback)
+  })
+}

src/api/get.js → src/api/files/get.js

@@ -1,8 +1,8 @@
 'use strict'
 
 const promisify = require('promisify-es6')
-const cleanCID = require('../clean-cid')
-const TarStreamToObjects = require('../tar-stream-to-objects')
+const cleanCID = require('../../clean-cid')
+const TarStreamToObjects = require('../../tar-stream-to-objects')
 const v = require('is-ipfs')
 
 module.exports = (send) => {

src/api/files/index.js

@@ -0,0 +1,22 @@
+'use strict'
+
+const moduleConfig = require('../../module-config')
+
+module.exports = (arg) => {
+  const send = moduleConfig(arg)
+
+  return {
+    add: require('./add')(send),
+    createAddStream: require('./create-add-stream')(send),
+    get: require('./get')(send),
+    cat: require('./cat')(send),
+    cp: require('./cp')(send),
+    ls: require('./ls')(send),
+    mkdir: require('./mkdir')(send),
+    stat: require('./stat')(send),
+    rm: require('./rm')(send),
+    read: require('./read')(send),
+    write: require('./write')(send),
+    mv: require('./mv')(send)
+  }
+}

src/api/files/ls.js

@@ -0,0 +1,17 @@
+'use strict'
+
+const promisify = require('promisify-es6')
+
+module.exports = (send) => {
+  return promisify((args, opts, callback) => {
+    if (typeof (opts) === 'function') {
+      callback = opts
+      opts = {}
+    }
+    return send({
+      path: 'files/ls',
+      args: args,
+      qs: opts
+    }, callback)
+  })
+}

src/api/files/mkdir.js

@@ -0,0 +1,18 @@
+
+'use strict'
+
+const promisify = require('promisify-es6')
+
+module.exports = (send) => {
+  return promisify((args, opts, callback) => {
+    if (typeof (opts) === 'function') {
+      callback = opts
+      opts = {}
+    }
+    send({
+      path: 'files/mkdir',
+      args: args,
+      qs: opts
+    }, callback)
+  })
+}

src/api/files/mv.js

@@ -0,0 +1,18 @@
+'use strict'
+
+const promisify = require('promisify-es6')
+
+module.exports = (send) => {
+  return promisify((args, opts, callback) => {
+    if (typeof opts === 'function' &&
+      callback === undefined) {
+      callback = opts
+      opts = {}
+    }
+    send({
+      path: 'files/mv',
+      args: args,
+      qs: opts
+    }, callback)
+  })
+}

src/api/files/read.js

@@ -0,0 +1,17 @@
+'use strict'
+
+const promisify = require('promisify-es6')
+
+module.exports = (send) => {
+  return promisify((args, opts, callback) => {
+    if (typeof (opts) === 'function') {
+      callback = opts
+      opts = {}
+    }
+    send({
+      path: 'files/read',
+      args: args,
+      qs: opts
+    }, callback)
+  })
+}

src/api/files/rm.js

@@ -0,0 +1,27 @@
+'use strict'
+
+const promisify = require('promisify-es6')
+
+module.exports = (send) => {
+  return promisify((path, opts, callback) => {
+    if (typeof opts === 'function' &&
+      !callback) {
+      callback = opts
+      opts = {}
+    }
+
+    // opts is the real callback --
+    // 'callback' is being injected by promisify
+    if (typeof opts === 'function' &&
+      typeof callback === 'function') {
+      callback = opts
+      opts = {}
+    }
+
+    send({
+      path: 'files/rm',
+      args: path,
+      qs: opts
+    }, callback)
+  })
+}

src/api/files/stat.js

@@ -0,0 +1,17 @@
+'use strict'
+
+const promisify = require('promisify-es6')
+
+module.exports = (send) => {
+  return promisify((args, opts, callback) => {
+    if (typeof (opts) === 'function') {
+      callback = opts
+      opts = {}
+    }
+    send({
+      path: 'files/stat',
+      args: args,
+      qs: opts
+    }, callback)
+  })
+}

src/api/files/write.js

@@ -0,0 +1,28 @@
+'use strict'
+
+const promisify = require('promisify-es6')
+
+module.exports = (send) => {
+  return promisify((pathDst, files, opts, callback) => {
+    if (typeof opts === 'function' &&
+      !callback) {
+      callback = opts
+      opts = {}
+    }
+
+    // opts is the real callback --
+    // 'callback' is being injected by promisify
+    if (typeof opts === 'function' &&
+      typeof callback === 'function') {
+      callback = opts
+      opts = {}
+    }
+
+    send({
+      path: 'files/write',
+      args: pathDst,
+      qs: opts,
+      files: files
+    }, callback)
+  })
+}

src/load-commands.js

@@ -3,9 +3,9 @@
 function requireCommands () {
   const cmds = {
     // add and createAddStream alias
-    add: require('./api/add'),
-    cat: require('./api/cat'),
-    createAddStream: require('./api/create-add-stream'),
+    add: require('./api/files/add'),
+    cat: require('./api/files/cat'),
+    createAddStream: require('./api/files/create-add-stream'),
     bitswap: require('./api/bitswap'),
     block: require('./api/block'),
     bootstrap: require('./api/bootstrap'),
@@ -15,7 +15,7 @@ function requireCommands () {
     diag: require('./api/diag'),
     id: require('./api/id'),
     key: require('./api/key'),
-    get: require('./api/get'),
+    get: require('./api/files/get'),
     log: require('./api/log'),
     ls: require('./api/ls'),
     mount: require('./api/mount'),
@@ -35,18 +35,14 @@ function requireCommands () {
   // compatibility, until 'files vs mfs' naming decision is resolved.
   cmds.files = function (send) {
     const files = require('./api/files')(send)
-    files.add = require('./api/add')(send)
-    files.createAddStream = require('./api/create-add-stream.js')(send)
-    files.get = require('./api/get')(send)
-    files.cat = require('./api/cat')(send)
 
     return files
   }
 
   cmds.util = function (send) {
     const util = {
       addFromFs: require('./api/util/fs-add')(send),
-      addFromStream: require('./api/add')(send),
+      addFromStream: require('./api/files/add')(send),
       addFromURL: require('./api/util/url-add')(send)
     }
     return util