return closest matched path on not found

Author: niinpatel

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

@@ -16,27 +16,36 @@ module.exports = function (self) {
     ipfsPath = normalizePath(ipfsPath)
 
     const pathComponents = ipfsPath.split('/')
-    const fileNameOrHash = pathComponents[pathComponents.length - 1]
     const cid = pathComponents[0]
-    const filePath = pathComponents.slice(1).join('/')
 
     if (options.preload !== false) {
       self._preload(pathComponents[0])
     }
 
     const d = deferred.source()
 
+    let closestMatchedLink
+
     pull(
-      exporter(ipfsPath, self._ipld, options),
-      pull.filter(file => file.path === fileNameOrHash),
+      exporter(cid, self._ipld, options),
+      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) {
+          closestMatchedLink = link
+        }
+
+        return link.path === ipfsPath
+      }),
       pull.take(1),
       pull.collect((err, files) => {
         if (err) {
           return d.abort(err)
         }
 
         if (!files.length) {
-          return d.abort(new Error(`no file named "${filePath}" under ${cid}`))
+          const fileNotFound = ipfsPath.substring(closestMatchedLink.path.length + 1)
+          return d.abort(new Error(`no file named "${fileNotFound}" under ${closestMatchedLink.path}`))
         }
 
         const file = files[0]