Merge branch 'iptv-org:master' into master

This commit is contained in:
AntiPontifex 2022-11-15 20:45:50 -05:00 committed by GitHub
commit d49bd10a98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 324 additions and 200 deletions

View file

@ -3,7 +3,6 @@ AnimalPlanetAfrica.za,https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetAustralia.au,https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetBrazil.br,https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetCanada.ca,https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetChina.cn,https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetEast.us,https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetGermany.de,https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetHungary.hu,https://github.com/iptv-org/iptv/issues/1831
@ -14,7 +13,7 @@ AnimalPlanetNetherlands.nl,https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetPoland.pl,https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetRomania.ro,https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetRussia.ru,https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetTaiwan.tw,https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetSoutheastAsia.sg,https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetTurkey.tr,https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetUK.uk,https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetUKPlus1.uk,https://github.com/iptv-org/iptv/issues/1831
@ -135,8 +134,7 @@ DigiSport2Romania.ro,https://github.com/github/dmca/blob/master/2020/09/2020-09-
DigiSport3Hungary.hu,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
DigiSport3Romania.ro,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
DigiSport4Romania.ro,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
DiscoveryAsiaJapan.jp,https://github.com/iptv-org/iptv/issues/1831
DiscoveryAsiaSouthKorea.kr,https://github.com/iptv-org/iptv/issues/1831
DiscoveryAsia.sg,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelAustralia.au,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelAustraliaPlus2.au,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelBelgium.be,https://github.com/iptv-org/iptv/issues/1831
@ -144,8 +142,6 @@ DiscoveryChannelBrazil.br,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelBulgaria.bg,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelCanada.ca,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelChile.cl,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelChina.cn,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelChinaHotels.cn,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelDenmark.dk,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelEast.us,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelEstonia.ee,https://github.com/iptv-org/iptv/issues/1831
@ -176,7 +172,6 @@ DiscoveryChannelSouth.us,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelSoutheastAsia.sg,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelSpain.es,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelSweden.se,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelTaiwan.tw,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelTurkey.tr,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelUK.uk,https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelUKPlus1.uk,https://github.com/iptv-org/iptv/issues/1831
@ -241,8 +236,8 @@ DIYNetwork.us,https://github.com/iptv-org/iptv/issues/1831
DIYNetworkCanada.ca,https://github.com/iptv-org/iptv/issues/1831
DKiss.es,https://github.com/iptv-org/iptv/issues/1831
DMAX.de,https://github.com/iptv-org/iptv/issues/1831
DMAXAsia.sg,https://github.com/iptv-org/iptv/issues/1831
DMAXItaly.it,https://github.com/iptv-org/iptv/issues/1831
DMAXSoutheastAsia.sg,https://github.com/iptv-org/iptv/issues/1831
DMAXSpain.es,https://github.com/iptv-org/iptv/issues/1831
DMAXTurkey.tr,https://github.com/iptv-org/iptv/issues/1831
DMAXUK.uk,https://github.com/iptv-org/iptv/issues/1831
@ -353,7 +348,7 @@ Eurosport4K.fr,https://github.com/iptv-org/iptv/issues/1831
EurosportAsia.fr,https://github.com/iptv-org/iptv/issues/1831
EurosportIndia.in,https://github.com/iptv-org/iptv/issues/1831
EurosportNorway.no,https://github.com/iptv-org/iptv/issues/1831
Eve.us,https://github.com/iptv-org/iptv/issues/1831
EVE.us,https://github.com/iptv-org/iptv/issues/1831
Fatafeat.ae,https://github.com/iptv-org/iptv/issues/1831
FEM.no,https://github.com/iptv-org/iptv/issues/1831
Focus.it,https://github.zendesk.com/attachments/token/FL9J24PDKdm0zzJJ3tKyXonmA/?name=2022-02-01-nagra.rtf
@ -733,24 +728,22 @@ TLCNetherlands.nl,https://github.com/iptv-org/iptv/issues/1831
TLCNewZealand.nz,https://github.com/iptv-org/iptv/issues/1831
TLCNorway.no,https://github.com/iptv-org/iptv/issues/1831
TLCPanregional.us,https://github.com/iptv-org/iptv/issues/1831
TLCPhilippines.ph,https://github.com/iptv-org/iptv/issues/1831
TLCPoland.pl,https://github.com/iptv-org/iptv/issues/1831
TLCRomania.ro,https://github.com/iptv-org/iptv/issues/1831
TLCRussia.ru,https://github.com/iptv-org/iptv/issues/1831
TLCSouth.us,https://github.com/iptv-org/iptv/issues/1831
TLCSoutheastAsia.us,https://github.com/iptv-org/iptv/issues/1831
TLCSoutheastAsia.sg,https://github.com/iptv-org/iptv/issues/1831
TLCSweden.se,https://github.com/iptv-org/iptv/issues/1831
TLCTaiwan.tw,https://github.com/iptv-org/iptv/issues/1831
TLCTurkey.tr,https://github.com/iptv-org/iptv/issues/1831
TLCUK.uk,https://github.com/iptv-org/iptv/issues/1831
TLCUKPlus1.uk,https://github.com/iptv-org/iptv/issues/1831
TLCWest.us,https://github.com/iptv-org/iptv/issues/1831
TravelChannelAsia.uk,https://github.com/iptv-org/iptv/issues/1831
TravelChannelAustralia.au,https://github.com/iptv-org/iptv/issues/1831
TravelChannelEast.us,https://github.com/iptv-org/iptv/issues/1831
TravelChannelEMEA.uk,https://github.com/iptv-org/iptv/issues/1831
TravelChannelIndia.in,https://github.com/iptv-org/iptv/issues/1831
TravelChannelPoland.pl,https://github.com/iptv-org/iptv/issues/1831
TravelChannelSoutheastAsia.sg,https://github.com/iptv-org/iptv/issues/1831
TravelChannelWest.us,https://github.com/iptv-org/iptv/issues/1831
TSN1.mt,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
TSN2.mt,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md

1 channel ref
3 AnimalPlanetAustralia.au https://github.com/iptv-org/iptv/issues/1831
4 AnimalPlanetBrazil.br https://github.com/iptv-org/iptv/issues/1831
5 AnimalPlanetCanada.ca https://github.com/iptv-org/iptv/issues/1831
AnimalPlanetChina.cn https://github.com/iptv-org/iptv/issues/1831
6 AnimalPlanetEast.us https://github.com/iptv-org/iptv/issues/1831
7 AnimalPlanetGermany.de https://github.com/iptv-org/iptv/issues/1831
8 AnimalPlanetHungary.hu https://github.com/iptv-org/iptv/issues/1831
13 AnimalPlanetPoland.pl https://github.com/iptv-org/iptv/issues/1831
14 AnimalPlanetRomania.ro https://github.com/iptv-org/iptv/issues/1831
15 AnimalPlanetRussia.ru https://github.com/iptv-org/iptv/issues/1831
16 AnimalPlanetTaiwan.tw AnimalPlanetSoutheastAsia.sg https://github.com/iptv-org/iptv/issues/1831
17 AnimalPlanetTurkey.tr https://github.com/iptv-org/iptv/issues/1831
18 AnimalPlanetUK.uk https://github.com/iptv-org/iptv/issues/1831
19 AnimalPlanetUKPlus1.uk https://github.com/iptv-org/iptv/issues/1831
134 DigiSport3Hungary.hu https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
135 DigiSport3Romania.ro https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
136 DigiSport4Romania.ro https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
137 DiscoveryAsiaJapan.jp DiscoveryAsia.sg https://github.com/iptv-org/iptv/issues/1831
DiscoveryAsiaSouthKorea.kr https://github.com/iptv-org/iptv/issues/1831
138 DiscoveryChannelAustralia.au https://github.com/iptv-org/iptv/issues/1831
139 DiscoveryChannelAustraliaPlus2.au https://github.com/iptv-org/iptv/issues/1831
140 DiscoveryChannelBelgium.be https://github.com/iptv-org/iptv/issues/1831
142 DiscoveryChannelBulgaria.bg https://github.com/iptv-org/iptv/issues/1831
143 DiscoveryChannelCanada.ca https://github.com/iptv-org/iptv/issues/1831
144 DiscoveryChannelChile.cl https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelChina.cn https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelChinaHotels.cn https://github.com/iptv-org/iptv/issues/1831
145 DiscoveryChannelDenmark.dk https://github.com/iptv-org/iptv/issues/1831
146 DiscoveryChannelEast.us https://github.com/iptv-org/iptv/issues/1831
147 DiscoveryChannelEstonia.ee https://github.com/iptv-org/iptv/issues/1831
172 DiscoveryChannelSoutheastAsia.sg https://github.com/iptv-org/iptv/issues/1831
173 DiscoveryChannelSpain.es https://github.com/iptv-org/iptv/issues/1831
174 DiscoveryChannelSweden.se https://github.com/iptv-org/iptv/issues/1831
DiscoveryChannelTaiwan.tw https://github.com/iptv-org/iptv/issues/1831
175 DiscoveryChannelTurkey.tr https://github.com/iptv-org/iptv/issues/1831
176 DiscoveryChannelUK.uk https://github.com/iptv-org/iptv/issues/1831
177 DiscoveryChannelUKPlus1.uk https://github.com/iptv-org/iptv/issues/1831
236 DIYNetworkCanada.ca https://github.com/iptv-org/iptv/issues/1831
237 DKiss.es https://github.com/iptv-org/iptv/issues/1831
238 DMAX.de https://github.com/iptv-org/iptv/issues/1831
DMAXAsia.sg https://github.com/iptv-org/iptv/issues/1831
239 DMAXItaly.it https://github.com/iptv-org/iptv/issues/1831
240 DMAXSoutheastAsia.sg https://github.com/iptv-org/iptv/issues/1831
241 DMAXSpain.es https://github.com/iptv-org/iptv/issues/1831
242 DMAXTurkey.tr https://github.com/iptv-org/iptv/issues/1831
243 DMAXUK.uk https://github.com/iptv-org/iptv/issues/1831
348 EurosportAsia.fr https://github.com/iptv-org/iptv/issues/1831
349 EurosportIndia.in https://github.com/iptv-org/iptv/issues/1831
350 EurosportNorway.no https://github.com/iptv-org/iptv/issues/1831
351 Eve.us EVE.us https://github.com/iptv-org/iptv/issues/1831
352 Fatafeat.ae https://github.com/iptv-org/iptv/issues/1831
353 FEM.no https://github.com/iptv-org/iptv/issues/1831
354 Focus.it https://github.zendesk.com/attachments/token/FL9J24PDKdm0zzJJ3tKyXonmA/?name=2022-02-01-nagra.rtf
728 TLCNewZealand.nz https://github.com/iptv-org/iptv/issues/1831
729 TLCNorway.no https://github.com/iptv-org/iptv/issues/1831
730 TLCPanregional.us https://github.com/iptv-org/iptv/issues/1831
TLCPhilippines.ph https://github.com/iptv-org/iptv/issues/1831
731 TLCPoland.pl https://github.com/iptv-org/iptv/issues/1831
732 TLCRomania.ro https://github.com/iptv-org/iptv/issues/1831
733 TLCRussia.ru https://github.com/iptv-org/iptv/issues/1831
734 TLCSouth.us https://github.com/iptv-org/iptv/issues/1831
735 TLCSoutheastAsia.us TLCSoutheastAsia.sg https://github.com/iptv-org/iptv/issues/1831
736 TLCSweden.se https://github.com/iptv-org/iptv/issues/1831
TLCTaiwan.tw https://github.com/iptv-org/iptv/issues/1831
737 TLCTurkey.tr https://github.com/iptv-org/iptv/issues/1831
738 TLCUK.uk https://github.com/iptv-org/iptv/issues/1831
739 TLCUKPlus1.uk https://github.com/iptv-org/iptv/issues/1831
740 TLCWest.us https://github.com/iptv-org/iptv/issues/1831
TravelChannelAsia.uk https://github.com/iptv-org/iptv/issues/1831
741 TravelChannelAustralia.au https://github.com/iptv-org/iptv/issues/1831
742 TravelChannelEast.us https://github.com/iptv-org/iptv/issues/1831
743 TravelChannelEMEA.uk https://github.com/iptv-org/iptv/issues/1831
744 TravelChannelIndia.in https://github.com/iptv-org/iptv/issues/1831
745 TravelChannelPoland.pl https://github.com/iptv-org/iptv/issues/1831
746 TravelChannelSoutheastAsia.sg https://github.com/iptv-org/iptv/issues/1831
747 TravelChannelWest.us https://github.com/iptv-org/iptv/issues/1831
748 TSN1.mt https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md
749 TSN2.mt https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md

File diff suppressed because it is too large Load diff

View file

@ -186,7 +186,7 @@ function validateChannelId(row, i) {
.replace(/^@/i, 'At')
.replace(/^&/i, 'And')
.replace(/\+/gi, 'Plus')
.replace(/\s\-/gi, ' Minus')
.replace(/\s\-(\d)/gi, ' Minus$1')
.replace(/[^a-z\d]+/gi, '')
}