diff --git a/scripts/commands/generate-playlists.js b/scripts/commands/generate-playlists.js index b20ecfd2d..60952d700 100644 --- a/scripts/commands/generate-playlists.js +++ b/scripts/commands/generate-playlists.js @@ -10,8 +10,9 @@ async function main() { await generator.generate('languages', streams) await generator.generate('regions', streams) await generator.generate('index_m3u', streams) + await generator.generate('index_nsfw_m3u', streams) + await generator.generate('index_category_m3u', streams) - // await generateIndexNSFW() // await generateIndexCategory() // await generateIndexCountry() // await generateIndexLanguage() @@ -62,31 +63,6 @@ async function loadStreams() { }) } -// async function generateIndexNSFW() { -// logger.info(`Generating index.nsfw.m3u...`) - -// await generator.generate( -// `${PUBLIC_PATH}/index.nsfw.m3u`, -// {}, -// { -// includeNSFW: true, -// onLoad: function (items) { -// return items.map(item => { -// if (!item.categories || !item.categories.length) { -// item.group_title = 'Other' -// } - -// return item -// }) -// }, -// sortBy: item => { -// if (item.group_title === 'Other') return '_' -// return item.group_title || '' -// } -// } -// ) -// } - // async function generateIndexCategory() { // logger.info(`Generating index.category.m3u...`) diff --git a/scripts/generators/index.js b/scripts/generators/index.js index 91391b07e..c77404007 100644 --- a/scripts/generators/index.js +++ b/scripts/generators/index.js @@ -3,3 +3,5 @@ exports.countries = require('./countries') exports.languages = require('./languages') exports.regions = require('./regions') exports.index_m3u = require('./index_m3u') +exports.index_nsfw_m3u = require('./index_nsfw_m3u') +exports.index_category_m3u = require('./index_category_m3u') diff --git a/scripts/generators/index_category_m3u.js b/scripts/generators/index_category_m3u.js new file mode 100644 index 000000000..fa3b4b181 --- /dev/null +++ b/scripts/generators/index_category_m3u.js @@ -0,0 +1,22 @@ +const api = require('../core/api') +const _ = require('lodash') + +module.exports = async function (streams = []) { + streams = _.filter(streams, s => !s.channel || s.channel.is_nsfw === false) + let items = [] + streams.forEach(stream => { + if (!stream.categories.length) return items.push(stream) + + stream.categories.forEach(category => { + const item = _.cloneDeep(stream) + item.group_title = category.name + items.push(item) + }) + }) + items = _.sortBy(items, i => { + if (i.group_title === 'Undefined') return '_' + return i.group_title + }) + + return { filepath: 'index.category.m3u', items } +} diff --git a/scripts/generators/index_nsfw_m3u.js b/scripts/generators/index_nsfw_m3u.js new file mode 100644 index 000000000..a46fec24c --- /dev/null +++ b/scripts/generators/index_nsfw_m3u.js @@ -0,0 +1,6 @@ +const api = require('../core/api') +const _ = require('lodash') + +module.exports = async function (streams = []) { + return { filepath: 'index.nsfw.m3u', items: streams } +} diff --git a/tests/__data__/expected/.gh-pages/categories/general.m3u b/tests/__data__/expected/.gh-pages/categories/general.m3u index 0b77eed5a..a5890b5ab 100644 --- a/tests/__data__/expected/.gh-pages/categories/general.m3u +++ b/tests/__data__/expected/.gh-pages/categories/general.m3u @@ -1,3 +1,5 @@ -#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml" +#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ch/tv.blue.ch.epg.xml,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,https://iptv-org.github.io/epg/guides/uk/sky.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 (720p) [Not 24/7] +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/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="General",ЛДПР ТВ (1080p) http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8 diff --git a/tests/__data__/expected/.gh-pages/categories/news.m3u b/tests/__data__/expected/.gh-pages/categories/news.m3u index 4c20e3838..3993d1c4a 100644 --- a/tests/__data__/expected/.gh-pages/categories/news.m3u +++ b/tests/__data__/expected/.gh-pages/categories/news.m3u @@ -1,3 +1,3 @@ #EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ch/tv.blue.ch.epg.xml,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,https://iptv-org.github.io/epg/guides/uk/sky.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="News",BBC News HD (720p) [Not 24/7] +#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 (720p) [Not 24/7] http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/playlist.m3u8 diff --git a/tests/__data__/expected/.gh-pages/categories/weather.m3u b/tests/__data__/expected/.gh-pages/categories/weather.m3u new file mode 100644 index 000000000..1dfd5d41a --- /dev/null +++ b/tests/__data__/expected/.gh-pages/categories/weather.m3u @@ -0,0 +1,3 @@ +#EXTM3U x-tvg-url="" +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA" 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/countries/ca.m3u b/tests/__data__/expected/.gh-pages/countries/ca.m3u new file mode 100644 index 000000000..fb0a0ce72 --- /dev/null +++ b/tests/__data__/expected/.gh-pages/countries/ca.m3u @@ -0,0 +1,5 @@ +#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ch/tv.blue.ch.epg.xml,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,https://iptv-org.github.io/epg/guides/uk/sky.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 (720p) [Not 24/7] +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/playlist.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA" 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/countries/ru.m3u b/tests/__data__/expected/.gh-pages/countries/ru.m3u index 753c8e6e1..a5890b5ab 100644 --- a/tests/__data__/expected/.gh-pages/countries/ru.m3u +++ b/tests/__data__/expected/.gh-pages/countries/ru.m3u @@ -1,5 +1,5 @@ #EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ch/tv.blue.ch.epg.xml,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,https://iptv-org.github.io/epg/guides/uk/sky.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="News",BBC News HD (720p) [Not 24/7] +#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 (720p) [Not 24/7] http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/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="General",ЛДПР ТВ (1080p) http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8 diff --git a/tests/__data__/expected/.gh-pages/countries/uk.m3u b/tests/__data__/expected/.gh-pages/countries/uk.m3u index 4c20e3838..3993d1c4a 100644 --- a/tests/__data__/expected/.gh-pages/countries/uk.m3u +++ b/tests/__data__/expected/.gh-pages/countries/uk.m3u @@ -1,3 +1,3 @@ #EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ch/tv.blue.ch.epg.xml,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,https://iptv-org.github.io/epg/guides/uk/sky.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="News",BBC News HD (720p) [Not 24/7] +#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 (720p) [Not 24/7] http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/playlist.m3u8 diff --git a/tests/__data__/expected/.gh-pages/index.category.m3u b/tests/__data__/expected/.gh-pages/index.category.m3u new file mode 100644 index 000000000..28b3cbe20 --- /dev/null +++ b/tests/__data__/expected/.gh-pages/index.category.m3u @@ -0,0 +1,15 @@ +#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ad/andorradifusio.ad.epg.xml,https://iptv-org.github.io/epg/guides/ch/tv.blue.ch.epg.xml,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,https://iptv-org.github.io/epg/guides/uk/sky.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",BBC News HD (720p) [Not 24/7] +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/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="General",ЛДПР ТВ (1080p) +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 (720p) [Not 24/7] +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/playlist.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA" 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 +#EXTINF:-1 tvg-id="AndorraTV.ad" tvg-country="AD" tvg-language="Valencian" tvg-logo="" group-title="Undefined",ATV (720p) [Offline] +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="" tvg-country="" tvg-language="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/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.m3u b/tests/__data__/expected/.gh-pages/index.m3u index 6ccfdd3dd..1e10afcac 100644 --- a/tests/__data__/expected/.gh-pages/index.m3u +++ b/tests/__data__/expected/.gh-pages/index.m3u @@ -1,10 +1,12 @@ #EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ad/andorradifusio.ad.epg.xml,https://iptv-org.github.io/epg/guides/ch/tv.blue.ch.epg.xml,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,https://iptv-org.github.io/epg/guides/uk/sky.com.epg.xml" #EXTINF:-1 tvg-id="AndorraTV.ad" tvg-country="AD" tvg-language="Valencian" tvg-logo="" group-title="Undefined",ATV (720p) [Offline] https://iptv-all.lanesh4d0w.repl.co/andorra/atv -#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 (720p) [Not 24/7] +#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 (720p) [Not 24/7] http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-country="" 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" 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 #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="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) diff --git a/tests/__data__/expected/.gh-pages/index.nsfw.m3u b/tests/__data__/expected/.gh-pages/index.nsfw.m3u new file mode 100644 index 000000000..7646b9b52 --- /dev/null +++ b/tests/__data__/expected/.gh-pages/index.nsfw.m3u @@ -0,0 +1,15 @@ +#EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ad/andorradifusio.ad.epg.xml,https://iptv-org.github.io/epg/guides/ch/tv.blue.ch.epg.xml,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,https://iptv-org.github.io/epg/guides/uk/sky.com.epg.xml" +#EXTINF:-1 tvg-id="AndorraTV.ad" tvg-country="AD" tvg-language="Valencian" tvg-logo="" group-title="Undefined",ATV (720p) [Offline] +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#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 (720p) [Not 24/7] +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/playlist.m3u8 +#EXTINF:-1 tvg-id="" tvg-country="" 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" 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 +#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="VisitXTV.nl" tvg-country="INT" tvg-language="Flemish" tvg-logo="https://i.imgur.com/RJ9wbNF.jpg" group-title="XXX",Visit-X TV +https://stream.visit-x.tv/vxtv/ngrp:live_all/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="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8 diff --git a/tests/__data__/expected/.gh-pages/languages/eng.m3u b/tests/__data__/expected/.gh-pages/languages/eng.m3u index 4c20e3838..3993d1c4a 100644 --- a/tests/__data__/expected/.gh-pages/languages/eng.m3u +++ b/tests/__data__/expected/.gh-pages/languages/eng.m3u @@ -1,3 +1,3 @@ #EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ch/tv.blue.ch.epg.xml,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,https://iptv-org.github.io/epg/guides/uk/sky.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="News",BBC News HD (720p) [Not 24/7] +#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 (720p) [Not 24/7] http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/playlist.m3u8 diff --git a/tests/__data__/expected/.gh-pages/regions/int.m3u b/tests/__data__/expected/.gh-pages/regions/int.m3u index c0834afa7..d2bb00ce0 100644 --- a/tests/__data__/expected/.gh-pages/regions/int.m3u +++ b/tests/__data__/expected/.gh-pages/regions/int.m3u @@ -1,7 +1,9 @@ #EXTM3U x-tvg-url="https://iptv-org.github.io/epg/guides/ad/andorradifusio.ad.epg.xml,https://iptv-org.github.io/epg/guides/ch/tv.blue.ch.epg.xml,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,https://iptv-org.github.io/epg/guides/uk/sky.com.epg.xml" #EXTINF:-1 tvg-id="AndorraTV.ad" tvg-country="AD" tvg-language="Valencian" tvg-logo="" group-title="Undefined",ATV (720p) [Offline] https://iptv-all.lanesh4d0w.repl.co/andorra/atv -#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 (720p) [Not 24/7] +#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 (720p) [Not 24/7] http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/playlist.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-country="CA" 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 #EXTINF:-1 tvg-id="LDPRTV.ru" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8 diff --git a/tests/__data__/expected/logs/generators/categories.log b/tests/__data__/expected/logs/generators/categories.log index acfb802b9..af68b09a9 100644 --- a/tests/__data__/expected/logs/generators/categories.log +++ b/tests/__data__/expected/logs/generators/categories.log @@ -9,7 +9,7 @@ {"filepath":"categories/education.m3u","count":0} {"filepath":"categories/entertainment.m3u","count":0} {"filepath":"categories/family.m3u","count":0} -{"filepath":"categories/general.m3u","count":1} +{"filepath":"categories/general.m3u","count":2} {"filepath":"categories/kids.m3u","count":0} {"filepath":"categories/legislative.m3u","count":0} {"filepath":"categories/lifestyle.m3u","count":0} @@ -24,6 +24,6 @@ {"filepath":"categories/shop.m3u","count":0} {"filepath":"categories/sports.m3u","count":0} {"filepath":"categories/travel.m3u","count":0} -{"filepath":"categories/weather.m3u","count":0} +{"filepath":"categories/weather.m3u","count":1} {"filepath":"categories/xxx.m3u","count":1} {"filepath":"categories/undefined.m3u","count":3} \ No newline at end of file diff --git a/tests/__data__/expected/logs/generators/countries.log b/tests/__data__/expected/logs/generators/countries.log index cdd39bbdf..9d56d14b6 100644 --- a/tests/__data__/expected/logs/generators/countries.log +++ b/tests/__data__/expected/logs/generators/countries.log @@ -37,7 +37,7 @@ {"filepath":"countries/bi.m3u","count":1} {"filepath":"countries/kh.m3u","count":1} {"filepath":"countries/cm.m3u","count":1} -{"filepath":"countries/ca.m3u","count":1} +{"filepath":"countries/ca.m3u","count":2} {"filepath":"countries/cv.m3u","count":1} {"filepath":"countries/ky.m3u","count":1} {"filepath":"countries/cf.m3u","count":1} diff --git a/tests/__data__/expected/logs/generators/languages.log b/tests/__data__/expected/logs/generators/languages.log index c68ade3aa..a11820504 100644 --- a/tests/__data__/expected/logs/generators/languages.log +++ b/tests/__data__/expected/logs/generators/languages.log @@ -1,4 +1,5 @@ {"filepath":"languages/cat.m3u","count":1} {"filepath":"languages/eng.m3u","count":1} +{"filepath":"languages/fra.m3u","count":1} {"filepath":"languages/rus.m3u","count":1} {"filepath":"languages/undefined.m3u","count":2} \ No newline at end of file diff --git a/tests/__data__/expected/logs/generators/regions.log b/tests/__data__/expected/logs/generators/regions.log index d4c00b2cc..ddf9139e0 100644 --- a/tests/__data__/expected/logs/generators/regions.log +++ b/tests/__data__/expected/logs/generators/regions.log @@ -1,5 +1,5 @@ {"filepath":"regions/afr.m3u","count":0} -{"filepath":"regions/amer.m3u","count":0} +{"filepath":"regions/amer.m3u","count":1} {"filepath":"regions/arab.m3u","count":0} {"filepath":"regions/asia.m3u","count":1} {"filepath":"regions/apac.m3u","count":0} @@ -15,11 +15,11 @@ {"filepath":"regions/mideast.m3u","count":0} {"filepath":"regions/mena.m3u","count":0} {"filepath":"regions/nord.m3u","count":0} -{"filepath":"regions/noram.m3u","count":0} -{"filepath":"regions/nam.m3u","count":0} +{"filepath":"regions/noram.m3u","count":1} +{"filepath":"regions/nam.m3u","count":1} {"filepath":"regions/oce.m3u","count":0} {"filepath":"regions/sas.m3u","count":0} {"filepath":"regions/ssa.m3u","count":0} {"filepath":"regions/wafr.m3u","count":0} -{"filepath":"regions/int.m3u","count":3} +{"filepath":"regions/int.m3u","count":4} {"filepath":"regions/undefined.m3u","count":2} \ No newline at end of file