Merge 93d9587 into 8d668f5

hlxjs · Jul 30, 2019 · 9e47c8e · 9e47c8e
2 parents 8d668f5 + 93d9587
commit 9e47c8e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/file.js b/file.js
@@ -28,7 +28,12 @@ function storeData({uri, parentUri, data}, {inputDir, outputDir}) {
       () => null
     );
     if (obj) {
-      localPath = path.join(outputDir, obj.pathname);
+      if (obj.protocol === 'file:') {
+        const pathname = path.relative(inputDir, obj.pathname);
+        localPath = path.join(outputDir, pathname);
+      } else {
+        localPath = path.join(outputDir, obj.pathname);
+      }
     } else {
       const pathname = path.relative(inputDir, path.join(parentUri, uri));
       localPath = path.join(outputDir, pathname);

diff --git a/test/spec/file.spec.js b/test/spec/file.spec.js
@@ -92,9 +92,9 @@ test.cb('file.storeData.Stream', t => {
     }
   };
 
-  storeData({uri: 'ghi.mp4', parentUri: 'file:///path/to/main.m3u8', data}, {inputDir: '/', outputDir: '/abc/def/'})
+  storeData({uri: 'ghi.mp4', parentUri: 'file:///path/to/main.m3u8', data}, {inputDir: '/path/to', outputDir: '/abc/def/'})
   .then(destPath => {
-    t.is(destPath, '/abc/def/path/to/ghi.mp4');
+    t.is(destPath, '/abc/def/ghi.mp4');
     t.is(spyCreateWriteStream.callCount, 1);
     t.end();
   });