From b97df8b90eb95afc30845989aa0b3d2bebfa0d38 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Sun, 22 Aug 2021 16:02:18 +0300 Subject: [PATCH 1/8] Update filter.js --- scripts/filter.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/filter.js b/scripts/filter.js index da0d30b7f8..3ca71d927e 100644 --- a/scripts/filter.js +++ b/scripts/filter.js @@ -19,13 +19,14 @@ async function main() { log.finish() } -async function removeBlacklisted(playlist) { +function removeBlacklisted(playlist) { const channels = playlist.channels.filter(channel => { + const channelName = normalizeName(channel.name) return !blacklist.find(item => { const hasSameName = - item.name.toLowerCase() === channel.name.toLowerCase() || - item.aliases.map(alias => alias.toLowerCase()).includes(channel.name.toLowerCase()) - const fromSameCountry = channel.countries.find(c => c.code === item.country) + normalizeName(item.name) === channelName || + item.aliases.map(alias => normalizeName(alias)).includes(channelName) + const fromSameCountry = playlist.country.code === item.country return hasSameName && fromSameCountry }) @@ -40,4 +41,8 @@ async function removeBlacklisted(playlist) { return playlist } +function normalizeName(str) { + return str.replace(/[^a-zA-Z0-9 ]/gi, '').toLowerCase() +} + main() From a9ebb223e687171a8d18c22807e46dec20b8bc13 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Sun, 22 Aug 2021 16:02:24 +0300 Subject: [PATCH 2/8] wip --- scripts/helpers/blacklist.json | 624 +++++++++++++++++++++++++++++++++ 1 file changed, 624 insertions(+) diff --git a/scripts/helpers/blacklist.json b/scripts/helpers/blacklist.json index 8893f5de14..3234e04fe7 100644 --- a/scripts/helpers/blacklist.json +++ b/scripts/helpers/blacklist.json @@ -11,12 +11,66 @@ "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", "aliases": [] }, + { + "name": "Astro SuperSport", + "country": "my", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Azteca", + "country": "mx", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["TV Azteca"] + }, { "name": "Cooking Channel", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", "aliases": [] }, + { + "name": "DAZN 1", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["DAZN 1 Spain"] + }, + { + "name": "DAZN 2", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["DAZN 2 Spain"] + }, + { + "name": "DAZN 3", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["DAZN 3 Spain"] + }, + { + "name": "DAZN 4", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["DAZN 4 Spain"] + }, + { + "name": "Diema Sport", + "country": "bg", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Diema Sport 2", + "country": "bg", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Diema Sport 3", + "country": "bg", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, { "name": "Discovery Asia", "country": "us", @@ -131,6 +185,96 @@ "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", "aliases": [] }, + { + "name": "Eleven Sports 1 FR", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["Eleven Sports 1 France"] + }, + { + "name": "Eleven Sports 1 NL", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["Eleven Sports 1 Belgium"] + }, + { + "name": "Eleven Sports 1 Polska", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["Eleven Sports 1 Poland"] + }, + { + "name": "Eleven Sports 1 Portugal", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Eleven Sports 2 NL", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["Eleven Sports 2 Belgium"] + }, + { + "name": "Eleven Sports 2 Polska", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["Eleven Sports 2 Poland"] + }, + { + "name": "Eleven Sports 2 Portugal", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Eleven Sports 3 Portugal", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Eleven Sports 3 Polska", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["Eleven Sports 3 Poland"] + }, + { + "name": "Eleven Sports 4 Portugal", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Eleven Sports 4 Polska", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["Eleven Sports 4 Poland"] + }, + { + "name": "Eleven Sports 5 Portugal", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Eleven Sports 6 Portugal", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "ESPN", + "country": "us", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "ESPN 2", + "country": "us", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, { "name": "Eurosport 1", "country": "fr", @@ -179,6 +323,12 @@ "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", "aliases": [] }, + { + "name": "Flow Sports", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, { "name": "Food Network", "country": "us", @@ -191,12 +341,24 @@ "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", "aliases": ["foodtv"] }, + { + "name": "Fox Sports", + "country": "us", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, { "name": "Frisbee", "country": "it", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", "aliases": [] }, + { + "name": "Futbol", + "country": "tj", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["Football TV", "ТВ Футбол", "Футбол"] + }, { "name": "Giallo", "country": "it", @@ -245,12 +407,138 @@ "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", "aliases": [] }, + { + "name": "Mola TV 1", + "country": "id", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Mola TV 2", + "country": "id", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Mola TV Free", + "country": "id", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["Mola TV"] + }, + { + "name": "Movistar Liga de Campeones 1", + "country": "es", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Movistar Liga de Campeones 2", + "country": "es", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Movistar Liga de Campeones 3", + "country": "es", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Movistar Liga de Campeones 4", + "country": "es", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Movistar Liga de Campeones 5", + "country": "es", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Movistar Liga de Campeones 6", + "country": "es", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Movistar Liga de Campeones 7", + "country": "es", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Movistar Liga de Campeones 8", + "country": "es", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Nova Sport 1", + "country": "cz", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Nova Sport 2", + "country": "cz", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Nova Sport 3", + "country": "cz", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Nova Sports 1", + "country": "gr", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Nova Sports 2", + "country": "gr", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Nova Sports 3", + "country": "gr", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Nova Sports 4", + "country": "gr", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Nova Sports 5", + "country": "gr", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Nova Sports 6", + "country": "gr", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, { "name": "Nove", "country": "it", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", "aliases": [] }, + { + "name": "PPTV HD 36", + "country": "th", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["PPTV", "PPTV HD"] + }, { "name": "OWN", "country": "us", @@ -275,12 +563,282 @@ "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", "aliases": [] }, + { + "name": "Setanta Sports Ukrain", + "country": "ie", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Setanta Sports + Ukrain", + "country": "ie", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["Setanta Sports +"] + }, + { + "name": "Setanta Sports 1 Evraziya", + "country": "ie", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["Setanta Sports Eurasia"] + }, + { + "name": "Setanta Sports 2 Evraziya", + "country": "ie", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["Setanta Sports 2 Eurasia"] + }, + { + "name": "Setanta Sports Georgia", + "country": "ie", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Sky Sports", + "country": "uk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Sky Sport Bundesliga 1", + "country": "de", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Sky Sport Bundesliga 2", + "country": "de", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Sky Sport Bundesliga 3", + "country": "de", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Sky Sport Bundesliga 4", + "country": "de", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Sky Sport Bundesliga 5", + "country": "de", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Sky Sport Bundesliga 6", + "country": "de", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Sky Sport Bundesliga 7", + "country": "de", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Sky Sport Bundesliga 8", + "country": "de", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Sky Sport Bundesliga 9", + "country": "de", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Sky Sport Bundesliga 10", + "country": "de", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, { "name": "Sky TG24", "country": "it", "dmca_notice": "https://github.com/iptv-org/iptv/pull/2294", "aliases": [] }, + { + "name": "Sony Ten 1", + "country": "in", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Sony Ten 2", + "country": "in", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Sony Ten 3", + "country": "in", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Sony Ten 4", + "country": "in", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "Sport Klub 1 Crna Gora", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["SK1", "SK1 HD"] + }, + { + "name": "Sport Klub 1 Hrvatska", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["SK1", "SK1 HD"] + }, + { + "name": "Sport Klub 1 Slovenija", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["SK1", "SK1 HD"] + }, + { + "name": "Sport Klub 1 Srbija", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["SK1", "SK1 HD"] + }, + { + "name": "Sport Klub 2 Slovenija", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["SK2", "SK2 HD"] + }, + { + "name": "Sport Klub 2 Srbija", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["SK2", "SK2 HD"] + }, + { + "name": "Sport Klub 3", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["SK3", "SK3 HD"] + }, + { + "name": "Sport Klub 4", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["SK4", "SK4 HD"] + }, + { + "name": "Sport Klub 5", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["SK5"] + }, + { + "name": "Sport Klub 6", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["SK6"] + }, + { + "name": "Sport Klub 7", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["SK7"] + }, + { + "name": "Sport Klub 8", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["SK8"] + }, + { + "name": "Sport Klub 9", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["SK9"] + }, + { + "name": "Sport Klub 10", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["SK10"] + }, + { + "name": "Sport Klub HD", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["SK HD"] + }, + { + "name": "SportsNet", + "country": "ca", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "StarHub TV", + "country": "sg", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "SuperSport 1", + "country": "al", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "SuperSport 2", + "country": "al", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "SuperSport 3", + "country": "al", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "SuperSport 4", + "country": "al", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "SuperSport 5", + "country": "al", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "SuperSport 6", + "country": "al", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "SuperSport 7", + "country": "al", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "TV3 Sport", + "country": "dk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["TV 3 Sport"] + }, { "name": "TLC", "country": "us", @@ -305,6 +863,18 @@ "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", "aliases": [] }, + { + "name": "TV Varzish", + "country": "tj", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["Varzish TV", "Варзиш ТВ"] + }, + { + "name": "tvN Asia", + "country": "kr", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["tvN"] + }, { "name": "Tvn 24 Bis", "country": "pl", @@ -365,16 +935,70 @@ "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", "aliases": [] }, + { + "name": "V Sport +", + "country": "no", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "V Sport 1 Norge", + "country": "no", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "V Sport 1 Sverige", + "country": "no", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "V Sport 2", + "country": "no", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "V Sport 3", + "country": "no", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "V Sport Football", + "country": "no", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, { "name": "Vox", "country": "no", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", "aliases": [] }, + { + "name": "VTV Cab", + "country": "kr", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["VTVcab"] + }, { "name": "World Discovery", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", "aliases": [] + }, + { + "name": "Xee", + "country": "dk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": [] + }, + { + "name": "XtvN", + "country": "kr", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "aliases": ["X tvN"] } ] From f1d5acdc0b4d4d595c433216b6d86f13c9ee93bb Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Sun, 22 Aug 2021 17:50:24 +0300 Subject: [PATCH 3/8] Update filter.js --- scripts/filter.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/filter.js b/scripts/filter.js index 3ca71d927e..04f6f26443 100644 --- a/scripts/filter.js +++ b/scripts/filter.js @@ -21,11 +21,9 @@ async function main() { function removeBlacklisted(playlist) { const channels = playlist.channels.filter(channel => { - const channelName = normalizeName(channel.name) return !blacklist.find(item => { - const hasSameName = - normalizeName(item.name) === channelName || - item.aliases.map(alias => normalizeName(alias)).includes(channelName) + const regexp = new RegExp(item.regex, 'i') + const hasSameName = regexp.test(channel.name) const fromSameCountry = playlist.country.code === item.country return hasSameName && fromSameCountry @@ -41,8 +39,4 @@ function removeBlacklisted(playlist) { return playlist } -function normalizeName(str) { - return str.replace(/[^a-zA-Z0-9 ]/gi, '').toLowerCase() -} - main() From 7ca5310307c6c3791d755503e5dc876f80b7a962 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Sun, 22 Aug 2021 17:54:32 +0300 Subject: [PATCH 4/8] Update blacklist.json --- scripts/helpers/blacklist.json | 736 ++++++++------------------------- 1 file changed, 182 insertions(+), 554 deletions(-) diff --git a/scripts/helpers/blacklist.json b/scripts/helpers/blacklist.json index 3234e04fe7..52b7a95815 100644 --- a/scripts/helpers/blacklist.json +++ b/scripts/helpers/blacklist.json @@ -3,1002 +3,630 @@ "name": "Animal Planet", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Animal Planet$" + }, + { + "name": "Arena 4", + "country": "hu", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "regex": "^Arena( |)4$" }, { "name": "Asian Food Network", "country": "sg", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Asian Food Network$" }, { "name": "Astro SuperSport", "country": "my", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^Astro SuperSport$" }, { - "name": "Azteca", + "name": "Azteca 7", "country": "mx", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["TV Azteca"] + "regex": "^Azteca 7$" + }, + { + "name": "beIN Sports", + "country": "qa", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "regex": "^beIN Sports" + }, + { + "name": "Canal+ Sport", + "country": "fr", + "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", + "regex": "^Canal( |)+ Sport" }, { "name": "Cooking Channel", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Cooking Channel$" }, { - "name": "DAZN 1", + "name": "DAZN", "country": "uk", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["DAZN 1 Spain"] - }, - { - "name": "DAZN 2", - "country": "uk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["DAZN 2 Spain"] - }, - { - "name": "DAZN 3", - "country": "uk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["DAZN 3 Spain"] - }, - { - "name": "DAZN 4", - "country": "uk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["DAZN 4 Spain"] + "regex": "^DAZN($| [1-4] .*)$" }, { "name": "Diema Sport", "country": "bg", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^Diema Sport($| [1-3])$" }, { - "name": "Diema Sport 2", - "country": "bg", + "name": "Digi Sport", + "country": "ro", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Diema Sport 3", - "country": "bg", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^Digi Sport($| [1-4].*)" }, { "name": "Discovery Asia", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery Asia$" }, { "name": "Discovery Channel", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery Channel$" }, { "name": "Discovery Civiliztion", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery Civiliztion$" }, { "name": "Discovery en Espanol", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery en Espanol$" }, { "name": "Discovery Family", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery Family$" }, { "name": "Discovery Historia", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery Historia$" }, { "name": "Discovery History", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery History$" }, { "name": "Discovery Home and Health", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery Home and Health$" }, { "name": "Discovery Life", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery Life$" }, { "name": "Discovery Science", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery Science$" }, { "name": "Discovery Shed", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery Shed$" }, { "name": "Discovery Theater", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery Theater$" }, { "name": "Discovery Travel and Living", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery Travel and Living$" }, { "name": "Discovery Turbo Xtra", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery Turbo Xtra$" }, { "name": "Discovery World", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery World$" }, { "name": "Discovery", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Discovery$" }, { "name": "DIY Network", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^DIY Network$" }, { "name": "DKiss", "country": "es", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^DKiss$" }, { "name": "DMax", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^DMax$" }, { - "name": "Eleven Sports 1 FR", + "name": "Eleven Sports", "country": "uk", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["Eleven Sports 1 France"] - }, - { - "name": "Eleven Sports 1 NL", - "country": "uk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["Eleven Sports 1 Belgium"] - }, - { - "name": "Eleven Sports 1 Polska", - "country": "uk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["Eleven Sports 1 Poland"] - }, - { - "name": "Eleven Sports 1 Portugal", - "country": "uk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Eleven Sports 2 NL", - "country": "uk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["Eleven Sports 2 Belgium"] - }, - { - "name": "Eleven Sports 2 Polska", - "country": "uk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["Eleven Sports 2 Poland"] - }, - { - "name": "Eleven Sports 2 Portugal", - "country": "uk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Eleven Sports 3 Portugal", - "country": "uk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Eleven Sports 3 Polska", - "country": "uk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["Eleven Sports 3 Poland"] - }, - { - "name": "Eleven Sports 4 Portugal", - "country": "uk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Eleven Sports 4 Polska", - "country": "uk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["Eleven Sports 4 Poland"] - }, - { - "name": "Eleven Sports 5 Portugal", - "country": "uk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Eleven Sports 6 Portugal", - "country": "uk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^Eleven Sports($| [1-6] .*)$" }, { "name": "ESPN", "country": "us", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "ESPN 2", - "country": "us", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Eurosport 1", - "country": "fr", - "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] - }, - { - "name": "Eurosport 2", - "country": "fr", - "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^ESPN($|[1-3]| .*)$" }, { "name": "Eurosport", "country": "fr", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Eurosport($| [1-2])$" }, { "name": "eve", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^eve$" }, { "name": "Familia Discovery", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Familia Discovery$" }, { "name": "Fatafeat", "country": "eg", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Fatafeat$" }, { "name": "FEM", "country": "no", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^FEM$" }, { "name": "Fine Living", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Fine Living$" }, { "name": "Flow Sports", "country": "uk", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^Flow Sports$" }, { "name": "Food Network", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Food Network$" }, { "name": "food tv", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": ["foodtv"] + "regex": "^food( |)tv$" }, { "name": "Fox Sports", "country": "us", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^Fox Sports$" }, { "name": "Frisbee", "country": "it", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Frisbee$" }, { "name": "Futbol", "country": "tj", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["Football TV", "ТВ Футбол", "Футбол"] + "regex": "^(Futbol|Football TV|ТВ Футбол|Футбол)$" + }, + { + "name": "GTV Sports", + "country": "gh", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "regex": "^GTV Sports" }, { "name": "Giallo", "country": "it", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Giallo$" }, { "name": "GolfTV", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": ["Golf TV"] + "regex": "^Golf( |)TV$" }, { "name": "HGTV", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^HGTV$" }, { "name": "Investigation Discovery", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": ["ID Investigation Discovery", "ID Investigation", "ID"] + "regex": "^(Investigation Discovery|ID Investigation Discovery|ID Investigation|ID)$" }, { "name": "K2", "country": "it", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^K2$" }, { "name": "Living Channel", "country": "nz", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Living Channel$" + }, + { + "name": "LookSport", + "country": "ro", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "regex": "^Look( |)Sport" }, { "name": "Mango", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Mango$" + }, + { + "name": "Match!", + "country": "ru", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "regex": "^(Match|Матч)" }, { "name": "Motortrend", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Motortrend$" }, { - "name": "Mola TV 1", + "name": "Mola TV", "country": "id", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^Mola TV($| .*)$" }, { - "name": "Mola TV 2", - "country": "id", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Mola TV Free", - "country": "id", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["Mola TV"] - }, - { - "name": "Movistar Liga de Campeones 1", + "name": "Movistar Liga de Campeones", "country": "es", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^Movistar Liga de Campeones [1-8]$" }, { - "name": "Movistar Liga de Campeones 2", - "country": "es", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Movistar Liga de Campeones 3", - "country": "es", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Movistar Liga de Campeones 4", - "country": "es", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Movistar Liga de Campeones 5", - "country": "es", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Movistar Liga de Campeones 6", - "country": "es", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Movistar Liga de Campeones 7", - "country": "es", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Movistar Liga de Campeones 8", - "country": "es", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Nova Sport 1", + "name": "Nova Sport", "country": "cz", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^Nova Sport [1-3]$" }, { - "name": "Nova Sport 2", - "country": "cz", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Nova Sport 3", - "country": "cz", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Nova Sports 1", + "name": "Nova Sports", "country": "gr", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Nova Sports 2", - "country": "gr", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Nova Sports 3", - "country": "gr", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Nova Sports 4", - "country": "gr", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Nova Sports 5", - "country": "gr", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Nova Sports 6", - "country": "gr", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^Nova Sports [1-6]$" }, { "name": "Nove", "country": "it", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Nove($| .*)$" }, { "name": "PPTV HD 36", "country": "th", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["PPTV", "PPTV HD"] + "regex": "^PPTV($| HD)$" + }, + { + "name": "One", + "country": "il", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "regex": "^One$" }, { "name": "OWN", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": ["Oprah"] + "regex": "^(OWN|Oprah)$" }, { "name": "Quest Red", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Quest Red$" }, { "name": "Quest", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Quest$" }, { "name": "Real Time", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Real Time$" }, { - "name": "Setanta Sports Ukrain", - "country": "ie", + "name": "SABC Sport ", + "country": "za", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^SABC Sport" }, { - "name": "Setanta Sports + Ukrain", + "name": "Setanta Sports", "country": "ie", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["Setanta Sports +"] - }, - { - "name": "Setanta Sports 1 Evraziya", - "country": "ie", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["Setanta Sports Eurasia"] - }, - { - "name": "Setanta Sports 2 Evraziya", - "country": "ie", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["Setanta Sports 2 Eurasia"] - }, - { - "name": "Setanta Sports Georgia", - "country": "ie", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^Setanta Sports($| .*)$" }, { "name": "Sky Sports", "country": "uk", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^Sky Sports$" }, { - "name": "Sky Sport Bundesliga 1", + "name": "Sky Sport Bundesliga", "country": "de", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Sky Sport Bundesliga 2", - "country": "de", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Sky Sport Bundesliga 3", - "country": "de", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Sky Sport Bundesliga 4", - "country": "de", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Sky Sport Bundesliga 5", - "country": "de", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Sky Sport Bundesliga 6", - "country": "de", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Sky Sport Bundesliga 7", - "country": "de", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Sky Sport Bundesliga 8", - "country": "de", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Sky Sport Bundesliga 9", - "country": "de", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Sky Sport Bundesliga 10", - "country": "de", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^Sky Sport Bundesliga [0-9]+$" }, { "name": "Sky TG24", "country": "it", "dmca_notice": "https://github.com/iptv-org/iptv/pull/2294", - "aliases": [] + "regex": "^Sky TG24$" }, { - "name": "Sony Ten 1", + "name": "Sony Ten", "country": "in", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^Sony Ten [1-4]$" }, { - "name": "Sony Ten 2", - "country": "in", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Sony Ten 3", - "country": "in", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Sony Ten 4", - "country": "in", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "Sport Klub 1 Crna Gora", + "name": "Spíler TV", "country": "hu", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["SK1", "SK1 HD"] + "regex": "^Spíler( |[1-2] )TV$" }, { - "name": "Sport Klub 1 Hrvatska", - "country": "hu", + "name": "Šport TV", + "country": "si", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["SK1", "SK1 HD"] + "regex": "^(Šport|Sport) TV" }, { - "name": "Sport Klub 1 Slovenija", + "name": "Sport Klub", "country": "hu", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["SK1", "SK1 HD"] - }, - { - "name": "Sport Klub 1 Srbija", - "country": "hu", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["SK1", "SK1 HD"] - }, - { - "name": "Sport Klub 2 Slovenija", - "country": "hu", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["SK2", "SK2 HD"] - }, - { - "name": "Sport Klub 2 Srbija", - "country": "hu", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["SK2", "SK2 HD"] - }, - { - "name": "Sport Klub 3", - "country": "hu", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["SK3", "SK3 HD"] - }, - { - "name": "Sport Klub 4", - "country": "hu", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["SK4", "SK4 HD"] - }, - { - "name": "Sport Klub 5", - "country": "hu", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["SK5"] - }, - { - "name": "Sport Klub 6", - "country": "hu", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["SK6"] - }, - { - "name": "Sport Klub 7", - "country": "hu", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["SK7"] - }, - { - "name": "Sport Klub 8", - "country": "hu", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["SK8"] - }, - { - "name": "Sport Klub 9", - "country": "hu", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["SK9"] - }, - { - "name": "Sport Klub 10", - "country": "hu", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["SK10"] - }, - { - "name": "Sport Klub HD", - "country": "hu", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["SK HD"] + "regex": "^(Sport Klub|SK[1-9])" }, { "name": "SportsNet", "country": "ca", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^SportsNet$" }, { "name": "StarHub TV", "country": "sg", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^StarHub TV$" }, { - "name": "SuperSport 1", + "name": "StarSat", + "country": "za", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "regex": "^StarSat$" + }, + { + "name": "StarTimes TV", + "country": "mz", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "regex": "^StarTimes TV" + }, + { + "name": "SuperSport", "country": "al", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^SuperSport [1-7]$" }, { - "name": "SuperSport 2", - "country": "al", + "name": "Tivibu Spor", + "country": "tr", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "SuperSport 3", - "country": "al", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "SuperSport 4", - "country": "al", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "SuperSport 5", - "country": "al", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "SuperSport 6", - "country": "al", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "SuperSport 7", - "country": "al", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "TV3 Sport", - "country": "dk", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["TV 3 Sport"] + "regex": "^Tivibu Spor" }, { "name": "TLC", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^TLC$" }, { "name": "Trvl Channel", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Trvl Channel$" + }, + { + "name": "TSN", + "country": "mt", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "regex": "^TSN$" }, { "name": "TTV", "country": "pl", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^TTV$" }, { "name": "TV Norge", "country": "no", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^TV Norge$" }, { "name": "TV Varzish", "country": "tj", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["Varzish TV", "Варзиш ТВ"] + "regex": "^(TV Varzish|Varzish TV|Варзиш ТВ)$" + }, + { + "name": "TV3 Sport", + "country": "dk", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", + "regex": "^TV( |)3 Sport$" }, { "name": "tvN Asia", "country": "kr", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["tvN"] + "regex": "^tvN($| Asia)$" }, { "name": "Tvn 24 Bis", "country": "pl", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Tvn 24 Bis$" }, { "name": "TVN 24", "country": "pl", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^TVN 24$" }, { "name": "Tvn 7", "country": "pl", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Tvn 7$" }, { "name": "TVN Extra", "country": "pl", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^TVN Extra$" }, { "name": "TVN Fabula", "country": "pl", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^TVN Fabula$" }, { "name": "TVN Meteo", "country": "pl", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^TVN Meteo$" }, { "name": "TVN Style", "country": "pl", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^TVN Style$" }, { "name": "TVN Turbo", "country": "pl", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^TVN Turbo$" }, { "name": "TVN Warszawa", "country": "pl", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^TVN Warszawa$" }, { "name": "TVN", "country": "pl", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^TVN$" }, { - "name": "V Sport +", + "name": "V Sport", "country": "no", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "V Sport 1 Norge", - "country": "no", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "V Sport 1 Sverige", - "country": "no", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "V Sport 2", - "country": "no", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "V Sport 3", - "country": "no", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] - }, - { - "name": "V Sport Football", - "country": "no", - "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^V Sport" }, { "name": "Vox", "country": "no", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^Vox$" }, { "name": "VTV Cab", "country": "kr", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["VTVcab"] + "regex": "^VTV( |)Cab$" }, { "name": "World Discovery", "country": "us", "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", - "aliases": [] + "regex": "^World Discovery$" }, { "name": "Xee", "country": "dk", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": [] + "regex": "^Xee$" }, { "name": "XtvN", "country": "kr", "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", - "aliases": ["X tvN"] + "regex": "^X( |)tvN$" } ] From 1d93552dc9de240b26c155c642b1a007a7136478 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Sun, 22 Aug 2021 18:02:44 +0300 Subject: [PATCH 5/8] Update auto-update.yml for test only --- .github/workflows/auto-update.yml | 324 +++++++++++++++--------------- 1 file changed, 161 insertions(+), 163 deletions(-) diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml index 02c34fa307..233666304b 100644 --- a/.github/workflows/auto-update.yml +++ b/.github/workflows/auto-update.yml @@ -24,169 +24,167 @@ jobs: strategy: fail-fast: false matrix: - country: - [ - ad, - ae, - af, - ag, - al, - am, - ao, - ar, - at, - au, - aw, - az, - ba, - bb, - bd, - be, - bf, - bg, - bh, - bn, - bo, - br, - bs, - by, - ca, - cd, - cg, - ch, - ci, - cl, - cm, - cn, - co, - cr, - cu, - cw, - cy, - cz, - de, - dk, - do, - dz, - ec, - ee, - eg, - es, - et, - fi, - fj, - fo, - fr, - pf, - ge, - gh, - gm, - gn, - gp, - gq, - gr, - gt, - hk, - hn, - hr, - ht, - hu, - id, - ie, - il, - in, - iq, - ir, - is, - it, - jm, - jo, - jp, - ke, - kg, - kh, - kp, - kr, - kw, - kz, - la, - lb, - li, - lk, - lt, - lu, - lv, - ly, - ma, - mc, - md, - me, - mk, - ml, - mm, - mn, - mo, - mt, - mv, - mx, - my, - mz, - ne, - ng, - ni, - nl, - no, - np, - nz, - om, - pa, - pe, - ph, - pk, - pl, - pr, - ps, - pt, - py, - qa, - ro, - rs, - ru, - rw, - sa, - sd, - se, - sg, - si, - sk, - sl, - sm, - sn, - so, - sv, - sy, - th, - tj, - tm, - tn, - tr, - tt, - tw, - tz, - ua, - ug, - uk, - us, - uy, - uz, - va, - ve, - vi, - vn, - xk, - ye, - zm - ] + country: [] + # ad, + # ae, + # af, + # ag, + # al, + # am, + # ao, + # ar, + # at, + # au, + # aw, + # az, + # ba, + # bb, + # bd, + # be, + # bf, + # bg, + # bh, + # bn, + # bo, + # br, + # bs, + # by, + # ca, + # cd, + # cg, + # ch, + # ci, + # cl, + # cm, + # cn, + # co, + # cr, + # cu, + # cw, + # cy, + # cz, + # de, + # dk, + # do, + # dz, + # ec, + # ee, + # eg, + # es, + # et, + # fi, + # fj, + # fo, + # fr, + # pf, + # ge, + # gh, + # gm, + # gn, + # gp, + # gq, + # gr, + # gt, + # hk, + # hn, + # hr, + # ht, + # hu, + # id, + # ie, + # il, + # in, + # iq, + # ir, + # is, + # it, + # jm, + # jo, + # jp, + # ke, + # kg, + # kh, + # kp, + # kr, + # kw, + # kz, + # la, + # lb, + # li, + # lk, + # lt, + # lu, + # lv, + # ly, + # ma, + # mc, + # md, + # me, + # mk, + # ml, + # mm, + # mn, + # mo, + # mt, + # mv, + # mx, + # my, + # mz, + # ne, + # ng, + # ni, + # nl, + # no, + # np, + # nz, + # om, + # pa, + # pe, + # ph, + # pk, + # pl, + # pr, + # ps, + # pt, + # py, + # qa, + # ro, + # rs, + # ru, + # rw, + # sa, + # sd, + # se, + # sg, + # si, + # sk, + # sl, + # sm, + # sn, + # so, + # sv, + # sy, + # th, + # tj, + # tm, + # tn, + # tr, + # tt, + # tw, + # tz, + # ua, + # ug, + # uk, + # us, + # uy, + # uz, + # va, + # ve, + # vi, + # vn, + # xk, + # ye, + # zm steps: - name: Checkout uses: actions/checkout@v2 From a2e662a540d029b5efe667db02bf7e1c5ae2121f Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Sun, 22 Aug 2021 18:04:31 +0300 Subject: [PATCH 6/8] Update auto-update.yml for test only --- .github/workflows/auto-update.yml | 323 +++++++++++++++--------------- 1 file changed, 162 insertions(+), 161 deletions(-) diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml index 233666304b..668dcb8cc1 100644 --- a/.github/workflows/auto-update.yml +++ b/.github/workflows/auto-update.yml @@ -24,167 +24,168 @@ jobs: strategy: fail-fast: false matrix: - country: [] - # ad, - # ae, - # af, - # ag, - # al, - # am, - # ao, - # ar, - # at, - # au, - # aw, - # az, - # ba, - # bb, - # bd, - # be, - # bf, - # bg, - # bh, - # bn, - # bo, - # br, - # bs, - # by, - # ca, - # cd, - # cg, - # ch, - # ci, - # cl, - # cm, - # cn, - # co, - # cr, - # cu, - # cw, - # cy, - # cz, - # de, - # dk, - # do, - # dz, - # ec, - # ee, - # eg, - # es, - # et, - # fi, - # fj, - # fo, - # fr, - # pf, - # ge, - # gh, - # gm, - # gn, - # gp, - # gq, - # gr, - # gt, - # hk, - # hn, - # hr, - # ht, - # hu, - # id, - # ie, - # il, - # in, - # iq, - # ir, - # is, - # it, - # jm, - # jo, - # jp, - # ke, - # kg, - # kh, - # kp, - # kr, - # kw, - # kz, - # la, - # lb, - # li, - # lk, - # lt, - # lu, - # lv, - # ly, - # ma, - # mc, - # md, - # me, - # mk, - # ml, - # mm, - # mn, - # mo, - # mt, - # mv, - # mx, - # my, - # mz, - # ne, - # ng, - # ni, - # nl, - # no, - # np, - # nz, - # om, - # pa, - # pe, - # ph, - # pk, - # pl, - # pr, - # ps, - # pt, - # py, - # qa, - # ro, - # rs, - # ru, - # rw, - # sa, - # sd, - # se, - # sg, - # si, - # sk, - # sl, - # sm, - # sn, - # so, - # sv, - # sy, - # th, - # tj, - # tm, - # tn, - # tr, - # tt, - # tw, - # tz, - # ua, - # ug, - # uk, - # us, - # uy, - # uz, - # va, - # ve, - # vi, - # vn, - # xk, - # ye, - # zm + country: [ + ad + # ae, + # af, + # ag, + # al, + # am, + # ao, + # ar, + # at, + # au, + # aw, + # az, + # ba, + # bb, + # bd, + # be, + # bf, + # bg, + # bh, + # bn, + # bo, + # br, + # bs, + # by, + # ca, + # cd, + # cg, + # ch, + # ci, + # cl, + # cm, + # cn, + # co, + # cr, + # cu, + # cw, + # cy, + # cz, + # de, + # dk, + # do, + # dz, + # ec, + # ee, + # eg, + # es, + # et, + # fi, + # fj, + # fo, + # fr, + # pf, + # ge, + # gh, + # gm, + # gn, + # gp, + # gq, + # gr, + # gt, + # hk, + # hn, + # hr, + # ht, + # hu, + # id, + # ie, + # il, + # in, + # iq, + # ir, + # is, + # it, + # jm, + # jo, + # jp, + # ke, + # kg, + # kh, + # kp, + # kr, + # kw, + # kz, + # la, + # lb, + # li, + # lk, + # lt, + # lu, + # lv, + # ly, + # ma, + # mc, + # md, + # me, + # mk, + # ml, + # mm, + # mn, + # mo, + # mt, + # mv, + # mx, + # my, + # mz, + # ne, + # ng, + # ni, + # nl, + # no, + # np, + # nz, + # om, + # pa, + # pe, + # ph, + # pk, + # pl, + # pr, + # ps, + # pt, + # py, + # qa, + # ro, + # rs, + # ru, + # rw, + # sa, + # sd, + # se, + # sg, + # si, + # sk, + # sl, + # sm, + # sn, + # so, + # sv, + # sy, + # th, + # tj, + # tm, + # tn, + # tr, + # tt, + # tw, + # tz, + # ua, + # ug, + # uk, + # us, + # uy, + # uz, + # va, + # ve, + # vi, + # vn, + # xk, + # ye, + # zm + ] steps: - name: Checkout uses: actions/checkout@v2 From e4642ac3d68be2d95f6f50ca0f573ce7c02ec3a0 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Sun, 22 Aug 2021 18:21:57 +0300 Subject: [PATCH 7/8] Update auto-update.yml --- .github/workflows/auto-update.yml | 323 +++++++++++++++--------------- 1 file changed, 162 insertions(+), 161 deletions(-) diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml index 668dcb8cc1..02c34fa307 100644 --- a/.github/workflows/auto-update.yml +++ b/.github/workflows/auto-update.yml @@ -24,167 +24,168 @@ jobs: strategy: fail-fast: false matrix: - country: [ - ad - # ae, - # af, - # ag, - # al, - # am, - # ao, - # ar, - # at, - # au, - # aw, - # az, - # ba, - # bb, - # bd, - # be, - # bf, - # bg, - # bh, - # bn, - # bo, - # br, - # bs, - # by, - # ca, - # cd, - # cg, - # ch, - # ci, - # cl, - # cm, - # cn, - # co, - # cr, - # cu, - # cw, - # cy, - # cz, - # de, - # dk, - # do, - # dz, - # ec, - # ee, - # eg, - # es, - # et, - # fi, - # fj, - # fo, - # fr, - # pf, - # ge, - # gh, - # gm, - # gn, - # gp, - # gq, - # gr, - # gt, - # hk, - # hn, - # hr, - # ht, - # hu, - # id, - # ie, - # il, - # in, - # iq, - # ir, - # is, - # it, - # jm, - # jo, - # jp, - # ke, - # kg, - # kh, - # kp, - # kr, - # kw, - # kz, - # la, - # lb, - # li, - # lk, - # lt, - # lu, - # lv, - # ly, - # ma, - # mc, - # md, - # me, - # mk, - # ml, - # mm, - # mn, - # mo, - # mt, - # mv, - # mx, - # my, - # mz, - # ne, - # ng, - # ni, - # nl, - # no, - # np, - # nz, - # om, - # pa, - # pe, - # ph, - # pk, - # pl, - # pr, - # ps, - # pt, - # py, - # qa, - # ro, - # rs, - # ru, - # rw, - # sa, - # sd, - # se, - # sg, - # si, - # sk, - # sl, - # sm, - # sn, - # so, - # sv, - # sy, - # th, - # tj, - # tm, - # tn, - # tr, - # tt, - # tw, - # tz, - # ua, - # ug, - # uk, - # us, - # uy, - # uz, - # va, - # ve, - # vi, - # vn, - # xk, - # ye, - # zm + country: + [ + ad, + ae, + af, + ag, + al, + am, + ao, + ar, + at, + au, + aw, + az, + ba, + bb, + bd, + be, + bf, + bg, + bh, + bn, + bo, + br, + bs, + by, + ca, + cd, + cg, + ch, + ci, + cl, + cm, + cn, + co, + cr, + cu, + cw, + cy, + cz, + de, + dk, + do, + dz, + ec, + ee, + eg, + es, + et, + fi, + fj, + fo, + fr, + pf, + ge, + gh, + gm, + gn, + gp, + gq, + gr, + gt, + hk, + hn, + hr, + ht, + hu, + id, + ie, + il, + in, + iq, + ir, + is, + it, + jm, + jo, + jp, + ke, + kg, + kh, + kp, + kr, + kw, + kz, + la, + lb, + li, + lk, + lt, + lu, + lv, + ly, + ma, + mc, + md, + me, + mk, + ml, + mm, + mn, + mo, + mt, + mv, + mx, + my, + mz, + ne, + ng, + ni, + nl, + no, + np, + nz, + om, + pa, + pe, + ph, + pk, + pl, + pr, + ps, + pt, + py, + qa, + ro, + rs, + ru, + rw, + sa, + sd, + se, + sg, + si, + sk, + sl, + sm, + sn, + so, + sv, + sy, + th, + tj, + tm, + tn, + tr, + tt, + tw, + tz, + ua, + ug, + uk, + us, + uy, + uz, + va, + ve, + vi, + vn, + xk, + ye, + zm ] steps: - name: Checkout From 4b4b10807a043c8b0054ff575575f2369340daed Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Sun, 22 Aug 2021 18:30:18 +0300 Subject: [PATCH 8/8] Update blacklist.json --- scripts/helpers/blacklist.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/helpers/blacklist.json b/scripts/helpers/blacklist.json index 52b7a95815..f5c735d0e6 100644 --- a/scripts/helpers/blacklist.json +++ b/scripts/helpers/blacklist.json @@ -38,7 +38,7 @@ { "name": "Canal+ Sport", "country": "fr", - "dmca_notice": "https://github.com/iptv-org/iptv/issues/1831", + "dmca_notice": "https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md", "regex": "^Canal( |)+ Sport" }, {