use unixfs to check filetype + various cleanup

License: MIT
Signed-off-by: Rasmus Erik Voel Jensen <[email protected]>

Author: rasmuserik

src/cli/commands/ls.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const {print, rightpad} = require('../utils')
+const Unixfs = require('ipfs-unixfs')
 
 module.exports = {
   command: 'ls',
@@ -15,39 +16,31 @@ module.exports = {
       default: false
     },
     'resolve-type': {
-      desc: 'Resolve linked objects to find out their types.',
+      desc: 'Resolve linked objects to find out their types. (not implemented yet)',
       type: 'boolean',
-      default: false // TODO: should be true, false for now, as not implemented
+      default: false // should be true when implemented
     }
   },
 
   handler (argv) {
-    // TODO: should probably be refactored into a src/core/components/ls.js, and also exposed via the HTTP-API?
     console.log(argv._.length)
     if (argv._.length !== 2) {
-      // TODO
-      throw new Error('TODO not implemented yet: no arg => read from stdin, several args ls all of them, with header for each')
+      throw new Error('Other arguments than single hash not implemented yet.')
     }
 
     argv.ipfs.object.get(argv._[1], {enc: 'base58'}, (err, node) => {
       if (err) {
-        // TODO resolve path, to handle addresse like
-        // QmTkzDwWqPbnAh5YiV5VwcTLnGdwSNsNTn2aDxdXBFca7D/lib
-        // /ipfs/QmTkzDwWqPbnAh5YiV5VwcTLnGdwSNsNTn2aDxdXBFca7D
-        // (both fails in js-ipfs, works in go-ipfs)
         throw err
       }
       let {data, links} = node.toJSON()
 
-      // TODO: proper way to check type (via unixfs?), not hardcoded here
-      if (!data || data.length !== 2 ||
-          data[0] !== 8 || // ??? some multicodec id, or ? find out
-          data[1] !== 1) {  // unixfs directory type
+      const fileDesc = Unixfs.unmarshal(data)
+      if (fileDesc.type !== 'directory') {
         throw new Error('merkeldag node was not a directory') // TODO: support shards
       }
 
       if (argv['resolve-type']) {
-        throw new Error('--resolve-type not implemented yet') // TODO
+        throw new Error('--resolve-type not implemented yet')
       }
 
       if (argv.headers) {

test/cli/commands.js

@@ -4,7 +4,7 @@
 const expect = require('chai').expect
 const runOnAndOff = require('../utils/on-and-off')
 
-const commandCount = 56
+const commandCount = 57
 
 describe('commands', () => runOnAndOff((thing) => {
   let ipfs