Merge 2f5dbcf into 673cf1a

Author: kuu

default.js

@@ -77,11 +77,11 @@ function rewrite(uri, base) {
     print(`\t>>> "${uri}"`);
     return uri;
   }
-  const relativeToPlaylist = createRelativeFunc(path.join('/', playlistUrl.hostname, playlistUrl.pathname));
+  const relativeToPlaylist = createRelativeFunc(playlistUrl.pathname);
   let result;
   if (url.protocol === playlistUrl.protocol && url.hostname === playlistUrl.hostname) {
     print('\tpattern-A');
-    result = relativeToPlaylist(path.join('/', url.hostname, url.pathname));
+    result = relativeToPlaylist(url.pathname);
   } else {
     print('\tpattern-B');
     result = relativeToPlaylist(path.join(playlistUrl.protocol === 'file:' ? rootPath : '/', url.hostname, url.pathname));

test/fixture/after/03.m3u8

@@ -8,5 +8,5 @@ first.ts
 #EXTINF:9.009,
 ../low/third.ts
 #EXTINF:3.003,
-../../media2.example.com/low/fourth.ts
+../media2.example.com/low/fourth.ts
 #EXT-X-ENDLIST

test/fixture/after/04.m3u8

@@ -2,14 +2,14 @@
 #EXT-X-VERSION:6
 #EXT-X-TARGETDURATION:15
 #EXT-X-MEDIA-SEQUENCE:7794
-#EXT-X-KEY:METHOD=AES-128,URI="../../priv.example.com/key.php?r=52"
+#EXT-X-KEY:METHOD=AES-128,URI="../priv.example.com/key.php?r=52"
 #EXT-X-MAP:URI="../map"
 #EXTINF:2.833,
 ../fileSequence52-A.mp4
 #EXTINF:15,
 ../fileSequence52-B.mp4
 #EXTINF:13.333,
 ../fileSequence52-C.mp4
-#EXT-X-KEY:METHOD=AES-128,URI="../../priv.example.com/key.php?r=53"
+#EXT-X-KEY:METHOD=AES-128,URI="../priv.example.com/key.php?r=53"
 #EXTINF:15,
 ../fileSequence53-A.mp4

test/fixture/after/05.m3u8

@@ -1,17 +1,17 @@
 #EXTM3U
-#EXT-X-SESSION-DATA:DATA-ID="com.example.lyrics",URI="../foo.bar/lyrics.json"
-#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=86000,URI="../foo.bar/low/iframe.m3u8",CODECS="avc1.640029"
-#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",NAME="English",DEFAULT=YES,AUTOSELECT=YES,LANGUAGE="en",URI="../foo.bar/main/english-audio.m3u8"
-#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",NAME="Deutsch",DEFAULT=NO,AUTOSELECT=YES,LANGUAGE="de",URI="../foo.bar/main/german-audio.m3u8"
-#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",NAME="Commentary",DEFAULT=NO,AUTOSELECT=NO,LANGUAGE="en",URI="../foo.bar/commentary/audio-only.m3u8"
+#EXT-X-SESSION-DATA:DATA-ID="com.example.lyrics",URI="foo.bar/lyrics.json"
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=86000,URI="foo.bar/low/iframe.m3u8",CODECS="avc1.640029"
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",NAME="English",DEFAULT=YES,AUTOSELECT=YES,LANGUAGE="en",URI="foo.bar/main/english-audio.m3u8"
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",NAME="Deutsch",DEFAULT=NO,AUTOSELECT=YES,LANGUAGE="de",URI="foo.bar/main/german-audio.m3u8"
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",NAME="Commentary",DEFAULT=NO,AUTOSELECT=NO,LANGUAGE="en",URI="foo.bar/commentary/audio-only.m3u8"
 #EXT-X-STREAM-INF:BANDWIDTH=1280000,CODECS="mp4a.40.2",AUDIO="aac"
 low/video-only.m3u8
-#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=86000,URI="../foo.bar/mid/iframe.m3u8",CODECS="avc1.640029"
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=86000,URI="foo.bar/mid/iframe.m3u8",CODECS="avc1.640029"
 #EXT-X-STREAM-INF:BANDWIDTH=2560000,CODECS="mp4a.40.2",AUDIO="aac"
 mid/video-only.m3u8
-#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=86000,URI="../foo.bar/hi/iframe.m3u8",CODECS="avc1.640029"
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=86000,URI="foo.bar/hi/iframe.m3u8",CODECS="avc1.640029"
 #EXT-X-STREAM-INF:BANDWIDTH=7680000,CODECS="mp4a.40.2",AUDIO="aac"
 hi/video-only.m3u8
-#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=86000,URI="../foo.bar/main/iframe.m3u8",CODECS="avc1.640029"
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=86000,URI="foo.bar/main/iframe.m3u8",CODECS="avc1.640029"
 #EXT-X-STREAM-INF:BANDWIDTH=65000,CODECS="mp4a.40.5",AUDIO="aac"
 main/english-audio.m3u8

test/spec/index.spec.js

@@ -30,7 +30,7 @@ const objects = [
 const urlsExpected = [
   'abc.ts',
   '../def.ts',
-  '../../foo.bar/ghi.ts'
+  '../foo.bar/ghi.ts'
 ];
 const urlsActual = [];