From b69abcebbf4dfe7e1e6ad87ef0db733997209eef Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Thu, 22 Nov 2018 21:42:28 +0000
Subject: [PATCH] fix: support slashes in filenames

Someone, somewhere, will have a slash in a filename.  This upsets
the importer and exporters at the moment. This PR fixes the exporter.
---
 package.json          |  2 +-
 src/index.js          | 10 +++++++++-
 test/exporter.spec.js | 28 ++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 7b14e5e..5bd11f0 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "chai": "^4.2.0",
     "detect-node": "^2.0.4",
     "dirty-chai": "^2.0.1",
-    "ipfs-unixfs-importer": "~0.34.0",
+    "ipfs-unixfs-importer": "~0.36.0",
     "ipld": "~0.20.0",
     "ipld-dag-pb": "~0.15.0",
     "pull-pushable": "^2.2.0",
diff --git a/src/index.js b/src/index.js
index 0e93f7d..324de96 100644
--- a/src/index.js
+++ b/src/index.js
@@ -31,7 +31,7 @@ function pathBaseAndRest (path) {
 
   return {
     base: pathBase,
-    rest: pathRest.split('/').filter(Boolean)
+    rest: toPathComponents(pathRest)
   }
 }
 
@@ -104,3 +104,11 @@ function join (paths) {
     return acc + path
   }, '')
 }
+
+const toPathComponents = (path = '') => {
+  // split on / unless escaped with \
+  return (path
+    .trim()
+    .match(/([^\\\][^/]|\\\/)+/g) || [])
+    .filter(Boolean)
+}
diff --git a/test/exporter.spec.js b/test/exporter.spec.js
index 2983388..c99dcc3 100644
--- a/test/exporter.spec.js
+++ b/test/exporter.spec.js
@@ -229,6 +229,34 @@ describe('exporter', () => {
     })
   })
 
+  it('small file in a directory with an escaped slash in the title', (done) => {
+    const fileName = `small-\\/file-${Math.random()}.txt`
+    const filePath = `/foo/${fileName}`
+
+    pull(
+      pull.values([{
+        path: filePath,
+        content: pull.values([smallFile])
+      }]),
+      importer(ipld),
+      pull.collect((err, files) => {
+        expect(err).to.not.exist()
+
+        const path = `/ipfs/${new CID(files[1].multihash).toBaseEncodedString()}/${fileName}`
+
+        pull(
+          exporter(path, ipld),
+          pull.collect((err, files) => {
+            expect(err).to.not.exist()
+            expect(files.length).to.equal(1)
+            expect(files[0].path).to.equal(fileName)
+            done()
+          })
+        )
+      })
+    )
+  })
+
   it('exports a chunk of a file with no links', (done) => {
     const offset = 0
     const length = 5