Skip to content

Commit

Permalink
fix: clash conf empty line
Browse files Browse the repository at this point in the history
  • Loading branch information
@geekdada
geekdada committed Nov 27, 2019
1 parent 7d77ff0 commit 5af023d
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 11 deletions.
2 changes: 1 addition & 1 deletion lib/template.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default function getEngine(templateDir: string, publicUrl: string): nunju
return CLASH_UNSUPPORTED_RULE.every(s => !testString.startsWith(s));
})
.map((item: string) => {
if (item.startsWith('#') || str.trim() === '') {
if (item.startsWith('#') || item.trim() === '') {
return item;
}
return `- ${item}`
Expand Down
19 changes: 18 additions & 1 deletion test/asset/ForeignMedia.list
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,48 @@
USER-AGENT,Deezer*
DOMAIN-SUFFIX,deezer.com
DOMAIN-SUFFIX,dzcdn.net

# > KKBOX
DOMAIN-SUFFIX,kkbox.com
DOMAIN-SUFFIX,kkbox.com.tw
DOMAIN-SUFFIX,kfs.io

# > JOOX
USER-AGENT,WeMusic*
USER-AGENT,JOOX*
DOMAIN-SUFFIX,joox.com

# > Pandora
USER-AGENT,Pandora*
DOMAIN-SUFFIX,pandora.com

# > SoundCloud
USER-AGENT,SoundCloud*
DOMAIN-SUFFIX,p-cdn.us
DOMAIN-SUFFIX,sndcdn.com
DOMAIN-SUFFIX,soundcloud.com

# > Spotify
USER-AGENT,Spotify*
DOMAIN-SUFFIX,pscdn.co
DOMAIN-SUFFIX,scdn.co
DOMAIN-SUFFIX,spotify.com
DOMAIN-SUFFIX,spoti.fi

# > TIDAL
USER-AGENT,TIDAL*
DOMAIN-SUFFIX,tidal.com

# > YouTubeMusic
USER-AGENT,com.google.ios.youtubemusic*
USER-AGENT,YouTubeMusic*

# (Video)
# > All4
USER-AGENT,All4*
DOMAIN-SUFFIX,c4assets.com
DOMAIN-SUFFIX,channel4.com

# > AbemaTV
USER-AGENT,AbemaTV*
DOMAIN-SUFFIX,abema.io
Expand All @@ -47,6 +56,7 @@ DOMAIN,abematv.akamaized.net
DOMAIN,ds-linear-abematv.akamaized.net
DOMAIN,ds-vod-abematv.akamaized.net
DOMAIN,linear-abematv.akamaized.net

# > Amazon Prime Video
USER-AGENT,InstantVideo.US*
USER-AGENT,Prime%20Video*
Expand All @@ -55,36 +65,42 @@ DOMAIN-SUFFIX,aiv-delivery.net
DOMAIN-SUFFIX,amazonvideo.com
DOMAIN-SUFFIX,media-amazon.com
DOMAIN-SUFFIX,primevideo.com

# > Bahamut
USER-AGENT,Anime*
DOMAIN-SUFFIX,bahamut.com.tw
DOMAIN-SUFFIX,gamer.com.tw
DOMAIN,gamer-cds.cdn.hinet.net
DOMAIN,gamer2-cds.cdn.hinet.net

# > BBC iPlayer
USER-AGENT,BBCiPlayer*
DOMAIN-SUFFIX,bbc.co.uk
DOMAIN-SUFFIX,bbci.co.uk
DOMAIN-KEYWORD,bbcfmt
DOMAIN-KEYWORD,uk-live

# > DAZN
USER-AGENT,DAZN*
DOMAIN-SUFFIX,dazn.com
DOMAIN-SUFFIX,dazn-api.com
DOMAIN,d151l6v8er5bdm.cloudfront.net
DOMAIN-KEYWORD,voddazn

# > Disney+
USER-AGENT,Disney+*
DOMAIN-SUFFIX,bamgrid.com
DOMAIN-SUFFIX,disney-plus.net
DOMAIN-SUFFIX,disneyplus.com
DOMAIN-SUFFIX,dssott.com
DOMAIN,cdn.registerdisney.go.com

# > encoreTVB
USER-AGENT,encoreTVB*
DOMAIN-SUFFIX,encoretvb.com
DOMAIN,edge.api.brightcove.com
DOMAIN,bcbolt446c5271-a.akamaihd.net

# > Fox+ & Fox Now
USER-AGENT,FOX%20NOW*
USER-AGENT,FOXPlus*
Expand All @@ -95,6 +111,7 @@ DOMAIN-SUFFIX,foxplus.com
DOMAIN-SUFFIX,staticasiafox.akamaized.net
DOMAIN-SUFFIX,theplatform.com
DOMAIN-SUFFIX,uplynk.com

# > HBO Now & HBO GO
USER-AGENT,HBO%20NOW*
USER-AGENT,HBO%20GO*
Expand Down Expand Up @@ -200,4 +217,4 @@ USER-AGENT,com.google.ios.youtube*
USER-AGENT,YouTube*
DOMAIN-SUFFIX,googlevideo.com
DOMAIN-SUFFIX,youtube.com
DOMAIN,youtubei.googleapis.com
DOMAIN,youtubei.googleapis.com
40 changes: 38 additions & 2 deletions test/snapshots/template.test.ts.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,30 +219,39 @@ Generated by [AVA](https://ava.li).
# > Deezer␊
- DOMAIN-SUFFIX,deezer.com␊
- DOMAIN-SUFFIX,dzcdn.net␊
␊
# > KKBOX␊
- DOMAIN-SUFFIX,kkbox.com␊
- DOMAIN-SUFFIX,kkbox.com.tw␊
- DOMAIN-SUFFIX,kfs.io␊
␊
# > JOOX␊
- DOMAIN-SUFFIX,joox.com␊
␊
# > Pandora␊
- DOMAIN-SUFFIX,pandora.com␊
␊
# > SoundCloud␊
- DOMAIN-SUFFIX,p-cdn.us␊
- DOMAIN-SUFFIX,sndcdn.com␊
- DOMAIN-SUFFIX,soundcloud.com␊
␊
# > Spotify␊
- DOMAIN-SUFFIX,pscdn.co␊
- DOMAIN-SUFFIX,scdn.co␊
- DOMAIN-SUFFIX,spotify.com␊
- DOMAIN-SUFFIX,spoti.fi␊
␊
# > TIDAL␊
- DOMAIN-SUFFIX,tidal.com␊
␊
# > YouTubeMusic␊
␊
# (Video)␊
# > All4␊
- DOMAIN-SUFFIX,c4assets.com␊
- DOMAIN-SUFFIX,channel4.com␊
␊
# > AbemaTV␊
- DOMAIN-SUFFIX,abema.io␊
- DOMAIN-SUFFIX,ameba.jp␊
Expand All @@ -252,37 +261,44 @@ Generated by [AVA](https://ava.li).
- DOMAIN,ds-linear-abematv.akamaized.net␊
- DOMAIN,ds-vod-abematv.akamaized.net␊
- DOMAIN,linear-abematv.akamaized.net␊
␊
# > Amazon Prime Video␊
- DOMAIN-SUFFIX,aiv-cdn.net␊
- DOMAIN-SUFFIX,aiv-delivery.net␊
- DOMAIN-SUFFIX,amazonvideo.com␊
- DOMAIN-SUFFIX,media-amazon.com␊
- DOMAIN-SUFFIX,primevideo.com␊
␊
# > Bahamut␊
- DOMAIN-SUFFIX,bahamut.com.tw␊
- DOMAIN-SUFFIX,gamer.com.tw␊
- DOMAIN,gamer-cds.cdn.hinet.net␊
- DOMAIN,gamer2-cds.cdn.hinet.net␊
␊
# > BBC iPlayer␊
- DOMAIN-SUFFIX,bbc.co.uk␊
- DOMAIN-SUFFIX,bbci.co.uk␊
- DOMAIN-KEYWORD,bbcfmt␊
- DOMAIN-KEYWORD,uk-live␊
␊
# > DAZN␊
- DOMAIN-SUFFIX,dazn.com␊
- DOMAIN-SUFFIX,dazn-api.com␊
- DOMAIN,d151l6v8er5bdm.cloudfront.net␊
- DOMAIN-KEYWORD,voddazn␊
␊
# > Disney+␊
- DOMAIN-SUFFIX,bamgrid.com␊
- DOMAIN-SUFFIX,disney-plus.net␊
- DOMAIN-SUFFIX,disneyplus.com␊
- DOMAIN-SUFFIX,dssott.com␊
- DOMAIN,cdn.registerdisney.go.com␊
␊
# > encoreTVB␊
- DOMAIN-SUFFIX,encoretvb.com␊
- DOMAIN,edge.api.brightcove.com␊
- DOMAIN,bcbolt446c5271-a.akamaihd.net␊
␊
# > Fox+ & Fox Now␊
- DOMAIN-SUFFIX,dashasiafox.akamaized.net␊
- DOMAIN-SUFFIX,fox.com␊
Expand All @@ -291,6 +307,7 @@ Generated by [AVA](https://ava.li).
- DOMAIN-SUFFIX,staticasiafox.akamaized.net␊
- DOMAIN-SUFFIX,theplatform.com␊
- DOMAIN-SUFFIX,uplynk.com␊
␊
# > HBO Now & HBO GO␊
- DOMAIN-SUFFIX,hbo.com␊
- DOMAIN-SUFFIX,hbogo.com␊
Expand Down Expand Up @@ -378,7 +395,8 @@ Generated by [AVA](https://ava.li).
# > YouTube␊
- DOMAIN-SUFFIX,googlevideo.com␊
- DOMAIN-SUFFIX,youtube.com␊
- DOMAIN,youtubei.googleapis.com`
- DOMAIN,youtubei.googleapis.com␊
`

> Snapshot 3
Expand All @@ -387,30 +405,39 @@ Generated by [AVA](https://ava.li).
# > Deezer␊
DOMAIN-SUFFIX,deezer.com␊
DOMAIN-SUFFIX,dzcdn.net␊
␊
# > KKBOX␊
DOMAIN-SUFFIX,kkbox.com␊
DOMAIN-SUFFIX,kkbox.com.tw␊
DOMAIN-SUFFIX,kfs.io␊
␊
# > JOOX␊
DOMAIN-SUFFIX,joox.com␊
␊
# > Pandora␊
DOMAIN-SUFFIX,pandora.com␊
␊
# > SoundCloud␊
DOMAIN-SUFFIX,p-cdn.us␊
DOMAIN-SUFFIX,sndcdn.com␊
DOMAIN-SUFFIX,soundcloud.com␊
␊
# > Spotify␊
DOMAIN-SUFFIX,pscdn.co␊
DOMAIN-SUFFIX,scdn.co␊
DOMAIN-SUFFIX,spotify.com␊
DOMAIN-SUFFIX,spoti.fi␊
␊
# > TIDAL␊
DOMAIN-SUFFIX,tidal.com␊
␊
# > YouTubeMusic␊
␊
# (Video)␊
# > All4␊
DOMAIN-SUFFIX,c4assets.com␊
DOMAIN-SUFFIX,channel4.com␊
␊
# > AbemaTV␊
DOMAIN-SUFFIX,abema.io␊
DOMAIN-SUFFIX,ameba.jp␊
Expand All @@ -420,37 +447,44 @@ Generated by [AVA](https://ava.li).
DOMAIN,ds-linear-abematv.akamaized.net␊
DOMAIN,ds-vod-abematv.akamaized.net␊
DOMAIN,linear-abematv.akamaized.net␊
␊
# > Amazon Prime Video␊
DOMAIN-SUFFIX,aiv-cdn.net␊
DOMAIN-SUFFIX,aiv-delivery.net␊
DOMAIN-SUFFIX,amazonvideo.com␊
DOMAIN-SUFFIX,media-amazon.com␊
DOMAIN-SUFFIX,primevideo.com␊
␊
# > Bahamut␊
DOMAIN-SUFFIX,bahamut.com.tw␊
DOMAIN-SUFFIX,gamer.com.tw␊
DOMAIN,gamer-cds.cdn.hinet.net␊
DOMAIN,gamer2-cds.cdn.hinet.net␊
␊
# > BBC iPlayer␊
DOMAIN-SUFFIX,bbc.co.uk␊
DOMAIN-SUFFIX,bbci.co.uk␊
DOMAIN-KEYWORD,bbcfmt␊
DOMAIN-KEYWORD,uk-live␊
␊
# > DAZN␊
DOMAIN-SUFFIX,dazn.com␊
DOMAIN-SUFFIX,dazn-api.com␊
DOMAIN,d151l6v8er5bdm.cloudfront.net␊
DOMAIN-KEYWORD,voddazn␊
␊
# > Disney+␊
DOMAIN-SUFFIX,bamgrid.com␊
DOMAIN-SUFFIX,disney-plus.net␊
DOMAIN-SUFFIX,disneyplus.com␊
DOMAIN-SUFFIX,dssott.com␊
DOMAIN,cdn.registerdisney.go.com␊
␊
# > encoreTVB␊
DOMAIN-SUFFIX,encoretvb.com␊
DOMAIN,edge.api.brightcove.com␊
DOMAIN,bcbolt446c5271-a.akamaihd.net␊
␊
# > Fox+ & Fox Now␊
DOMAIN-SUFFIX,dashasiafox.akamaized.net␊
DOMAIN-SUFFIX,fox.com␊
Expand All @@ -459,6 +493,7 @@ Generated by [AVA](https://ava.li).
DOMAIN-SUFFIX,staticasiafox.akamaized.net␊
DOMAIN-SUFFIX,theplatform.com␊
DOMAIN-SUFFIX,uplynk.com␊
␊
# > HBO Now & HBO GO␊
DOMAIN-SUFFIX,hbo.com␊
DOMAIN-SUFFIX,hbogo.com␊
Expand Down Expand Up @@ -546,7 +581,8 @@ Generated by [AVA](https://ava.li).
# > YouTube␊
DOMAIN-SUFFIX,googlevideo.com␊
DOMAIN-SUFFIX,youtube.com␊
DOMAIN,youtubei.googleapis.com`
DOMAIN,youtubei.googleapis.com␊
`

## quantumultx filter 2

Expand Down
Binary file modified test/snapshots/template.test.ts.snap
View file
Binary file not shown.
Loading

0 comments on commit 5af023d

Please sign in to comment.