Merge pull request #7 from hlxjs/issues/fix-dest-path

Fix dest path issue

file.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 
-const {getPath} = require('./util');
+const {tryCatch} = require('hlx-util');
 
 function storeData({uri, data}, rootPath) {
   if (!data) {
@@ -14,10 +14,15 @@ function storeData({uri, data}, rootPath) {
 
   let localPath;
 
-  if (path.isAbsolute(uri) && fs.existsSync(uri)) {
-    localPath = path.join(rootPath, path.basename(uri));
+  if (path.isAbsolute(uri)) {
+    localPath = path.join(rootPath, path.relative(rootPath, uri));
   } else {
-    localPath = path.join(rootPath, getPath(uri));
+    const obj = tryCatch(
+      () => new URL(uri),
+      () => new URL(uri, rootPath),
+      () => null
+    );
+    localPath = path.join(rootPath, obj ? obj.pathname : uri);
   }
 
   // Create directory

package.json

@@ -50,7 +50,8 @@
   },
   "dependencies": {
     "debug": "^4.1.1",
-    "hls-parser": "^0.4.3"
+    "hls-parser": "^0.4.4",
+    "hlx-util": "0.0.2"
   },
   "devDependencies": {
     "ava": "^2.2.0",

test/spec/file.spec.js

@@ -33,6 +33,37 @@ test.cb('file.storeData.Buffer', t => {
   });
 });
 
+test.cb('file.storeData.Buffer.path', t => {
+  const mockFs = {
+    writeFile(path, data, cb) {
+      setImmediate(() => {
+        cb(null, path);
+      });
+    },
+    existsSync() {
+      return true;
+    },
+    lstatSync() {
+      return {
+        isDirectory() {
+          return true;
+        }
+      };
+    }
+  };
+
+  delete require.cache[require.resolve('fs')];
+  const {storeData} = proxyquire('../../file', {fs: mockFs});
+  const spyWriteFile = sinon.spy(mockFs, 'writeFile');
+
+  storeData({uri: '/abc/def/ghi/jkl.mp4', data: Buffer.alloc(10)}, '/abc/def/')
+  .then(destPath => {
+    t.is(destPath, '/abc/def/ghi/jkl.mp4');
+    t.is(spyWriteFile.callCount, 1);
+    t.end();
+  });
+});
+
 test.cb('file.storeData.Stream', t => {
   const mockFs = {
     createWriteStream(path) {