From 72f3a3d80c120243c6efbac9aa5b3285b571dcf3 Mon Sep 17 00:00:00 2001 From: The Tuchan <101149277+thetucan1@users.noreply.github.com> Date: Thu, 7 Apr 2022 16:24:51 -0500 Subject: [PATCH 1/5] Update co.m3u Add channel Amaga TV from https://amagatelevision.com/ --- streams/co.m3u | 2 ++ 1 file changed, 2 insertions(+) diff --git a/streams/co.m3u b/streams/co.m3u index 9d4451ddd..29cae9db1 100644 --- a/streams/co.m3u +++ b/streams/co.m3u @@ -1,6 +1,8 @@ #EXTM3U #EXTINF:-1 tvg-id="Amordiscos.co" status="timeout",Amordiscos (480p) https://5b464b69d264e.streamlock.net/Channels_live/ngrp:amordiscos_all/playlist.m3u8 +#EXTINF:-1 tvg-id="AmagaTV.co" ,Amaga TV (720p) (Amagá | Antioquia) +https://hvtrafico.ddns.net/amagatv/smil:amagatv.smil/playlist.m3u8 #EXTINF:-1 tvg-id="ATV.co" status="online",ATV (Soacha | Cundinamarca) (360p) [Not 24/7] https://movil.ejeserver.com/live/verteve.m3u8 #EXTINF:-1 tvg-id="AvivamientoTV.co" status="online",Avivamiento TV (1080p) [Not 24/7] From bd9789707d306ae935e788a25008f6be0e858bb7 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Fri, 8 Apr 2022 02:17:06 +0300 Subject: [PATCH 2/5] Update ar.m3u --- streams/ar.m3u | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/streams/ar.m3u b/streams/ar.m3u index afc46c3d3..66c924f31 100644 --- a/streams/ar.m3u +++ b/streams/ar.m3u @@ -161,18 +161,18 @@ http://170.83.242.153:8000/play/a00z http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCvCTWHCbBC0b9UIeLeNs8ug/live #EXTINF:-1 tvg-id="VTV.ar" status="online",VerTV (VTV) (720p) [Not 24/7] https://5f700d5b2c46f.streamlock.net/vertv/vertv/playlist.m3u8 -#EXTINF:-1 tvg-id="" status="online",Informacion Periodística (1080p) +#EXTINF:-1 tvg-id="InformacionPeriodistica.ar" status="online",Informacion Periodística (1080p) https://d1nmqgphjn0y4.cloudfront.net/live/ip/live.isml/5ee6e167-1167-4a85-9d8d-e08a3f55cff3.m3u8 -#EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (iPad; CPU OS 9_3_5 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13G36",canalLUZ (1080p) [Not 24/7] +#EXTINF:-1 tvg-id="CanalLuz.ar" status="online" user-agent="Mozilla/5.0 (iPad; CPU OS 9_3_5 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13G36",canalLUZ (1080p) [Not 24/7] #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPad; CPU OS 9_3_5 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13G36 https://g1.mc-slo.transport.edge-access.net/a11/ngrp:canal_luz01-100009_all/Playlist.m3u8?sense=true -#EXTINF:-1 tvg-id="" status="online",Tierra Mía TV (720p) +#EXTINF:-1 tvg-id="TierramiaTV.ar" status="online",Tierra Mía TV (720p) http://live-edge01.telecentro.net.ar/live/smil:trm.smil/playlist.m3u8 -#EXTINF:-1 tvg-id="" status="online",5RTv (720p) [Not 24/7] +#EXTINF:-1 tvg-id="5RTV.ar" status="online",5RTv (720p) [Not 24/7] https://api.new.livestream.com/accounts/22636012/events/8242619/live.m3u8 -#EXTINF:-1 tvg-id="" status="online",CANAL.9 MULTIVISION (720p) [Not 24/7] +#EXTINF:-1 tvg-id="Canal9Multivision.ar" status="online",CANAL.9 MULTIVISION (720p) [Not 24/7] https://panel.dattalive.com/8250/8250/playlist.m3u8 -#EXTINF:-1 tvg-id="" status="error",El Doce TV (1080p) [Not 24/7] +#EXTINF:-1 tvg-id="ElDoce.ar" status="error",El Doce TV (1080p) [Not 24/7] http://free.fullspeed.tv/iptv-query?feature=emb_title&streaming-ip=https://www.youtube.com/watch?v=gBbMbqILzXU -#EXTINF:-1 tvg-id="" status="error",CINE.AR (720p) [Not 24/7] +#EXTINF:-1 tvg-id="Cinear.ar" status="error",CINE.AR (720p) [Not 24/7] https://5fb24b460df87.streamlock.net/live-cont.ar/cinear/playlist.m3u8 From 6a4f8a6defec74594d0c55358d5b8f4e2a662536 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Fri, 8 Apr 2022 02:17:29 +0300 Subject: [PATCH 3/5] Update ar.m3u --- streams/ar.m3u | 8 -------- 1 file changed, 8 deletions(-) diff --git a/streams/ar.m3u b/streams/ar.m3u index 66c924f31..3e8898f71 100644 --- a/streams/ar.m3u +++ b/streams/ar.m3u @@ -63,8 +63,6 @@ https://g5.proy-hor.transport.edge-access.net/a08/ngrp:gcba_video4-100042_all/Pl #EXTINF:-1 tvg-id="CanalLuz.ar" status="online" user-agent="iPhone",Canal Luz (1080p) #EXTVLCOPT:http-user-agent=iPhone https://g2.vxral-slo.transport.edge-access.net/a11/ngrp:canal_luz01-100009_all/Playlist.m3u8 -#EXTINF:-1 tvg-id="CanalMilenium.ar" status="error",Canal Milenium -https://panel.tuvideostreaming.com:19360/8002/8002.m3u8 #EXTINF:-1 tvg-id="CanalProvincial.ar" status="online",Canal Provincial (San Miguel) (360p) [Not 24/7] http://www.trimi.com.ar/provincial/streaming/mystream.m3u8 #EXTINF:-1 tvg-id="CANALTDC.ar" status="online",CANAL TDC (1080p) [Not 24/7] @@ -81,8 +79,6 @@ https://59537faa0729a.streamlock.net/cincotv/cincotv/playlist.m3u8 http://coninfo.net:1935/chacodxdtv/live/playlist.m3u8 #EXTINF:-1 tvg-id="CN3Pinamar.ar" status="online",CN3 Pinamar (720p) [Not 24/7] https://wowza.telpin.com.ar:1935/canal3/canal3.stream/playlist.m3u8 -#EXTINF:-1 tvg-id="CPEtv.ar" status="error",CPEtv (720p) -https://dcunilive28-lh.akamaihd.net/i/dclive_1@533583/master.m3u8 #EXTINF:-1 tvg-id="CrossingTVCrossingContenidos.ar" status="online",Crossing TV (Crossing Contenidos) (720p) [Not 24/7] https://vivo.solumedia.com:19360/crossing/crossing.m3u8 #EXTINF:-1 tvg-id="DeporTV.ar" status="error",DeporTV (720p) [Not 24/7] @@ -153,10 +149,6 @@ http://streamspub.manasat.com:1935/tvar/tvmanaar2/playlist.m3u8 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/user/TVPublicaArgentina/live #EXTINF:-1 tvg-id="TVUniversidad.ar" status="online",TVU Universidad Nacional de La Plata (720p) [Not 24/7] https://stratus.stream.cespi.unlp.edu.ar/hls/tvunlp.m3u8 -#EXTINF:-1 tvg-id="TyCSports.ar" status="error",TyC Sports -https://d3awnlgqz0szay.cloudfront.net/out/v1/b841c366cbe540e6a106c3ba83e5c8d6/index.m3u8 -#EXTINF:-1 tvg-id="Venus.ar" status="error",Venus (480p) -http://170.83.242.153:8000/play/a00z #EXTINF:-1 tvg-id="Vorterix.ar" status="online",Vorterix (1080p) [Not 24/7] http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCvCTWHCbBC0b9UIeLeNs8ug/live #EXTINF:-1 tvg-id="VTV.ar" status="online",VerTV (VTV) (720p) [Not 24/7] From 3f6de96eb47a30b03536e82f30c18a50c93f4954 Mon Sep 17 00:00:00 2001 From: LaneSh4d0w Date: Fri, 8 Apr 2022 08:39:15 +0200 Subject: [PATCH 4/5] fix space --- streams/co.m3u | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streams/co.m3u b/streams/co.m3u index 29cae9db1..c914aceda 100644 --- a/streams/co.m3u +++ b/streams/co.m3u @@ -1,7 +1,7 @@ #EXTM3U #EXTINF:-1 tvg-id="Amordiscos.co" status="timeout",Amordiscos (480p) https://5b464b69d264e.streamlock.net/Channels_live/ngrp:amordiscos_all/playlist.m3u8 -#EXTINF:-1 tvg-id="AmagaTV.co" ,Amaga TV (720p) (Amagá | Antioquia) +#EXTINF:-1 tvg-id="AmagaTV.co",Amaga TV (720p) (Amagá | Antioquia) https://hvtrafico.ddns.net/amagatv/smil:amagatv.smil/playlist.m3u8 #EXTINF:-1 tvg-id="ATV.co" status="online",ATV (Soacha | Cundinamarca) (360p) [Not 24/7] https://movil.ejeserver.com/live/verteve.m3u8 From b458824bd8c71c864c6475a3b21c29736e92477c Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Fri, 8 Apr 2022 12:40:19 +0300 Subject: [PATCH 5/5] Fixes languages/ & index.languages.m3u generators --- scripts/commands/playlist/generate.js | 21 +++++++++++++------ scripts/generators/index_language_m3u.js | 2 +- .../expected/.gh-pages/categories/weather.m3u | 2 +- .../expected/.gh-pages/countries/ca.m3u | 2 +- .../expected/.gh-pages/index.category.m3u | 2 +- .../expected/.gh-pages/index.country.m3u | 2 +- .../expected/.gh-pages/index.language.m3u | 4 ++-- tests/__data__/expected/.gh-pages/index.m3u | 2 +- .../expected/.gh-pages/index.nsfw.m3u | 2 +- .../expected/.gh-pages/index.region.m3u | 8 +++---- .../expected/.gh-pages/languages/fra.m3u | 3 --- .../.gh-pages/languages/undefined.m3u | 2 ++ .../expected/.gh-pages/regions/amer.m3u | 2 +- .../expected/.gh-pages/regions/int.m3u | 2 +- .../expected/.gh-pages/regions/nam.m3u | 2 +- .../expected/.gh-pages/regions/noram.m3u | 2 +- .../expected/logs/generators/languages.log | 3 +-- tests/__data__/input/data/channels.json | 2 +- 18 files changed, 36 insertions(+), 29 deletions(-) delete mode 100644 tests/__data__/expected/.gh-pages/languages/fra.m3u diff --git a/scripts/commands/playlist/generate.js b/scripts/commands/playlist/generate.js index 118f64fd7..f34f16114 100644 --- a/scripts/commands/playlist/generate.js +++ b/scripts/commands/playlist/generate.js @@ -63,12 +63,21 @@ async function loadStreams() { const [_, code] = filename.match(/^([a-z]{2})(_|$)/) || [null, null] const defaultBroadcastArea = code ? [`c/${code.toUpperCase()}`] : [] - stream.guides = channel && Array.isArray(guides[channel.id]) ? guides[channel.id] : [] - stream.categories = channel ? channel.categories.map(id => categories[id]) : [] - stream.languages = channel ? channel.languages.map(id => languages[id]) : [] - stream.broadcast_area = channel ? channel.broadcast_area : defaultBroadcastArea - stream.is_nsfw = channel ? channel.is_nsfw : false - stream.logo = channel ? channel.logo : null + if (channel) { + stream.guides = Array.isArray(guides[channel.id]) ? guides[channel.id] : [] + stream.categories = channel.categories.map(id => categories[id]).filter(i => i) + stream.languages = channel.languages.map(id => languages[id]).filter(i => i) + stream.broadcast_area = channel.broadcast_area + stream.is_nsfw = channel.is_nsfw + stream.logo = channel.logo + } else { + stream.guides = [] + stream.categories = [] + stream.languages = [] + stream.broadcast_area = defaultBroadcastArea + stream.is_nsfw = false + stream.logo = null + } return stream }) diff --git a/scripts/generators/index_language_m3u.js b/scripts/generators/index_language_m3u.js index a8bbd8d61..9ae1adb23 100644 --- a/scripts/generators/index_language_m3u.js +++ b/scripts/generators/index_language_m3u.js @@ -8,7 +8,7 @@ module.exports = async function (streams = []) { if (!stream.languages.length) { const item = _.cloneDeep(stream) item.group_title = 'Undefined' - items.push(stream) + items.push(item) return } diff --git a/tests/__data__/expected/.gh-pages/categories/weather.m3u b/tests/__data__/expected/.gh-pages/categories/weather.m3u index 0a5fbfdf5..e3d46411d 100644 --- a/tests/__data__/expected/.gh-pages/categories/weather.m3u +++ b/tests/__data__/expected/.gh-pages/categories/weather.m3u @@ -1,3 +1,3 @@ #EXTM3U x-tvg-url="" -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/.gh-pages/countries/ca.m3u b/tests/__data__/expected/.gh-pages/countries/ca.m3u index 8fc459cd9..698421daf 100644 --- a/tests/__data__/expected/.gh-pages/countries/ca.m3u +++ b/tests/__data__/expected/.gh-pages/countries/ca.m3u @@ -1,5 +1,5 @@ #EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/uk/ontvtonight.com.epg.xml" #EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="INT" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/.gh-pages/index.category.m3u b/tests/__data__/expected/.gh-pages/index.category.m3u index 8dd8f9832..335076ef0 100644 --- a/tests/__data__/expected/.gh-pages/index.category.m3u +++ b/tests/__data__/expected/.gh-pages/index.category.m3u @@ -5,7 +5,7 @@ http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8 #EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="INT" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="News",BBC News HD http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-country="UK" tvg-language="" tvg-logo="" group-title="Undefined" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] #EXTVLCOPT:http-referrer=http://imn.iq diff --git a/tests/__data__/expected/.gh-pages/index.country.m3u b/tests/__data__/expected/.gh-pages/index.country.m3u index 484642dde..d135bee5e 100644 --- a/tests/__data__/expected/.gh-pages/index.country.m3u +++ b/tests/__data__/expected/.gh-pages/index.country.m3u @@ -81,7 +81,7 @@ http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 #EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="INT" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="Canada",BBC News HD http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Canada",Meteomedia +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Canada",Meteomedia http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 #EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="INT" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="Cape Verde",BBC News HD http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 diff --git a/tests/__data__/expected/.gh-pages/index.language.m3u b/tests/__data__/expected/.gh-pages/index.language.m3u index 5baa914be..03ee58dbd 100644 --- a/tests/__data__/expected/.gh-pages/index.language.m3u +++ b/tests/__data__/expected/.gh-pages/index.language.m3u @@ -1,8 +1,6 @@ #EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml,https://iptv-org.github.io/epg/guides/uk/ontvtonight.com.epg.xml" #EXTINF:-1 tvg-id="BBCNews.uk" tvg-country="INT" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="English",BBC News HD http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="French",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 #EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Russian",ЛДПР ТВ (1080p) http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-country="UK" tvg-language="" tvg-logo="" group-title="Undefined" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] @@ -11,6 +9,8 @@ http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8 http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 #EXTINF:-1 tvg-id="" tvg-country="IN" tvg-language="" tvg-logo="" group-title="Undefined",Daawah TV http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Undefined",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="Undefined",Tastemade https://tastemade-freetv16min-plex.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-plex/CDN/playlist.m3u8 #EXTINF:-1 tvg-id="Zoo.ad" tvg-country="AD" tvg-language="" tvg-logo="" group-title="Undefined",Zoo (720p) diff --git a/tests/__data__/expected/.gh-pages/index.m3u b/tests/__data__/expected/.gh-pages/index.m3u index e332806ba..c89225084 100644 --- a/tests/__data__/expected/.gh-pages/index.m3u +++ b/tests/__data__/expected/.gh-pages/index.m3u @@ -7,7 +7,7 @@ http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 #EXTINF:-1 tvg-id="" tvg-country="IN" tvg-language="" tvg-logo="" group-title="Undefined",Daawah TV http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="Undefined",Tastemade https://tastemade-freetv16min-plex.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-plex/CDN/playlist.m3u8 diff --git a/tests/__data__/expected/.gh-pages/index.nsfw.m3u b/tests/__data__/expected/.gh-pages/index.nsfw.m3u index 49f7d508b..b8edd3f40 100644 --- a/tests/__data__/expected/.gh-pages/index.nsfw.m3u +++ b/tests/__data__/expected/.gh-pages/index.nsfw.m3u @@ -7,7 +7,7 @@ http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 #EXTINF:-1 tvg-id="" tvg-country="IN" tvg-language="" tvg-logo="" group-title="Undefined",Daawah TV http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="Undefined",Tastemade https://tastemade-freetv16min-plex.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-plex/CDN/playlist.m3u8 diff --git a/tests/__data__/expected/.gh-pages/index.region.m3u b/tests/__data__/expected/.gh-pages/index.region.m3u index 15a79a241..5c053d890 100644 --- a/tests/__data__/expected/.gh-pages/index.region.m3u +++ b/tests/__data__/expected/.gh-pages/index.region.m3u @@ -1,5 +1,5 @@ #EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml,https://iptv-org.github.io/epg/guides/uk/ontvtonight.com.epg.xml" -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Americas",Meteomedia +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Americas",Meteomedia http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-country="IN" tvg-language="" tvg-logo="" group-title="Asia",Daawah TV http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 @@ -25,9 +25,9 @@ http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 https://iptv-all.lanesh4d0w.repl.co/andorra/zoo #EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Europe, the Middle East and Africa",ЛДПР ТВ (1080p) http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="North America",Meteomedia +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="North America",Meteomedia http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Northern America",Meteomedia +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Northern America",Meteomedia http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-country="IN" tvg-language="" tvg-logo="" group-title="South Asia",Daawah TV http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 @@ -39,7 +39,7 @@ http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 #EXTINF:-1 tvg-id="" tvg-country="IN" tvg-language="" tvg-logo="" group-title="Worldwide",Daawah TV http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Worldwide",Meteomedia +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Worldwide",Meteomedia http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 #EXTINF:-1 tvg-id="Zoo.ad" tvg-country="AD" tvg-language="" tvg-logo="" group-title="Worldwide",Zoo (720p) https://iptv-all.lanesh4d0w.repl.co/andorra/zoo diff --git a/tests/__data__/expected/.gh-pages/languages/fra.m3u b/tests/__data__/expected/.gh-pages/languages/fra.m3u deleted file mode 100644 index 0a5fbfdf5..000000000 --- a/tests/__data__/expected/.gh-pages/languages/fra.m3u +++ /dev/null @@ -1,3 +0,0 @@ -#EXTM3U x-tvg-url="" -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/.gh-pages/languages/undefined.m3u b/tests/__data__/expected/.gh-pages/languages/undefined.m3u index 600720c52..8a8a8ec8c 100644 --- a/tests/__data__/expected/.gh-pages/languages/undefined.m3u +++ b/tests/__data__/expected/.gh-pages/languages/undefined.m3u @@ -5,6 +5,8 @@ http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 #EXTINF:-1 tvg-id="" tvg-country="IN" tvg-language="" tvg-logo="" group-title="Undefined",Daawah TV http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="Undefined",Tastemade https://tastemade-freetv16min-plex.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-plex/CDN/playlist.m3u8 #EXTINF:-1 tvg-id="Zoo.ad" tvg-country="AD" tvg-language="" tvg-logo="" group-title="Undefined",Zoo (720p) diff --git a/tests/__data__/expected/.gh-pages/regions/amer.m3u b/tests/__data__/expected/.gh-pages/regions/amer.m3u index 0a5fbfdf5..e3d46411d 100644 --- a/tests/__data__/expected/.gh-pages/regions/amer.m3u +++ b/tests/__data__/expected/.gh-pages/regions/amer.m3u @@ -1,3 +1,3 @@ #EXTM3U x-tvg-url="" -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/.gh-pages/regions/int.m3u b/tests/__data__/expected/.gh-pages/regions/int.m3u index 139f05c67..39554d86e 100644 --- a/tests/__data__/expected/.gh-pages/regions/int.m3u +++ b/tests/__data__/expected/.gh-pages/regions/int.m3u @@ -7,7 +7,7 @@ http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 #EXTINF:-1 tvg-id="" tvg-country="IN" tvg-language="" tvg-logo="" group-title="Undefined",Daawah TV http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 #EXTINF:-1 tvg-id="Zoo.ad" tvg-country="AD" tvg-language="" tvg-logo="" group-title="Undefined",Zoo (720p) https://iptv-all.lanesh4d0w.repl.co/andorra/zoo diff --git a/tests/__data__/expected/.gh-pages/regions/nam.m3u b/tests/__data__/expected/.gh-pages/regions/nam.m3u index 0a5fbfdf5..e3d46411d 100644 --- a/tests/__data__/expected/.gh-pages/regions/nam.m3u +++ b/tests/__data__/expected/.gh-pages/regions/nam.m3u @@ -1,3 +1,3 @@ #EXTM3U x-tvg-url="" -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/.gh-pages/regions/noram.m3u b/tests/__data__/expected/.gh-pages/regions/noram.m3u index 0a5fbfdf5..e3d46411d 100644 --- a/tests/__data__/expected/.gh-pages/regions/noram.m3u +++ b/tests/__data__/expected/.gh-pages/regions/noram.m3u @@ -1,3 +1,3 @@ #EXTM3U x-tvg-url="" -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="French" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA-ON" tvg-language="" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/logs/generators/languages.log b/tests/__data__/expected/logs/generators/languages.log index 2ad6ba59e..6d88ad28d 100644 --- a/tests/__data__/expected/logs/generators/languages.log +++ b/tests/__data__/expected/logs/generators/languages.log @@ -1,4 +1,3 @@ {"filepath":"languages/eng.m3u","count":1} -{"filepath":"languages/fra.m3u","count":1} {"filepath":"languages/rus.m3u","count":1} -{"filepath":"languages/undefined.m3u","count":4} \ No newline at end of file +{"filepath":"languages/undefined.m3u","count":5} \ No newline at end of file diff --git a/tests/__data__/input/data/channels.json b/tests/__data__/input/data/channels.json index 2a189a3fd..6b1e051c0 100644 --- a/tests/__data__/input/data/channels.json +++ b/tests/__data__/input/data/channels.json @@ -134,7 +134,7 @@ "s/CA-ON" ], "languages": [ - "fra" + "fru" ], "categories": [ "weather"