refactoring

Author: niinpatel

src/core/components/files-regular/cat-pull-stream.js

@@ -28,10 +28,12 @@ module.exports = function (self) {
 
     pull(
       exporter(cid, self._ipld, options),
+      pull.filter(link => {
+        return link.path === ipfsPath.substring(0, link.path.length)
+      }),
       pull.filter(link => {
         // save the closest matched path so we can show in error if no file was found
-        if ((link.path === ipfsPath.substring(0, link.path.length) &&
-          link.depth > closestMatchedLink.depth) || !closestMatchedLink) {
+        if (!closestMatchedLink || link.depth > closestMatchedLink.depth) {
           closestMatchedLink = link
         }
 
@@ -44,8 +46,8 @@ module.exports = function (self) {
         }
 
         if (!files.length) {
-          const fileNotFound = ipfsPath.substring(closestMatchedLink.path.length + 1)
-          return d.abort(new Error(`no file named "${fileNotFound}" under ${closestMatchedLink.path}`))
+          const linkNotFound = ipfsPath.substring(closestMatchedLink.path.length + 1)
+          return d.abort(new Error(`no file named "${linkNotFound}" under ${closestMatchedLink.path}`))
         }
 
         const file = files[0]