« get me outta code hell

Merge branch 'master' of https://github.com/liam4/http-music - http-music - Command-line music player + utils (not a server!)
about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorrie <towerofnix@gmail.com>2017-08-04 11:37:45 -0300
committerFlorrie <towerofnix@gmail.com>2017-08-04 11:37:45 -0300
commite9d81816c01bdfe874ed04f1d702302a92f66bf1 (patch)
tree78201162eca166fff2bdea8c1547967585495007
parentff29679c019efb0273ae3574bdcc7254c72f755f (diff)
parent3b6b9425b84f624b4cca9c3e8123e7f5554aed51 (diff)
Merge branch 'master' of https://github.com/liam4/http-music
-rwxr-xr-xsrc/crawl-http.js12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/crawl-http.js b/src/crawl-http.js
index 59777ca..826e4d5 100755
--- a/src/crawl-http.js
+++ b/src/crawl-http.js
@@ -47,7 +47,15 @@ function crawl(absURL, opts = {}, internals = {}) {
         const links = getHTMLLinks(text)
 
         return Promise.all(links.map(link => {
-          const [ name, href ] = link
+          let [ name, href ] = link
+
+          // If the name (that's the content inside of <a>..</a>) ends with a
+          // slash, that's probably just an artifact of a directory lister;
+          // not actually part of the intended content. So we remove it!
+          if (name.endsWith('/')) {
+            name = name.slice(0, -1)
+          }
+
           const urlObj = new url.URL(href, absURL)
           const linkURL = url.format(urlObj)
 
@@ -77,7 +85,7 @@ function crawl(absURL, opts = {}, internals = {}) {
             verboseLog("[Dir] " + linkURL)
 
             return crawl(linkURL, opts, Object.assign({}, internals))
-              .then(items => ({name, items}))
+              .then(({ items }) => ({name, items}))
           } else {
             // It's a file!