Fixes #804: ensure POSIX-style remains in datapackage resources.

qcif · Jul 5, 2018 · 19e9be1 · 19e9be1
1 parent 26cfcb8
commit 19e9be1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/renderer/frictionlessDataPackage.js b/src/renderer/frictionlessDataPackage.js
@@ -251,5 +251,7 @@ function addPath(descriptor, tabId) {
   let parent = 'data'
   let filename = tabStore.state.tabObjects[tabId].filename
   let basename = path.basename(filename)
-  descriptor.path = path.join(parent, basename)
+  let osPath = path.join(parent, basename)
+  // resource paths must be POSIX https://frictionlessdata.io/specs/data-resource/#url-or-path
+  descriptor.path = _.replace(osPath, '\\', '/')
 }
diff --git a/src/renderer/importPackage.js b/src/renderer/importPackage.js
@@ -170,8 +170,8 @@ async function getHotIdsFromFilenames(processed, unzipDestination, isTransient =
       throw new Error(`There was a problem matching ${fileDestination} with an opened tab.`)
     }
     let hotId = _.findKey(store.getters.getHotTabs, {tabId: tabId})
-    // ensure csv path accounts for parent folders zipped up and windows path separator (as same as regexp escape)
-    const regExpPathSeparator = path.sep === '/' ? path.sep : path.sep + path.sep
+    // ensure csv path accounts for parent folders within zip - paths must be POSIX-only https://frictionlessdata.io/specs/data-resource/#url-or-path
+    const regExpPathSeparator = '/'
     let re = new RegExp('^' + processed.parentFolders + regExpPathSeparator)
     let resourcePathname = _.replace(pathname, re, '')
     csvTabs[`${resourcePathname}`] = hotId