Merge branch 'master' into Dum4G-patch-1

.github/workflows/auto-update.yml

@@ -32,7 +32,6 @@ jobs:
             ag,
             al,
             am,
-            an,
             ao,
             ar,
             at,

channels/am.m3u

@@ -6,12 +6,9 @@ http://amtv1.livestreamingcdn.com/am2abr/index.m3u8
 http://ott-cdn.ucom.am/s10/index.m3u8
 #EXTINF:-1 tvg-id="5TV.am" tvg-name="5TV" tvg-country="AM" tvg-language="Armenian" tvg-logo="https://i.imgur.com/yigw9dr.png" group-title="",5TV (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
-http://ott-cdn.ucom.am/s6/04.m3u8
+http://ott-cdn.ucom.am/s6/index.m3u8
 #EXTINF:-1 tvg-id="Amga.am" tvg-name="Amga" tvg-country="AM" tvg-language="Armenian" tvg-logo="https://i.imgur.com/3vQVwUV.jpg" group-title="",Amga (720p) [Not 24/7]
 https://streamer1.connectto.com/AMGA_WEB_1202/playlist.m3u8
-#EXTINF:-1 tvg-id="AraratTV.am" tvg-name="Ararat TV" tvg-country="AM" tvg-language="Armenian" tvg-logo="https://i.imgur.com/nCdGhjB.png" group-title="",Ararat TV (480p)
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
-http://ott-cdn.ucom.am/s6/index.m3u8
 #EXTINF:-1 tvg-id="Armenia2.am" tvg-name="Armenia 2" tvg-country="AM" tvg-language="Armenian" tvg-logo="https://i.imgur.com/XwbLfqd.png" group-title="",Armenia 2 (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s22/index.m3u8

channels/an.m3u

@@ -1,3 +0,0 @@
-#EXTM3U
-#EXTINF:-1 tvg-id="BonceTV.an" tvg-name="Bonce TV" tvg-country="AN" tvg-language="" tvg-logo="" group-title="",Bonce TV (480p)
-https://seswa.bonce.tv/hls/bonceswa.m3u8

channels/cw.m3u

@@ -11,3 +11,5 @@ http://edge1.tvdirect13.com/live/smil:mystream.smil/playlist_720p.m3u8
 https://edge1.tvdirect13.com/live/playlist_720p.m3u8
 #EXTINF:-1 tvg-id="TVDirect13.cw" tvg-name="TV Direct 13" tvg-country="CW" tvg-language="English" tvg-logo="https://i.imgur.com/icDfA5x.jpg" group-title="",TV Direct 13 (720p)
 https://edge1.tvdirect13.com/live/smil:mystream.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="BonceTV.cw" tvg-name="Bonce TV" tvg-country="CW" tvg-language="" tvg-logo="" group-title="",Bonce TV (480p)
+https://seswa.bonce.tv/hls/bonceswa.m3u8

channels/fr.m3u

@@ -275,8 +275,6 @@ http://lb.streaming.sk/fashiontv/stream/playlist.m3u8
 https://fash2043.cloudycdn.services/slive/ftv_ftv_pg13_gmt_ess_43126_default_1262_hls.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="France2.fr" tvg-name="France 2" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="",France 2 (720p)
 http://edge9.iptvnetwork.net/live/france2/playlist.m3u8
-#EXTINF:-1 tvg-id="France24.fr" tvg-name="France 24" tvg-country="FR" tvg-language="" tvg-logo="" group-title="",France 24 (576p)
-http://f24hls-i.akamaihd.net/hls/live/221193/F24_EN_LO_HLS/master_old_900.m3u8
 #EXTINF:-1 tvg-id="France24Arabic.fr" tvg-name="France 24 Arabic" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/61MSiq9.png" group-title="News",France 24 Arabic (1080p)
 https://static.france24.com/live/F24_AR_HI_HLS/live_tv.m3u8
 #EXTINF:-1 tvg-id="France24Arabic.fr" tvg-name="France 24 Arabic" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/61MSiq9.png" group-title="News",France 24 Arabic (576p)

channels/hk.m3u

@@ -42,12 +42,10 @@ https://www.rthk.hk/feeds/dtt/rthktv32_https.m3u8
 http://61.238.6.49:8000/bysid/1
 #EXTINF:-1 tvg-id="YaoCaiCaiJingTai.hk" tvg-name="耀才財經台" tvg-country="HK" tvg-language="Chinese;Yue Chinese" tvg-logo="https://i.imgur.com/xliVoIt.jpg?1" group-title="Shop",耀才財經台 (576p)
 http://202.69.67.66:443/webcast/bshdlive-pc/playlist.m3u8
-#EXTINF:-1 tvg-id="XiangGangKaiDianShiHKSTVHKS.hk" tvg-name="香港开电视 / HKSTV-HKS" tvg-country="HK" tvg-language="" tvg-logo="" group-title="",香港开电视 / HKSTV-HKS (720p)
+#EXTINF:-1 tvg-id="XiangGangKaiDianShiHKSTVHKS.hk" tvg-name="香港开电视 / HKSTV-HKS" tvg-country="HK" tvg-language="Chinese;Yue Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/e/ed/HK_open_tv_logo.jpg" group-title="",香港开电视 / HKSTV-HKS (720p)
 http://media.fantv.hk/m3u8/archive/channel2.m3u8
 #EXTINF:-1 tvg-id="XiangGangWeiShi.hk" tvg-name="香港衛視" tvg-country="HK" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://i.imgur.com/wnQPn2d.jpg" group-title="",香港衛視 [Offline]
 http://zhibo.hkstv.tv/livestream/mutfysrq/playlist.m3u8
-#EXTINF:-1 tvg-id="XiangGangKaiDianShi.hk" tvg-name="香港開電視" tvg-country="HK" tvg-language="Chinese;Yue Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/e/ed/HK_open_tv_logo.jpg" group-title="General",香港開電視 (720p)
-http://media.fantv.hk/m3u8/archive/channel2_stream1.m3u8
 #EXTINF:-1 tvg-id="FengHuangWeiShiZhongWenTai.hk" tvg-name="鳳凰衛視中文台" tvg-country="HK" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://pbs.twimg.com/profile_images/1246604721462239232/QCKNvVux_400x400.jpg" group-title="",鳳凰衛視中文台
 http://221.179.217.70/PLTV/88888888/224/3221225942/1.m3u8
 #EXTINF:-1 tvg-id="FengHuangZiXun.hk" tvg-name="鳳凰資訊" tvg-country="HK" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/thumb/1/16/Phoenix_InfoNews.svg/1200px-Phoenix_InfoNews.svg.png" group-title="News",鳳凰衛視資訊台HD

channels/id.m3u

@@ -27,22 +27,22 @@ https://liveanevia.mncnow.id/live/eds/HitsMovies/sa_dash_vmx/HitsMovies.mpd
 http://iamchannel.org:1935/tes/1/playlist.m3u8
 #EXTINF:-1 tvg-id="IndonesiaChannel.id" tvg-name="Indonesia Channel" tvg-country="ID" tvg-language="" tvg-logo="" group-title="",Indonesia Channel (720p)
 http://wowzaprod236-i.akamaihd.net/hls/live/1019903/7dd4cf51/playlist.m3u8
-#EXTINF:-1 tvg-id="Indosiar.id" tvg-name="Indosiar" tvg-country="ID" tvg-language="Indonesian" tvg-logo="" group-title="General",Indosiar [Offline]
+#EXTINF:-1 tvg-id="Indosiar.id" tvg-name="Indosiar" tvg-country="ID" tvg-language="Indonesian" tvg-logo="" group-title="General",Indosiar
-https://query-streamlink.lanesh4d0w.repl.co/iptv-query?streaming-ip=https://www.vidio.com/live/205-indosiar
+https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.vidio.com/live/205-indosiar
 #EXTINF:-1 tvg-id="iNews.id" tvg-name="iNews" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040337.png" group-title="News",iNews (720p)
 https://vcdn2.rctiplus.id/live/eds/inews_fta/live_fta/inews_fta.m3u8
-#EXTINF:-1 tvg-id="KompasTV.id" tvg-name="Kompas TV" tvg-country="ID" tvg-language="Indonesian" tvg-logo="" group-title="News",Kompas TV [Offline]
+#EXTINF:-1 tvg-id="KompasTV.id" tvg-name="Kompas TV" tvg-country="ID" tvg-language="Indonesian" tvg-logo="" group-title="News",Kompas TV
-https://query-streamlink.lanesh4d0w.repl.co/iptv-query?streaming-ip=https://www.vidio.com/live/874-kompas-tv
+https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.vidio.com/live/874-kompas-tv
 #EXTINF:-1 tvg-id="MetroTV.id" tvg-name="Metro TV" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040416.png" group-title="News",Metro TV (720p)
 http://edge.metrotvnews.com:1935/live-edge/smil:metro.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="MNCTV.id" tvg-name="MNCTV" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://i.postimg.cc/rw8620qS/20191026-003920.png" group-title="General",MNCTV (720p)
 https://vcdn2.rctiplus.id/live/eds/mnctv_fta/live_fta/mnctv_fta.m3u8
-#EXTINF:-1 tvg-id="MyTV.id" tvg-name="MyTV" tvg-country="ID" tvg-language="Indonesian" tvg-logo="" group-title="",MyTV [Offline]
+#EXTINF:-1 tvg-id="MyTV.id" tvg-name="MyTV" tvg-country="ID" tvg-language="Indonesian" tvg-logo="" group-title="",MyTV
-https://query-streamlink.lanesh4d0w.repl.co/iptv-query?streaming-ip=https://www.vidio.com/live/6711-mytv
+https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.vidio.com/live/6711-mytv
-#EXTINF:-1 tvg-id="NetTV.id" tvg-name="Net. TV" tvg-country="ID" tvg-language="Indonesian" tvg-logo="" group-title="General",Net. TV [Offline]
+#EXTINF:-1 tvg-id="NetTV.id" tvg-name="Net. TV" tvg-country="ID" tvg-language="Indonesian" tvg-logo="" group-title="General",Net. TV
-https://query-streamlink.lanesh4d0w.repl.co/iptv-query?streaming-ip=https://www.vidio.com/live/875-net-tv
+https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.vidio.com/live/875-net-tv
-#EXTINF:-1 tvg-id="OChannel.id" tvg-name="O Channel" tvg-country="ID" tvg-language="Indonesian" tvg-logo="" group-title="Local",O Channel [Offline]
+#EXTINF:-1 tvg-id="OChannel.id" tvg-name="O Channel" tvg-country="ID" tvg-language="Indonesian" tvg-logo="" group-title="Local",O Channel
-https://query-streamlink.lanesh4d0w.repl.co/iptv-query?streaming-ip=https://www.vidio.com/live/206-ochannel
+https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.vidio.com/live/206-ochannel
 #EXTINF:-1 tvg-id="OneTV.id" tvg-name="One TV" tvg-country="ID" tvg-language="" tvg-logo="https://onetvasia.com/sites/onetvasia.com/files/logo-small_0.png" group-title="",One TV
 https://liveanevia.mncnow.id/live/eds/SetOne/sa_dash_vmx/SetOne.mpd
 #EXTINF:-1 tvg-id="Radio51TV.id" tvg-name="Radio 51 TV" tvg-country="ID" tvg-language="Indonesian" tvg-logo="Logo N/A" group-title="",Radio 51 TV (480p)
@@ -53,8 +53,8 @@ https://vcdn2.rctiplus.id/live/eds/rcti_fta/live_fta/rcti_fta.m3u8
 http://edge.linknetott.swiftserve.com/live/BsNew/amlst:reformedch/playlist.m3u8
 #EXTINF:-1 tvg-id="RRINet.id" tvg-name="RRI Net" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://pbs.twimg.com/media/DmaMDCBU8AAfd45.png" group-title="",RRI Net (720p)
 http://36.89.47.217:11935/rrinet/live/index.m3u8
-#EXTINF:-1 tvg-id="RTV.id" tvg-name="RTV" tvg-country="ID" tvg-language="Indonesian" tvg-logo="" group-title="General",RTV [Offline]
+#EXTINF:-1 tvg-id="RTV.id" tvg-name="RTV" tvg-country="ID" tvg-language="Indonesian" tvg-logo="" group-title="General",RTV
-https://query-streamlink.lanesh4d0w.repl.co/iptv-query?streaming-ip=https://www.vidio.com/live/1561-rtv
+https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.vidio.com/live/1561-rtv
 #EXTINF:-1 tvg-id="SCTV.id" tvg-name="SCTV" tvg-country="ID" tvg-language="Indonesian" tvg-logo="" group-title="General",SCTV
 https://liveanevia.mncnow.id/live/eds/SCTV/sa_dash_vmx/SCTV.mpd
 #EXTINF:-1 tvg-id="TransTV.id" tvg-name="Trans TV" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://m3u-editor.com/storage/channel-logos/07cd9d90-3cc5-11ea-9aa8-0b5bd3ba261d/92697/14040459.png" group-title="General",Trans TV (720p)
@@ -98,7 +98,7 @@ http://103.18.181.69:1935/golive/livestream10/playlist.m3u8
 #EXTINF:-1 tvg-id="TVRParlemenKomisiXI.id" tvg-name="TVR Parlemen Komisi XI" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnhlaM4KZ8xQaJpfP8GPX7Ji3tYXVnuSVfVKNV69=s900-c-k-c0x00ffffff-no-rj" group-title="Legislative",TVR Parlemen Komisi XI [Not 24/7]
 http://103.18.181.69:1935/golive/livestream11/playlist.m3u8
 #EXTINF:-1 tvg-id="TVRI.id" tvg-name="TVRI" tvg-country="ID" tvg-language="" tvg-logo="http://1.bp.blogspot.com/-30awn5OxihI/T9VuzQQ5RqI/AAAAAAAADRM/_iPdRJhYiwQ/s1600/logo-lpp-tvri.png" group-title="",TVRI (720p)
-http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRINasional)/Stream(04)/index.m3u8
+http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRINasional)/index.m3u8
 #EXTINF:-1 tvg-id="TVRI4.id" tvg-name="TVRI 4" tvg-country="ID" tvg-language="" tvg-logo="http://images2.useetv.com/logo_tvri_big1.png" group-title="",TVRI 4 (480p)
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRI4)/index.m3u8
 #EXTINF:-1 tvg-id="TVRIAceh.id" tvg-name="TVRI Aceh" tvg-country="ID" tvg-language="Indonesian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/eb/TVRILogo2019.svg/320px-TVRILogo2019.svg.png" group-title="Local",TVRI Aceh (480p)

channels/it.m3u

@@ -5,7 +5,7 @@ https://meridelive01-lh.akamaihd.net/i/tvparma_1@356964/master.m3u8
 https://live3-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(lb)/index.m3u8
 #EXTINF:-1 tvg-id="51RadioTV.it" tvg-name="51 Radio TV" tvg-country="IT" tvg-language="Italian" tvg-logo="http://i65.tinypic.com/wmf409.jpg" group-title="",51 Radio TV (480p)
 http://wms.shared.streamshow.it/canale51/canale51/playlist.m3u8
-#EXTINF:-1 tvg-id="A2itv.it" tvg-name="A2itv" tvg-country="IT" tvg-language="English,French" tvg-logo="" group-title="",A2itv (1080p)
+#EXTINF:-1 tvg-id="A2itv.it" tvg-name="A2itv" tvg-country="IT" tvg-language="English;French" tvg-logo="" group-title="",A2itv (1080p)
 https://stream.sen-gt.com/A2itv/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="ABChannel.it" tvg-name="AB Channel" tvg-country="IT" tvg-language="" tvg-logo="https://i.imgur.com/y5564NI.png" group-title="",AB Channel (768p)
 https://tsw.streamingwebtv24.it:1936/abchanneltv/abchanneltv/playlist.m3u8

channels/jp.m3u

@@ -47,8 +47,6 @@ https://nhkwlive-ojp.akamaized.net/hls/live/2003459/nhkwlive-ojp-en/index_4M.m3u
 https://nhkworld.webcdn.stream.ne.jp/www11/nhkworld-tv/zh/725580/livecom_zh.m3u8
 #EXTINF:-1 tvg-id="NipponTV.jp" tvg-name="Nippon TV" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",Nippon TV (540p)
 https://ntv1.mov3.co/hls/ntv.m3u8
-#EXTINF:-1 tvg-id="NipponTVNews24.jp" tvg-name="Nippon TV News 24" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="News",Nippon TV News 24 (480p)
-https://n24-cdn-live.ntv.co.jp/ch01/high.m3u8
 #EXTINF:-1 tvg-id="NTVNews24.jp" tvg-name="NTV News24" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://i.imgur.com/Ya4yHpC.jpg" group-title="News",NTV News24 (480p)
 https://www.news24.jp/livestream/index.m3u8
 #EXTINF:-1 tvg-id="ShopChannel.jp" tvg-name="Shop Channel" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://i.imgur.com/3K36JEA.jpg" group-title="Shop",Shop Channel (720p)

channels/pe.m3u

@@ -44,7 +44,7 @@ https://envivo.galacticatv.com:3913/stream/play.m3u8
 #EXTINF:-1 tvg-id="GeniosTVMoyobamba.pe" tvg-name="Genios TV (Moyobamba)" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/geniostvmoyobamba/picture?width=320&height=320" group-title="Local",Genios TV (Moyobamba) (720p) [Not 24/7]
 https://live.obslivestream.com:1936/geniostv/ngrp:geniostv_all/playlist.m3u8?DVR=
 #EXTINF:-1 tvg-id="GoldValleyTV.pe" tvg-name="Gold Valley TV (Cafsma)" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/Goldvalleytvcasma/picture?width=320&height=320" group-title="Local",Gold Valley TV (Casma) [Not 24/7]
-https://stmv.panel.grupolimalive.com/gold/gold/chunklist_w210808895.m3u8
+https://stmv.panel.grupolimalive.com/gold/gold/playlist.m3u8
 #EXTINF:-1 tvg-id="HatunTV.pe" tvg-name="Hatun TV" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnhI0HKESXrVQ8-ktPCeRap6-cP_4upPtEpAlwPa=s88-c-k-c0x00ffffff-no-rj" group-title="Music",Hatun TV (720p)
 https://tv.siete.us/bestcablehatuntv/bestcablehatuntv/index.m3u8
 #EXTINF:-1 tvg-id="JNETV.pe" tvg-name="JNE TV" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/JNE.Peru/picture?width=320&height=320" group-title="Legislative",JNE TV [Not 24/7]
@@ -73,6 +73,8 @@ https://ed1ov.live.opencaster.com/jcpstream_mid/index.m3u8
 https://www.opencaster.com/resources/hls_stream/hipodromojcp2.m3u8
 #EXTINF:-1 tvg-id="NuestraTVLima.pe" tvg-name="Nuestra TV (Lima)" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/NUESTRATVPERU/picture?width=320&height=320" group-title="Local",Nuestra TV (Lima) [Offline]
 https://linkastream.co/headless?url=https://www.twitch.tv/nuestratvlima
+#EXTINF:-1 tvg-id="NuestraTVLima.pe" tvg-name="Nuestra TV (Lima)" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/NUESTRATVPERU/picture?width=320&height=320" group-title="Local",Nuestra TV (Lima)
+https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.twitch.tv/nuestratvlima
 #EXTINF:-1 tvg-id="OmegaTVYurimaguas.pe" tvg-name="Omega TV (Yurimaguas)" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/omegatvyurimaguas/picture?width=320&height=320" group-title="Local",Omega TV (Yurimaguas) [Not 24/7]
 https://7.innovatestream.pe:19360/omega/omega.m3u8
 #EXTINF:-1 tvg-id="OndaDigital.pe" tvg-name="Onda Digital" tvg-country="PE" tvg-language="" tvg-logo="https://i.imgur.com/3R2emx7.jpg" group-title="General",Onda Digital (720p)
@@ -89,6 +91,8 @@ https://linkastream.co/headless?url=https://www.dailymotion.com/PanamericanaPTV
 https://d2fxrfbiedz1tm.cloudfront.net/livepaxtv/smil:PC.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="PBO.pe" tvg-name="PBO Digital" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/PBOPeru/picture?width=320&height=320" group-title="News",PBO Digital [Offline]
 https://linkastream.co/headless?url=https://www.youtube.com/channel/UCgR0st4ZLABi-LQcWNu3wnQ/live
+#EXTINF:-1 tvg-id="PBO.pe" tvg-name="PBO Digital" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/PBOPeru/picture?width=320&height=320" group-title="News",PBO Digital
+https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.youtube.com/channel/UCgR0st4ZLABi-LQcWNu3wnQ/live
 #EXTINF:-1 tvg-id="PeruvianRadioTV.pe" tvg-name="Peruvian Radio TV" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://peruvianradiotv.pe/wp-content/uploads/2021/03/Logo-Peruvian-6.png" group-title="Local",PeruvianRadio TV (720p) [Not 24/7]
 https://stmv.panel.grupolimalive.com/peruviantv/peruviantv/playlist.m3u8
 #EXTINF:-1 tvg-id="PlanetaTVBagua.pe" tvg-name="Planeta TV Bagua" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/planeatvperu/picture?width=320&height=320" group-title="Local",Planeta TV Bagua (720p) [Not 24/7]
@@ -101,12 +105,14 @@ https://rtmp02.portalexpress.es/primaveratv/primaveratv/playlist.m3u8
 https://mediastreamm.com:3753/live/qosqotimeslive.m3u8
 #EXTINF:-1 tvg-id="QuattroTV.pe" tvg-name="Quattro TV" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://pbs.twimg.com/profile_images/572791252093919232/DKxHh5Oj_200x200.png" group-title="Local",Quattro TV [Offline]
 https://linkastream.co/headless?url=https://www.twitch.tv/quatrotvgo
+#EXTINF:-1 tvg-id="QuattroTV.pe" tvg-name="Quattro TV" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://pbs.twimg.com/profile_images/572791252093919232/DKxHh5Oj_200x200.png" group-title="Local",Quattro TV
+https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.twitch.tv/quatrotvgo
 #EXTINF:-1 tvg-id="RadioSanBorjaTV.pe" tvg-name="Radio San Borja TV" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/radiosanborja/picture?width=320&height=320" group-title="Music",Radio San Borja TV (720p) [Not 24/7]
 https://5c3fb01839654.streamlock.net:1963/iptvsanborja/livesanborjatv/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioTropicalTarapoto.pe" tvg-name="Radio Tropical Tarapoto" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://pbs.twimg.com/profile_images/1331243814548287489/RCVGVH6L_400x400.jpg" group-title="Local",Radio Tropical Tarapoto (480p)
 https://5ee0faac3bbae.streamlock.net/raditropical/raditropical/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioUnoTacna.pe" tvg-name="Radio Uno (Tacna)" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/radiouno.pe/picture?width=320&height=320" group-title="Local",Radio Uno (Tacna) [Not 24/7]
-https://query-streamlink.lanesh4d0w.repl.co/iptv-query?streaming-ip=https://www.youtube.com/channel/UCK0lpuL9PQb3I5CDcu7Y7bA
+https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.youtube.com/channel/UCK0lpuL9PQb3I5CDcu7Y7bA/live
 #EXTINF:-1 tvg-id="RadioTVOrienteYurimaguas.pe" tvg-name="RadioTV Oriente (Yurimaguas)" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/www.roriente.org/picture?width=320&height=320" group-title="Local",RadioTV Oriente (Yurimaguas) (360p) [Not 24/7]
 https://cp.sradiotv.com:1936/8034/8034/playlist.m3u8
 #EXTINF:-1 tvg-id="RiberenaTV.pe" tvg-name="Ribereña TV (Bellavista)" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/lariberenabellavista/picture?width=320&height=320" group-title="Local",Ribereña TV (Bellavista) (480p)
@@ -118,7 +124,7 @@ https://tvdatta.com:3952/live/rwtelevisionlive.m3u8
 #EXTINF:-1 tvg-id="Sistema1.pe" tvg-name="Sistema 1 (Huaraz)" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/sistema1tv/picture?width=320&height=320" group-title="Local",Sistema 1 (Huaraz) (720p) [Not 24/7]
 https://tv.siete.us/sistema1/sistema1/index.m3u8
 #EXTINF:-1 tvg-id="SomosTelevisionChimbote.pe" tvg-name="Somos Televisión (Chimbote)" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/somostelevision/picture?width=320&height=320" group-title="Local",Somos Televisión (Chimbote) [Not 24/7]
-https://query-streamlink.lanesh4d0w.repl.co/iptv-query?streaming-ip=https://www.pscp.tv/somostv/1YqKDeErkvOGV
+https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.pscp.tv/w/1OwGWVYpDOWKQ
 #EXTINF:-1 tvg-id="StereoTVPeru.pe" tvg-name="Stereo TV (Peru)" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/StereotvOficial/picture?width=320&height=320" group-title="Music",Stereo TV (Peru) [Not 24/7]
 https://servers.amelbasoluciones.co:19360/5medialive/5medialive.m3u8
 #EXTINF:-1 tvg-id="SuperCanalYurimaguas.pe" tvg-name="Super Canal (Yurimaguas)" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/supercanalyuri/picture?width=320&height=320" group-title="Local",Super Canal (Yurimaguas) [Not 24/7]
@@ -144,7 +150,7 @@ https://tv.oyotunstream.com:1936/tropicaltv/tropicaltv/playlist.m3u8
 #EXTINF:-1 tvg-id="TurboMixRadioTV.pe" tvg-name="Turbo Mix Radio TV" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/235129376518344/picture?width=320&height=320" group-title="Music",Turbo Mix Radio TV (480p)
 https://7.innovatestream.pe:19360/turbomixoficial/turbomixoficial.m3u8
 #EXTINF:-1 tvg-id="TVNorteChiclayo.pe" tvg-name="TV Norte (Chiclayo)" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/tvnorte7/picture?width=320&height=320" group-title="Local",TV Norte (Chiclayo) [Not 24/7]
-https://query-streamlink.lanesh4d0w.repl.co/iptv-query?streaming-ip=https://www.dailymotion.com/TVNORTEHD
+https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.dailymotion.com/TVNORTEHD
 #EXTINF:-1 tvg-id="TVNoticias73.pe" tvg-name="TV Noticias 7.3" tvg-country="PE" tvg-language="" tvg-logo="https://yt3.ggpht.com/-TT4fesr5OEU/AAAAAAAAAAI/AAAAAAAAAAA/bcrXYkOAjdA/s900-c-k-no-mo-rj-c0xffffff/photo.jpg" group-title="",TV Noticias 7.3 (614p)
 http://cdnh4.iblups.com/hls/RMuwrdk7M9.m3u8
 #EXTINF:-1 tvg-id="TVPeruanisima.pe" tvg-name="TV Peruanísima" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/HenryAyalaProductions/picture?width=320&height=320" group-title="Music",TV Peruanísima (720p)
@@ -171,3 +177,5 @@ https://5ee0faac3bbae.streamlock.net/visionmusica/visionmusica/playlist.m3u8
 https://5ee0faac3bbae.streamlock.net/viatv2021/viatv2021/playlist.m3u8
 #EXTINF:-1 tvg-id="Willax.pe" tvg-name="Willax" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/willaxtv/picture?width=320&height=320" group-title="General",Willax [Offline]
 https://linkastream.co/headless?url=https://www.dailymotion.com/WillaxTV
+#EXTINF:-1 tvg-id="Willax.pe" tvg-name="Willax" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/willaxtv/picture?width=320&height=320" group-title="General",Willax
+https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.dailymotion.com/WillaxTV

index.m3u

@@ -203,8 +203,6 @@ channels/mm.m3u
 channels/np.m3u
 #EXTINF:-1,Netherlands
 channels/nl.m3u
-#EXTINF:-1,Netherlands Antilles
-channels/an.m3u
 #EXTINF:-1,New Zealand
 channels/nz.m3u
 #EXTINF:-1,Nicaragua

m3u-linter.json

@@ -6,6 +6,10 @@
     "attribute-quotes": true,
     "require-info": true,
     "no-trailing-spaces": true,
-    "no-whitespace-before-title": true
+    "no-whitespace-before-title": true,
+    "no-multi-spaces": true,
+    "no-extra-comma": true,
+    "space-before-paren": true,
+    "no-dash": true
   }
 }

package-lock.json

@@ -10,7 +10,7 @@
         "commander": "^7.0.0",
         "iptv-checker": "^0.20.2",
         "iptv-playlist-parser": "^0.5.4",
-        "m3u-linter": "^0.1.3",
+        "m3u-linter": "^0.2.1",
         "markdown-include": "^0.4.3",
         "normalize-url": "^6.1.0",
         "pre-push": "^0.1.1",
@@ -2817,9 +2817,9 @@
       }
     },
     "node_modules/m3u-linter": {
-      "version": "0.1.3",
+      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/m3u-linter/-/m3u-linter-0.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/m3u-linter/-/m3u-linter-0.2.1.tgz",
-      "integrity": "sha512-UcOCA12gkZGs8gBE3HpBnPwZyVswan4VWBb4kTbxHZ84hBRVa00WreZSUDCgaPVmo52HyxZAI1FLuvOIRIAfZQ==",
+      "integrity": "sha512-hSRnnJD/tom5bF0picznFMuUfbvUH7iPZfQ+3DhZ41Rk3N2LTMWzRlA1sCRWPT9dvyWuvYnhAIrxfv+fbsaIVQ==",
       "dependencies": {
         "chalk": "^4.1.1",
         "commander": "^7.2.0",
@@ -5946,9 +5946,9 @@
       }
     },
     "m3u-linter": {
-      "version": "0.1.3",
+      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/m3u-linter/-/m3u-linter-0.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/m3u-linter/-/m3u-linter-0.2.1.tgz",
-      "integrity": "sha512-UcOCA12gkZGs8gBE3HpBnPwZyVswan4VWBb4kTbxHZ84hBRVa00WreZSUDCgaPVmo52HyxZAI1FLuvOIRIAfZQ==",
+      "integrity": "sha512-hSRnnJD/tom5bF0picznFMuUfbvUH7iPZfQ+3DhZ41Rk3N2LTMWzRlA1sCRWPT9dvyWuvYnhAIrxfv+fbsaIVQ==",
       "requires": {
         "chalk": "^4.1.1",
         "commander": "^7.2.0",

package.json

@@ -14,7 +14,7 @@
     "commander": "^7.0.0",
     "iptv-checker": "^0.20.2",
     "iptv-playlist-parser": "^0.5.4",
-    "m3u-linter": "^0.1.3",
+    "m3u-linter": "^0.2.1",
     "markdown-include": "^0.4.3",
     "normalize-url": "^6.1.0",
     "pre-push": "^0.1.1",

scripts/format.js

@@ -14,6 +14,7 @@ program
   .option('-r, --resolution', 'Detect stream resolution')
   .option('-c, --country <country>', 'Comma-separated list of country codes', '')
   .option('-e, --exclude <exclude>', 'Comma-separated list of country codes to be excluded', '')
+  .option('--delay <delay>', 'Set delay for each request', 0)
   .option('--timeout <timeout>', 'Set timeout for each request', 5000)
   .parse(process.argv)
 
@@ -61,7 +62,7 @@ async function updatePlaylist(playlist) {
   }
 
   for (const channel of playlist.channels) {
-    addMissingData(channel)
+    addMissingData(channel, playlist)
     updateGroupTitle(channel)
     normalizeUrl(channel)
 
@@ -90,6 +91,8 @@ async function updatePlaylist(playlist) {
         .catch(err => {
           if (config.debug) log.print(`  ERR: ${channel.url} (${err.message})\n`)
         })
+
+      await utils.sleep(config.delay)
     }
     if (!config.debug) bar.tick()
   }
@@ -122,7 +125,8 @@ function updateStatus(channel, status) {
   }
 }
 
-function addMissingData(channel) {
+function addMissingData(channel, playlist) {
+  const code = playlist.country.code
   // tvg-name
   if (!channel.tvg.name && channel.name) {
     channel.tvg.name = channel.name.replace(/\"/gi, '')

scripts/helpers/db.js

@@ -211,10 +211,10 @@ db.playlists = {
     return this.list
   },
   only(list = []) {
-    return this.list.filter(playlist => list.includes(playlist.name))
+    return this.list.filter(playlist => list.includes(playlist.filename))
   },
   except(list = []) {
-    return this.list.filter(playlist => !list.includes(playlist.name))
+    return this.list.filter(playlist => !list.includes(playlist.filename))
   },
   sortBy(fields) {
     this.list = utils.sortBy(this.list, fields)

scripts/helpers/file.js

@@ -5,10 +5,6 @@ const fs = require('fs')
 const rootPath = path.resolve(__dirname) + '/../../'
 const file = {}
 
-file.getBasename = function (filename) {
-  return path.basename(filename, path.extname(filename))
-}
-
 file.getFilename = function (filename) {
   return path.parse(filename).name
 }

scripts/helpers/parser.js

@@ -15,10 +15,13 @@ parser.parseIndex = function () {
 parser.parsePlaylist = async function (url) {
   const content = file.read(url)
   const result = playlistParser.parse(content)
-  const name = file.getFilename(url)
+  const filename = file.getFilename(url)
-  const country = utils.code2name(name)
+  const country = {
+    code: filename,
+    name: utils.code2name(filename)
+  }
 
-  return new Playlist({ header: result.header, items: result.items, url, country, name })
+  return new Playlist({ header: result.header, items: result.items, url, filename, country })
 }
 
 module.exports = parser

scripts/helpers/utils.js

@@ -90,4 +90,10 @@ utils.filterPlaylists = function (arr, include = '', exclude = '') {
   return arr
 }
 
+utils.sleep = function (ms) {
+  return function (x) {
+    return new Promise(resolve => setTimeout(() => resolve(x), ms))
+  }
+}
+
 module.exports = utils