chore: cleanup, apply CR

Author: dignifiedquire

src/core/ipfs/files.js

@@ -50,24 +50,26 @@ module.exports = function files (self) {
         return callback(new Error('You must supply a multihash'))
       }
 
-      pull(
-        pull.values([hash]),
-        pull.asyncMap(self._dagS.get.bind(self._dagS)),
-        pull.take(1),
-        pull.map((node) => {
-          const data = UnixFS.unmarshal(node.data)
-          if (data.type === 'directory') {
-            return pull.error(new Error('This dag node is a directory'))
-          }
-
-          return exporter(hash, self._dagS)
-        }),
-        pull.flatten(),
-        pull.collect((err, files) => {
-          if (err) return callback(err)
-          callback(null, toStream.source(files[0].content))
-        })
-      )
+      self._dagS.get(hash, (err, node) => {
+        if (err) {
+          return callback(err)
+        }
+
+        const data = UnixFS.unmarshal(node.data)
+        if (data.type === 'directory') {
+          return callback(
+            new Error('This dag node is a directory')
+          )
+        }
+
+        pull(
+          exporter(hash, self._dagS),
+          pull.collect((err, files) => {
+            if (err) return callback(err)
+            callback(null, toStream.source(files[0].content))
+          })
+        )
+      })
     }),
 
     get: promisify((hash, callback) => {

src/http-api/resources/files.js

@@ -73,7 +73,15 @@ exports.get = {
     const pack = tar.pack()
 
     ipfs.files.getPull(key, (err, stream) => {
-      if (err) return handleError(err)
+      if (err) {
+        log.error(err)
+
+        reply({
+          Message: 'Failed to get file: ' + err,
+          Code: 0
+        }).code(500)
+        return
+      }
 
       pull(
         stream,
@@ -91,7 +99,15 @@ exports.get = {
           }
         }),
         pull.onEnd((err) => {
-          if (err) return handleError(err)
+          if (err) {
+            log.error(err)
+
+            reply({
+              Message: 'Failed to get file: ' + err,
+              Code: 0
+            }).code(500)
+            return
+          }
 
           pack.finalize()
         })
@@ -101,15 +117,6 @@ exports.get = {
       // to pull values through
       reply(pack).header('X-Stream-Output', '1')
     })
-
-    function handleError (err) {
-      log.error(err)
-
-      reply({
-        Message: 'Failed to get file: ' + err,
-        Code: 0
-      }).code(500)
-    }
   }
 }