From 6bb56b3c831c72dad2ffbea55df567c0d4d07adf Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Thu, 16 Nov 2023 12:57:00 +0300
Subject: [PATCH 01/17] Fixes xmltv_id
---
sites/allente.se/allente.se_dk.channels.xml | 2 +-
sites/allente.se/allente.se_fi.channels.xml | 2 +-
sites/allente.se/allente.se_no.channels.xml | 8 ++++----
sites/allente.se/allente.se_se.channels.xml | 4 ++--
sites/cgates.lt/cgates.lt.channels.xml | 10 +++++-----
sites/comteco.com.bo/comteco.com.bo.channels.xml | 2 +-
sites/delta.nl/delta.nl.channels.xml | 2 +-
sites/directv.com.ar/directv.com.ar.channels.xml | 4 ++--
sites/directv.com.uy/directv.com.uy.channels.xml | 2 +-
sites/gatotv.com/gatotv.com.channels.xml | 6 +++---
sites/guide.dstv.com/guide.dstv.com.channels.xml | 2 +-
sites/horizon.tv/horizon.tv.channels.xml | 12 ++++++------
sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml | 12 ++++++------
sites/magentatv.at/magentatv.at.channels.xml | 2 +-
sites/magentatv.de/magentatv.de.channels.xml | 2 +-
.../maxtv.hrvatskitelekom.hr.channels.xml | 6 +++---
sites/melita.com/melita.com.channels.xml | 2 +-
sites/mi.tv/mi.tv_ar.channels.xml | 2 +-
sites/mtel.ba/mtel.ba.channels.xml | 2 +-
sites/mts.rs/mts.rs.channels.xml | 2 +-
.../mujtvprogram.cz/mujtvprogram.cz.channels.xml | 14 +++++++-------
sites/musor.tv/musor.tv.channels.xml | 12 ++++++------
.../programacion-tv.elpais.com.channels.xml | 2 +-
sites/programetv.ro/programetv.ro.channels.xml | 6 +++---
.../programtv.onet.pl.channels.xml | 6 +++---
sites/proximusmwc.be/proximusmwc.be.channels.xml | 2 +-
sites/reportv.com.ar/reportv.com.ar.channels.xml | 2 +-
sites/siba.com.co/siba.com.co.channels.xml | 2 +-
.../startimestv.com/startimestv.com.channels.xml | 2 +-
sites/teliatv.ee/teliatv.ee_en.channels.xml | 2 +-
sites/teliatv.ee/teliatv.ee_et.channels.xml | 8 ++++----
sites/teliatv.ee/teliatv.ee_ru.channels.xml | 8 ++++----
sites/telkku.com/telkku.com.channels.xml | 4 ++--
sites/tv.blue.ch/tv.blue.ch.channels.xml | 2 +-
sites/tv.dir.bg/tv.dir.bg.channels.xml | 14 +++++++-------
sites/tv.lv/tv.lv.channels.xml | 8 ++++----
sites/tv.nu/tv.nu.channels.xml | 10 +++++-----
sites/tv.post.lu/tv.post.lu.channels.xml | 2 +-
sites/tv.yandex.ru/tv.yandex.ru.channels.xml | 2 +-
sites/tv24.se/tv24.se.channels.xml | 8 ++++----
sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml | 14 +++++++-------
sites/tvgids.nl/tvgids.nl.channels.xml | 2 +-
sites/tvmusor.hu/tvmusor.hu.channels.xml | 8 ++++----
sites/tvprofil.com/tvprofil.com.channels.xml | 16 ++++++++--------
sites/vivacom.bg/vivacom.bg.channels.xml | 14 +++++++-------
sites/ziggogo.tv/ziggogo.tv.channels.xml | 2 +-
46 files changed, 129 insertions(+), 129 deletions(-)
diff --git a/sites/allente.se/allente.se_dk.channels.xml b/sites/allente.se/allente.se_dk.channels.xml
index 983b93a7..c118b2a0 100644
--- a/sites/allente.se/allente.se_dk.channels.xml
+++ b/sites/allente.se/allente.se_dk.channels.xml
@@ -40,7 +40,7 @@
TV 2 News
TV 2 Sport
TV 2 Zulu
- TV 3 Danmark
+ TV 3 Danmark
TV 3 Max
TV3+
TV 3 Puls
diff --git a/sites/allente.se/allente.se_fi.channels.xml b/sites/allente.se/allente.se_fi.channels.xml
index 60150bfc..97c62cca 100644
--- a/sites/allente.se/allente.se_fi.channels.xml
+++ b/sites/allente.se/allente.se_fi.channels.xml
@@ -13,7 +13,7 @@
National Geographic Wild
Nick Jr
TV 3 Sverige
- TV 6 Sverige
+ TV 6 Sverige
V Film Action
V Film Family
V Film Hits
diff --git a/sites/allente.se/allente.se_no.channels.xml b/sites/allente.se/allente.se_no.channels.xml
index d34514ef..9aa1ecf7 100644
--- a/sites/allente.se/allente.se_no.channels.xml
+++ b/sites/allente.se/allente.se_no.channels.xml
@@ -43,11 +43,11 @@
TV 2 Sport 2
TV 2 Sport Premium
TV 2 Zebra
- TV 3 Danmark
- TV 3 Norge
+ TV 3 Danmark
+ TV 3 Norge
TV 3 Sverige
- TV 6 Norge
- TV 6 Sverige
+ TV 6 Norge
+ TV 6 Sverige
TV Norge
V 4
V Film Action
diff --git a/sites/allente.se/allente.se_se.channels.xml b/sites/allente.se/allente.se_se.channels.xml
index 6efceca2..17851a22 100644
--- a/sites/allente.se/allente.se_se.channels.xml
+++ b/sites/allente.se/allente.se_se.channels.xml
@@ -84,8 +84,8 @@
TV 4 Fakta
TV 4 Film
TV 4 Guld
- TV 6
- TV 8
+ TV 6
+ TV 8
TV 10
TV 12
V Film Action
diff --git a/sites/cgates.lt/cgates.lt.channels.xml b/sites/cgates.lt/cgates.lt.channels.xml
index 944046db..b8fea329 100644
--- a/sites/cgates.lt/cgates.lt.channels.xml
+++ b/sites/cgates.lt/cgates.lt.channels.xml
@@ -52,7 +52,7 @@
Epic Drama HD
Eurochannel
Euronews RU
- Extreme Sports
+ Extreme Sports
Fashion TV
Fast&Fun Box HD
Fight Sports HD
@@ -111,10 +111,10 @@
Star Family
Tiji
TV1 HD
- TV3 HD
- TV3 Plus HD
- TV6 HD
- TV8 HD
+ TV3 HD
+ TV3 Plus HD
+ TV6 HD
+ TV8 HD
Bolt
TVP Info
TVP Polonia
diff --git a/sites/comteco.com.bo/comteco.com.bo.channels.xml b/sites/comteco.com.bo/comteco.com.bo.channels.xml
index f205f064..bc2519e4 100644
--- a/sites/comteco.com.bo/comteco.com.bo.channels.xml
+++ b/sites/comteco.com.bo/comteco.com.bo.channels.xml
@@ -17,7 +17,7 @@
Caracol TV
Cartoon Network
Cinecanal Este
- Cinemax
+ Cinemax
CNN
Cubavisión
De Película
diff --git a/sites/delta.nl/delta.nl.channels.xml b/sites/delta.nl/delta.nl.channels.xml
index 762d906a..b833256f 100644
--- a/sites/delta.nl/delta.nl.channels.xml
+++ b/sites/delta.nl/delta.nl.channels.xml
@@ -11,7 +11,7 @@
CGTN
CNN International Europe
EuroNews English
- Extreme Sports Channel
+ Extreme Sports Channel
FashionTV Europe
MTV 00s
MTV 80s
diff --git a/sites/directv.com.ar/directv.com.ar.channels.xml b/sites/directv.com.ar/directv.com.ar.channels.xml
index 750f9ab9..d6694a2b 100644
--- a/sites/directv.com.ar/directv.com.ar.channels.xml
+++ b/sites/directv.com.ar/directv.com.ar.channels.xml
@@ -189,7 +189,7 @@
-
+
@@ -274,7 +274,7 @@
CINE.AR (ARG)
Cinecanal (ARG)
Cinelatino
- Cinemax Sur
+ Cinemax Sur
Magazine
CNN Chile
CNN en español
diff --git a/sites/directv.com.uy/directv.com.uy.channels.xml b/sites/directv.com.uy/directv.com.uy.channels.xml
index 34f9fa4f..68a73df5 100644
--- a/sites/directv.com.uy/directv.com.uy.channels.xml
+++ b/sites/directv.com.uy/directv.com.uy.channels.xml
@@ -24,7 +24,7 @@
CGTN-Español
Cinecanal (COL)
Cinelatino
- Cinemax Sur
+ Cinemax Sur
Magazine
CNN Chile
CNN en español
diff --git a/sites/gatotv.com/gatotv.com.channels.xml b/sites/gatotv.com/gatotv.com.channels.xml
index aadfbb94..b1bb4f06 100644
--- a/sites/gatotv.com/gatotv.com.channels.xml
+++ b/sites/gatotv.com/gatotv.com.channels.xml
@@ -208,9 +208,9 @@
Cinelatino
Cinema Platino
Cinema +
- Cinemax Chile
- Cinemax México
- Cinemax Panregional
+ Cinemax Chile
+ Cinemax México
+ Cinemax Panregional
Cine Mexicano
Cine Nostalgia
Cine Sony
diff --git a/sites/guide.dstv.com/guide.dstv.com.channels.xml b/sites/guide.dstv.com/guide.dstv.com.channels.xml
index a3617351..02133757 100644
--- a/sites/guide.dstv.com/guide.dstv.com.channels.xml
+++ b/sites/guide.dstv.com/guide.dstv.com.channels.xml
@@ -257,7 +257,7 @@
Trybe TV
Tshwane TV
TV 1
- TV 3
+ TV 3
TV 47
TV5Monde Afrique
TV Africa
diff --git a/sites/horizon.tv/horizon.tv.channels.xml b/sites/horizon.tv/horizon.tv.channels.xml
index e30e0451..5f1e964e 100644
--- a/sites/horizon.tv/horizon.tv.channels.xml
+++ b/sites/horizon.tv/horizon.tv.channels.xml
@@ -33,7 +33,7 @@
EroXXX HD
Euronews HD
Extasy HD
- Extreme Sports
+ Extreme Sports
FashionBox
Fashion TV HD
Fast & FunBox HD
@@ -58,8 +58,8 @@
Barrandov Krimi HD
Bober
Cartoon Network HD
- Cinemax 2 HD
- Cinemax HD
+ Cinemax 2 HD
+ Cinemax HD
CNN Prima News HD
Cool TV
CS History
@@ -93,9 +93,9 @@
FILM+ HU
Folklorika HD
Food Network HD
- HBO 2 HD
- HBO 3 HD
- HBO HD
+ HBO 2 HD
+ HBO 3 HD
+ HBO HD
HirTV
History HD
Hobby TV HD
diff --git a/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml b/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
index 5412c5eb..a6b2fb2c 100644
--- a/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
+++ b/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
@@ -19,8 +19,8 @@
Channel 5
5 Kanal
8 Kanal International
- Cinemax 2
- Cinemax
+ Cinemax 2
+ Cinemax
CNN Prima News
Cool TV
Credo TV
@@ -86,9 +86,9 @@
Gold TV
Golf Channel Czechia
HaHa TV
- HBO 2
- HBO 3
- HBO
+ HBO 2
+ HBO 3
+ HBO
HGTV
Hír TV
History Channel
@@ -424,7 +424,7 @@
EuroNews Magyar
EWTN Europe
Extasy TV
- Extreme Sports Channel
+ Extreme Sports Channel
FashionTV Europe
FightBox HD
Film 4
diff --git a/sites/magentatv.at/magentatv.at.channels.xml b/sites/magentatv.at/magentatv.at.channels.xml
index d59686d9..ba80cf38 100644
--- a/sites/magentatv.at/magentatv.at.channels.xml
+++ b/sites/magentatv.at/magentatv.at.channels.xml
@@ -29,7 +29,7 @@
euronews (D)
Eurosport 1 Germany
Evil Angel TV
- Extreme Sports Channel
+ Extreme Sports Channel
Fix&Foxi
GEO TV HD
GoTV
diff --git a/sites/magentatv.de/magentatv.de.channels.xml b/sites/magentatv.de/magentatv.de.channels.xml
index c38a7a02..53a1479c 100644
--- a/sites/magentatv.de/magentatv.de.channels.xml
+++ b/sites/magentatv.de/magentatv.de.channels.xml
@@ -58,7 +58,7 @@
Eurosport 1
Eurosport 2
Eurostar TV
- Extreme Sports
+ Extreme Sports
Fashion TV
FC BAYERN.TV LIVE
France 24 francais
diff --git a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml
index 056f1e24..49c507ce 100644
--- a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml
+++ b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml
@@ -23,7 +23,7 @@
CNBC Europe
CNN International Europe
EuroNews English
- Extreme Sports Channel
+ Extreme Sports Channel
FashionTV Europe
France 24 English
Grand
@@ -55,8 +55,8 @@
BBC Earth Romania
BHT 1
Boomerang Central & Eastern Europe
- Cinemax 2
- Cinemax
+ Cinemax 2
+ Cinemax
CineStar TV 1 Hrvatska
CineStar TV Action Hrvatska
CineStar TV Fantasy
diff --git a/sites/melita.com/melita.com.channels.xml b/sites/melita.com/melita.com.channels.xml
index e6473644..def891cc 100644
--- a/sites/melita.com/melita.com.channels.xml
+++ b/sites/melita.com/melita.com.channels.xml
@@ -37,7 +37,7 @@
Eurosport HD
Eurosport 2
EWTN
- Extreme Sports
+ Extreme Sports
FTV HD
f Living
Food Network HD
diff --git a/sites/mi.tv/mi.tv_ar.channels.xml b/sites/mi.tv/mi.tv_ar.channels.xml
index abc027f1..4298d85c 100644
--- a/sites/mi.tv/mi.tv_ar.channels.xml
+++ b/sites/mi.tv/mi.tv_ar.channels.xml
@@ -29,7 +29,7 @@
Cine.ar
Cinecanal
CineLatino
- Cinemax
+ Cinemax
Ciudad Magazine
CM El Canal de la Música
CN23
diff --git a/sites/mtel.ba/mtel.ba.channels.xml b/sites/mtel.ba/mtel.ba.channels.xml
index 29de1faf..d8032634 100644
--- a/sites/mtel.ba/mtel.ba.channels.xml
+++ b/sites/mtel.ba/mtel.ba.channels.xml
@@ -159,7 +159,7 @@
Erotic 8
Erox HD
Eroxxx HD
- Extreme Sports Channel
+ Extreme Sports Channel
JimJam Europe
LFC TV
MTV 00s
diff --git a/sites/mts.rs/mts.rs.channels.xml b/sites/mts.rs/mts.rs.channels.xml
index c7359091..ab878f26 100644
--- a/sites/mts.rs/mts.rs.channels.xml
+++ b/sites/mts.rs/mts.rs.channels.xml
@@ -70,7 +70,7 @@
EuroNews Serbia
Eurosport 1
Eurosport 2
- Extreme Sports Channel
+ Extreme Sports Channel
Face TV
FashionBox HD
Fashion TV Europe
diff --git a/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml b/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml
index a17b4a01..c85c3a80 100644
--- a/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml
+++ b/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml
@@ -58,8 +58,8 @@
CANAL+ Domo
Cartoon Network
CBS Reality
- Cinemax2
- Cinemax
+ Cinemax2
+ Cinemax
CNBC Europe
CNN Prima NEWS HD
Crime & Investigation
@@ -95,9 +95,9 @@
Film+
Food Network
Golf Channel
- HBO2
- HBO3
- HBO
+ HBO2
+ HBO3
+ HBO
History HD
HTV1
HTV2
@@ -216,7 +216,7 @@
Erox
Eroxxx
EuroNews
- Extreme Sports Channel
+ Extreme Sports Channel
Fashion TV Europe
Fast&FunBox
FightBox
@@ -251,7 +251,7 @@
Duck TV
Dvojka HD
FilmBox Premium
- HBO3
+ HBO3
Jednotka HD
JOJCinema.sk
JOJ Family HD
diff --git a/sites/musor.tv/musor.tv.channels.xml b/sites/musor.tv/musor.tv.channels.xml
index 396f76fb..8b503e89 100644
--- a/sites/musor.tv/musor.tv.channels.xml
+++ b/sites/musor.tv/musor.tv.channels.xml
@@ -5,7 +5,7 @@
club MTV
E! Entertainment
English Club TV
- Extreme Sports Channel
+ Extreme Sports Channel
Fightbox
Filmbox Arthouse
MTV 00s
@@ -36,8 +36,8 @@
Boomerang
Cartoon Network
CBS Reality
- Cinemax 2
- Cinemax
+ Cinemax 2
+ Cinemax
CNBC
CNN
Comedy Central Family
@@ -86,9 +86,9 @@
Galaxy4
Gametoon
Hatoscsatorna
- HBO 2
- HBO 3
- HBO
+ HBO 2
+ HBO 3
+ HBO
Hegyvidék TV
Heti TV
HGTV
diff --git a/sites/programacion-tv.elpais.com/programacion-tv.elpais.com.channels.xml b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com.channels.xml
index 3ed3f3ce..2b87eccf 100644
--- a/sites/programacion-tv.elpais.com/programacion-tv.elpais.com.channels.xml
+++ b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com.channels.xml
@@ -140,7 +140,7 @@
Eurosport
Eurosport 2
EWTN
- Extreme Sports
+ Extreme Sports
FDF Telecinco
Fox Life
FOX
diff --git a/sites/programetv.ro/programetv.ro.channels.xml b/sites/programetv.ro/programetv.ro.channels.xml
index f93f7a24..a4584a1d 100644
--- a/sites/programetv.ro/programetv.ro.channels.xml
+++ b/sites/programetv.ro/programetv.ro.channels.xml
@@ -37,8 +37,8 @@
Cartoon Network
CBS Reality
CGTN
- Cinemax 2
- Cinemax
+ Cinemax 2
+ Cinemax
Club MTV
CNN
Comedy Central
@@ -76,7 +76,7 @@
Eurosport 1
Eurosport 2
Eurosport 4K
- Extreme Sports Channel
+ Extreme Sports Channel
FashionBox HD
FashionTV
Favorit TV
diff --git a/sites/programtv.onet.pl/programtv.onet.pl.channels.xml b/sites/programtv.onet.pl/programtv.onet.pl.channels.xml
index 31b90da5..726cc034 100644
--- a/sites/programtv.onet.pl/programtv.onet.pl.channels.xml
+++ b/sites/programtv.onet.pl/programtv.onet.pl.channels.xml
@@ -127,8 +127,8 @@
CBS Reality Polska
CGTN
Perviy kanal Europa
- Cinemax 2 Central Europe
- Cinemax Central Europe
+ Cinemax 2 Central Europe
+ Cinemax Central Europe
Club MTV
Comedy Central Polska
Crime + Investigation Polsat
@@ -161,7 +161,7 @@
EuroNews Français
Eurosport 1 Polska
Eurosport 2 Polska
- Extreme Sports Channel Polska
+ Extreme Sports Channel Polska
FashionBox HD
FightBox HD
Fight Klub
diff --git a/sites/proximusmwc.be/proximusmwc.be.channels.xml b/sites/proximusmwc.be/proximusmwc.be.channels.xml
index 877b37c5..16d5f789 100644
--- a/sites/proximusmwc.be/proximusmwc.be.channels.xml
+++ b/sites/proximusmwc.be/proximusmwc.be.channels.xml
@@ -12,7 +12,7 @@
CNN
eSportsONE
Euronews E
- Extreme
+ Extreme
FashionTV
MVTV
MTV Live HD
diff --git a/sites/reportv.com.ar/reportv.com.ar.channels.xml b/sites/reportv.com.ar/reportv.com.ar.channels.xml
index 5eae3c4b..e71bec88 100644
--- a/sites/reportv.com.ar/reportv.com.ar.channels.xml
+++ b/sites/reportv.com.ar/reportv.com.ar.channels.xml
@@ -76,7 +76,7 @@
BOLIVIA TV
BRAZZERS TV
CANAL I
- CINEMAX
+ CINEMAX
CNN
COLOMBEIA
COMEDY CENTRAL
diff --git a/sites/siba.com.co/siba.com.co.channels.xml b/sites/siba.com.co/siba.com.co.channels.xml
index acb17767..35c10954 100644
--- a/sites/siba.com.co/siba.com.co.channels.xml
+++ b/sites/siba.com.co/siba.com.co.channels.xml
@@ -18,7 +18,7 @@
Cinecanal Chile
CineLatino
Cinema +
- Cinemax Latinoamérica
+ Cinemax Latinoamérica
City TV
Claro Cinema
Claro música TV
diff --git a/sites/startimestv.com/startimestv.com.channels.xml b/sites/startimestv.com/startimestv.com.channels.xml
index 19086785..0047a82d 100644
--- a/sites/startimestv.com/startimestv.com.channels.xml
+++ b/sites/startimestv.com/startimestv.com.channels.xml
@@ -300,7 +300,7 @@
TV1
TV 10
TV3 Tanzania
- TV3 Ghana
+ TV3 Ghana
TV5 MONDE
STYLE TV
ALBAYAN TV
diff --git a/sites/teliatv.ee/teliatv.ee_en.channels.xml b/sites/teliatv.ee/teliatv.ee_en.channels.xml
index ec5c38e8..0a876e20 100644
--- a/sites/teliatv.ee/teliatv.ee_en.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_en.channels.xml
@@ -78,7 +78,7 @@
TV1000 Action
TV1000 East
TV1000 World Kino
- TV3 Life
+ TV3 Life
TV3 Sport
TV3 Sport2
Viasat Explore
diff --git a/sites/teliatv.ee/teliatv.ee_et.channels.xml b/sites/teliatv.ee/teliatv.ee_et.channels.xml
index 3fb4c7d5..f659c76a 100644
--- a/sites/teliatv.ee/teliatv.ee_et.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_et.channels.xml
@@ -57,10 +57,10 @@
TV1000 Action
TV1000 East
TV1000 World Kino
- TV3
- TV3 Life
- 3+
- TV6
+ TV3
+ TV3 Life
+ 3+
+ TV6
TVXXI
Viasat Explore
Viasat History
diff --git a/sites/teliatv.ee/teliatv.ee_ru.channels.xml b/sites/teliatv.ee/teliatv.ee_ru.channels.xml
index e7934972..547584aa 100644
--- a/sites/teliatv.ee/teliatv.ee_ru.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ru.channels.xml
@@ -66,13 +66,13 @@
TV1000 Action
TV1000 East
TV1000 World Kino
- TV3
- TV3 Life
- 3+
+ TV3
+ TV3 Life
+ 3+
TV3 Sport
TV3 Sport2
TV5MONDE Europe
- TV6
+ TV6
TVN
TVXXI
Украина 24
diff --git a/sites/telkku.com/telkku.com.channels.xml b/sites/telkku.com/telkku.com.channels.xml
index 4c783c88..978a929a 100644
--- a/sites/telkku.com/telkku.com.channels.xml
+++ b/sites/telkku.com/telkku.com.channels.xml
@@ -57,7 +57,7 @@
C More Sport 2
C More Stars
Discovery Channel
- Extreme Sports
+ Extreme Sports
Fox
Frii
H2
@@ -79,7 +79,7 @@
TV3
TV4
TV5
- TV6
+ TV6
V film ACTION
V film FAMILY
V film HITS
diff --git a/sites/tv.blue.ch/tv.blue.ch.channels.xml b/sites/tv.blue.ch/tv.blue.ch.channels.xml
index c1643889..a13a7b3e 100644
--- a/sites/tv.blue.ch/tv.blue.ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch.channels.xml
@@ -420,7 +420,7 @@
English Club TV
EuroNews English
Eurosport 1
- Extreme Sports Channel
+ Extreme Sports Channel
FashionTV Europe
Film 4 UK
Food Network UK
diff --git a/sites/tv.dir.bg/tv.dir.bg.channels.xml b/sites/tv.dir.bg/tv.dir.bg.channels.xml
index 165d7cc3..7eed8b70 100644
--- a/sites/tv.dir.bg/tv.dir.bg.channels.xml
+++ b/sites/tv.dir.bg/tv.dir.bg.channels.xml
@@ -24,8 +24,8 @@
Cartoon Network
CBS Reality
Perviy kanal
- Cinemax 2
- Cinemax
+ Cinemax 2
+ Cinemax
CNN
Crime + Investigation
Da Vinci
@@ -43,18 +43,18 @@
Eurosport 1
Eurosport 2
Evrokom
- Extreme Sports Channel
+ Extreme Sports Channel
Fen Folk
Fen TV
FilmBox Extra HD
FilmBox Plus
Food Network
Fox
- Fox Crime
+ Fox Crime
Fox Life
- HBO 2
- HBO 3
- HBO
+ HBO 2
+ HBO 3
+ HBO
HGTV
Hobby TV
Investigation Discovery
diff --git a/sites/tv.lv/tv.lv.channels.xml b/sites/tv.lv/tv.lv.channels.xml
index 94926437..91df22e3 100644
--- a/sites/tv.lv/tv.lv.channels.xml
+++ b/sites/tv.lv/tv.lv.channels.xml
@@ -1,6 +1,6 @@
- 3+
+ 3+
Perviy kanal
Epic Drama
Eurosport 1
@@ -11,12 +11,12 @@
REN TV Baltic
TV 1000 CEE
TV 1000 Russkoe Kino
- TV 3
- TV 3 Life
+ TV 3
+ TV 3 Life
TV 3 Mini
TV 3 Sport
TV 3 Sport 2
- TV 6
+ TV 6
Viasat Explore Nordic
Viasat History CEE
Viasat Nature CEE
diff --git a/sites/tv.nu/tv.nu.channels.xml b/sites/tv.nu/tv.nu.channels.xml
index 29a6ea2b..10c8d100 100644
--- a/sites/tv.nu/tv.nu.channels.xml
+++ b/sites/tv.nu/tv.nu.channels.xml
@@ -58,7 +58,7 @@
Eurosport 1
Eurosport 2
Expressen TV
- Extreme Sports Channel
+ Extreme Sports Channel
FTV
Fight Sports
France 2
@@ -135,16 +135,16 @@
TV2
TV2
TV3
- TV3 Danmark
- TV3 Norge
+ TV3 Danmark
+ TV3 Norge
3 Plus Danmark
TV4
TV4 Fakta
TV4 Film
TV4 Guld
TV5 Monde Europe
- TV6
- TV8
+ TV6
+ TV8
TV Chile Internacional
TVE Internacional
TV Polonia
diff --git a/sites/tv.post.lu/tv.post.lu.channels.xml b/sites/tv.post.lu/tv.post.lu.channels.xml
index a1cfcaa3..036c2ba4 100644
--- a/sites/tv.post.lu/tv.post.lu.channels.xml
+++ b/sites/tv.post.lu/tv.post.lu.channels.xml
@@ -211,7 +211,7 @@
English Club TV
Erox HD
Euronews
- Extreme Sports Channel
+ Extreme Sports Channel
FashionBox HD
Fashion TV UHD
FightBox
diff --git a/sites/tv.yandex.ru/tv.yandex.ru.channels.xml b/sites/tv.yandex.ru/tv.yandex.ru.channels.xml
index fbdbf22a..315641ed 100644
--- a/sites/tv.yandex.ru/tv.yandex.ru.channels.xml
+++ b/sites/tv.yandex.ru/tv.yandex.ru.channels.xml
@@ -68,7 +68,7 @@
Eurosport 1 Rossiya
Eurosport 2 Rossiya
Evrokino
- Extreme Sports Channel
+ Extreme Sports Channel
FashionBox HD
Fashion One Europe
FashionTV Russia
diff --git a/sites/tv24.se/tv24.se.channels.xml b/sites/tv24.se/tv24.se.channels.xml
index 9ec1af22..0a4c2f90 100644
--- a/sites/tv24.se/tv24.se.channels.xml
+++ b/sites/tv24.se/tv24.se.channels.xml
@@ -192,7 +192,7 @@
eSportsTV HD
Eurosport 1
Eurosport 2
- Extreme Sports Channel
+ Extreme Sports Channel
FTV HD
France 2
France 24
@@ -266,15 +266,15 @@
TV 2 Zebra
TV2 Zulu
TV3
- TV3 Danmark
+ TV3 Danmark
TV3 Plus
TV3 Sport
TV4
TV4 Fakta
TV4 Film
TV4 Guld
- TV6
- TV8
+ TV6
+ TV8
TVCG Sat
TV Chile
TVE Internacional
diff --git a/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml b/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
index 4bbc6520..39da5f85 100644
--- a/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
+++ b/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
@@ -32,7 +32,7 @@
BN 2
Boomerang
Boom TV
- Brio
+ Brio
CBS Reality
CGTN
Perviy kanal
@@ -74,7 +74,7 @@
Exodus TV
Extasy 4K
Extreme HD
- Extreme Sports Channel
+ Extreme Sports Channel
FashionBox HD
FashionTV Europe
Fast & FunBox HD
@@ -95,7 +95,7 @@
FunBox UHD
Gametoon
Gea TV
- Gold TV
+ Gold TV
Golica TV
Happy
Hayat
@@ -119,7 +119,7 @@
K CN 1
K CN 2
K CN 3
- Kino
+ Kino
Klasik TV
Koroška TV
Legal HD
@@ -179,7 +179,7 @@
Planet TV
Planet TV 2
Play House HD
- Pop TV
+ Pop TV
Pro 7
Prva Srpska TV
Rai 1
@@ -235,7 +235,7 @@
Tržič TV
TV1000
TV 24
- TV 3
+ TV 3
TV 8
TV Arena
TV AS
@@ -257,7 +257,7 @@
TV Slovenija 3
TV Slon Extra
TV Vijesti
- Vaš Kanal
+ Vaš Kanal
Veseljak TV
Viasat Explore HD
Viasat History HD
diff --git a/sites/tvgids.nl/tvgids.nl.channels.xml b/sites/tvgids.nl/tvgids.nl.channels.xml
index d116ec2f..8276fa78 100644
--- a/sites/tvgids.nl/tvgids.nl.channels.xml
+++ b/sites/tvgids.nl/tvgids.nl.channels.xml
@@ -41,7 +41,7 @@
ESPN
Eurosport 1
Eurosport 2
- Extreme Sports Channel
+ Extreme Sports Channel
Film1 Action
Film1 Drama
Film1 Family
diff --git a/sites/tvmusor.hu/tvmusor.hu.channels.xml b/sites/tvmusor.hu/tvmusor.hu.channels.xml
index dcf4a3a4..f0dd09f1 100644
--- a/sites/tvmusor.hu/tvmusor.hu.channels.xml
+++ b/sites/tvmusor.hu/tvmusor.hu.channels.xml
@@ -12,7 +12,7 @@
BBC Earth
Boomerang
Cartoon Network
- Cinemax
+ Cinemax
Comedy Central Family
Comedy Central
Cool
@@ -37,9 +37,9 @@
Film+
Food Network
Hatoscsatorna
- HBO 2
- HBO 3
- HBO
+ HBO 2
+ HBO 3
+ HBO
Hír TV
H!t Music Channel
Izaura TV
diff --git a/sites/tvprofil.com/tvprofil.com.channels.xml b/sites/tvprofil.com/tvprofil.com.channels.xml
index 28fc6030..d56aa084 100644
--- a/sites/tvprofil.com/tvprofil.com.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com.channels.xml
@@ -39,9 +39,9 @@
FilmBox Stars Adria
Folklor TV
Fox Bulgaria
- Fox Crime Bulgaria
+ Fox Crime Bulgaria
Fox Life Bulgaria
- HBO
+ HBO
Hobby TV
Kino Nova
Magic TV
@@ -143,7 +143,7 @@
Boomerang Central & Eastern Europe
Brainz TV
Brazzers TV
- Brio
+ Brio
Canale 5
CBS Reality Europe
CGTN Documentary
@@ -202,7 +202,7 @@
Explorer Histori
Explorer Natyra
Explorer Shkencë
- Extreme Sports Channel
+ Extreme Sports Channel
Face TV
FashionBox HD
FashionTV Europe
@@ -248,7 +248,7 @@
Hayat Music
Hayatovci
Hayat Plus
- HBO Hungary
+ HBO Hungary
HGTV UK
Hír TV
History 2
@@ -275,7 +275,7 @@
K CN 1
K CN 2
K CN 3
- Kino
+ Kino
Kino TV
Kitchen TV
Klan Kosova
@@ -363,7 +363,7 @@
Planet Earth
Planet TV
Playboy TV Europe
- Pop TV
+ Pop TV
Power Türk TV
Power TV
Prime
@@ -486,7 +486,7 @@
TV2 Comedy
TV2 Kids
TV2 Séf
- TV 3
+ TV 3
TV4
TV Arena
TV Belle Amie
diff --git a/sites/vivacom.bg/vivacom.bg.channels.xml b/sites/vivacom.bg/vivacom.bg.channels.xml
index 6d32e1a0..1c4db3f4 100644
--- a/sites/vivacom.bg/vivacom.bg.channels.xml
+++ b/sites/vivacom.bg/vivacom.bg.channels.xml
@@ -28,8 +28,8 @@
Bulgarska Svobodna TV
Cartoon Network
CBS Reality
- Cinemax 2
- Cinemax
+ Cinemax 2
+ Cinemax
Crime + Investigation
Da Vinci
Deluxe Lounge
@@ -58,12 +58,12 @@
Folklor TV
Food Network
Fox HD
- Fox Crime
+ Fox Crime
Fox Life
France 24
- HBO 2
- HBO 3
- HBO
+ HBO 2
+ HBO 3
+ HBO
Hit Mix Channel
Hustler TV
Investigation Discovery
@@ -131,7 +131,7 @@
English Club TV
Eurochannel
EuroNews HD
- Extreme Sports Channel
+ Extreme Sports Channel
FashionBox HD
Fast & FunBox
FightBox HD
diff --git a/sites/ziggogo.tv/ziggogo.tv.channels.xml b/sites/ziggogo.tv/ziggogo.tv.channels.xml
index bdb5a7b9..ab657fc9 100644
--- a/sites/ziggogo.tv/ziggogo.tv.channels.xml
+++ b/sites/ziggogo.tv/ziggogo.tv.channels.xml
@@ -58,7 +58,7 @@
Eurosport 1
Eurosport 2
Evil Angel TV
- Extreme Sports Channel
+ Extreme Sports Channel
Family7
Film 1 Action
Film 1 Drama
From 7db92ae2f70983f95db0b2272730540d78e70ce2 Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Thu, 16 Nov 2023 15:04:32 +0300
Subject: [PATCH 02/17] Upgrade dependencies
Fixes https://github.com/iptv-org/epg/issues/2230
---
package-lock.json | 445 ++++++++++++++++++++++++----------------------
package.json | 4 +-
yarn.lock | 193 +++++++++-----------
3 files changed, 317 insertions(+), 325 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 222ed686..fae52e5b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,7 +30,7 @@
"csv-parser": "^3.0.0",
"cwait": "^1.1.2",
"dayjs": "^1.11.7",
- "epg-grabber": "^0.34.0",
+ "epg-grabber": "^0.35.0",
"epg-parser": "^0.2.0",
"eslint": "^8.17.0",
"eslint-config-prettier": "^9.0.0",
@@ -41,7 +41,7 @@
"inquirer": "^8.2.6",
"jest": "^29.7.0",
"langs": "^2.0.0",
- "libxmljs2": "^0.32.0",
+ "libxmljs2": "^0.33.0",
"lodash": "^4.17.21",
"luxon": "^3.3.0",
"markdown-include": "^0.4.3",
@@ -94,16 +94,73 @@
}
},
"node_modules/@babel/code-frame": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
- "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+ "version": "7.22.13",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+ "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
"dependencies": {
- "@babel/highlight": "^7.22.5"
+ "@babel/highlight": "^7.22.13",
+ "chalk": "^2.4.2"
},
"engines": {
"node": ">=6.9.0"
}
},
+ "node_modules/@babel/code-frame/node_modules/ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dependencies": {
+ "color-convert": "^1.9.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@babel/code-frame/node_modules/chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dependencies": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@babel/code-frame/node_modules/color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dependencies": {
+ "color-name": "1.1.3"
+ }
+ },
+ "node_modules/@babel/code-frame/node_modules/color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+ },
+ "node_modules/@babel/code-frame/node_modules/has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@babel/code-frame/node_modules/supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dependencies": {
+ "has-flag": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/@babel/compat-data": {
"version": "7.22.6",
"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.6.tgz",
@@ -147,11 +204,11 @@
"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
},
"node_modules/@babel/generator": {
- "version": "7.22.7",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.7.tgz",
- "integrity": "sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ==",
+ "version": "7.23.3",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz",
+ "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==",
"dependencies": {
- "@babel/types": "^7.22.5",
+ "@babel/types": "^7.23.3",
"@jridgewell/gen-mapping": "^0.3.2",
"@jridgewell/trace-mapping": "^0.3.17",
"jsesc": "^2.5.1"
@@ -179,20 +236,20 @@
}
},
"node_modules/@babel/helper-environment-visitor": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
- "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+ "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-function-name": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
- "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+ "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
"dependencies": {
- "@babel/template": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/template": "^7.22.15",
+ "@babel/types": "^7.23.0"
},
"engines": {
"node": ">=6.9.0"
@@ -277,9 +334,9 @@
}
},
"node_modules/@babel/helper-validator-identifier": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
- "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+ "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
"engines": {
"node": ">=6.9.0"
}
@@ -306,12 +363,12 @@
}
},
"node_modules/@babel/highlight": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
- "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+ "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
"dependencies": {
- "@babel/helper-validator-identifier": "^7.22.5",
- "chalk": "^2.0.0",
+ "@babel/helper-validator-identifier": "^7.22.20",
+ "chalk": "^2.4.2",
"js-tokens": "^4.0.0"
},
"engines": {
@@ -375,9 +432,9 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.22.7",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
- "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==",
+ "version": "7.23.3",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz",
+ "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==",
"bin": {
"parser": "bin/babel-parser.js"
},
@@ -549,31 +606,31 @@
}
},
"node_modules/@babel/template": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
- "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+ "version": "7.22.15",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+ "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
"dependencies": {
- "@babel/code-frame": "^7.22.5",
- "@babel/parser": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/code-frame": "^7.22.13",
+ "@babel/parser": "^7.22.15",
+ "@babel/types": "^7.22.15"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/traverse": {
- "version": "7.22.8",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
- "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
+ "version": "7.23.3",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz",
+ "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==",
"dependencies": {
- "@babel/code-frame": "^7.22.5",
- "@babel/generator": "^7.22.7",
- "@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-function-name": "^7.22.5",
+ "@babel/code-frame": "^7.22.13",
+ "@babel/generator": "^7.23.3",
+ "@babel/helper-environment-visitor": "^7.22.20",
+ "@babel/helper-function-name": "^7.23.0",
"@babel/helper-hoist-variables": "^7.22.5",
"@babel/helper-split-export-declaration": "^7.22.6",
- "@babel/parser": "^7.22.7",
- "@babel/types": "^7.22.5",
+ "@babel/parser": "^7.23.3",
+ "@babel/types": "^7.23.3",
"debug": "^4.1.0",
"globals": "^11.1.0"
},
@@ -582,12 +639,12 @@
}
},
"node_modules/@babel/types": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
- "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+ "version": "7.23.3",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz",
+ "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==",
"dependencies": {
"@babel/helper-string-parser": "^7.22.5",
- "@babel/helper-validator-identifier": "^7.22.5",
+ "@babel/helper-validator-identifier": "^7.22.20",
"to-fast-properties": "^2.0.0"
},
"engines": {
@@ -2097,12 +2154,6 @@
"@types/node": "*"
}
},
- "node_modules/@types/tough-cookie": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.3.tgz",
- "integrity": "sha512-THo502dA5PzG/sfQH+42Lw3fvmYkceefOspdCwpHRul8ik2Jv1K8I5OZz1AT3/rs46kwgMCe9bSBmDLYkkOMGg==",
- "peer": true
- },
"node_modules/@types/yargs": {
"version": "17.0.24",
"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
@@ -2589,9 +2640,9 @@
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
},
"node_modules/axios": {
- "version": "1.5.1",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
- "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+ "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
"dependencies": {
"follow-redirects": "^1.15.0",
"form-data": "^4.0.0",
@@ -3873,13 +3924,12 @@
}
},
"node_modules/epg-grabber": {
- "version": "0.34.0",
- "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.34.0.tgz",
- "integrity": "sha512-j/2uYRBeDg9IBL6VgjFc7rSTHaefd57e9NuX6TGoHYfr4whsZGmojBAKeaX6PkcGXvGjG2oCXoqiANeWuBisaw==",
+ "version": "0.35.0",
+ "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.35.0.tgz",
+ "integrity": "sha512-DhvciNp3xCTG9VzYR9GU5uDjujW/rG3CgBCy1eP2BEI6I0V5okGWPmEGf73V/IK+hZnbpskjmbeziaK4RXOtBg==",
"dependencies": {
- "axios": "^0.21.1",
+ "axios": "^1.6.1",
"axios-cache-interceptor": "^0.10.3",
- "axios-cookiejar-support": "^1.0.1",
"axios-mock-adapter": "^1.20.0",
"commander": "^7.1.0",
"curl-generator": "^0.2.0",
@@ -3888,9 +3938,10 @@
"epg-parser": "^0.1.6",
"fs-extra": "^11.1.1",
"glob": "^7.1.6",
+ "http-cookie-agent": "^5.0.4",
"lodash": "^4.17.21",
"node-gzip": "^1.1.2",
- "tough-cookie": "^4.0.0",
+ "tough-cookie": "^4.1.3",
"winston": "^3.3.3",
"xml-js": "^1.6.11"
},
@@ -3901,31 +3952,6 @@
"node": ">=10.0.0"
}
},
- "node_modules/epg-grabber/node_modules/axios": {
- "version": "0.21.4",
- "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
- "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
- "dependencies": {
- "follow-redirects": "^1.14.0"
- }
- },
- "node_modules/epg-grabber/node_modules/axios-cookiejar-support": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/axios-cookiejar-support/-/axios-cookiejar-support-1.0.1.tgz",
- "integrity": "sha512-IZJxnAJ99XxiLqNeMOqrPbfR7fRyIfaoSLdPUf4AMQEGkH8URs0ghJK/xtqBsD+KsSr3pKl4DEQjCn834pHMig==",
- "dependencies": {
- "is-redirect": "^1.0.0",
- "pify": "^5.0.0"
- },
- "engines": {
- "node": ">= 10.0.0"
- },
- "peerDependencies": {
- "@types/tough-cookie": ">=2.3.3",
- "axios": ">=0.16.2",
- "tough-cookie": ">=2.3.3"
- }
- },
"node_modules/epg-grabber/node_modules/commander": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
@@ -5148,14 +5174,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/is-redirect": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
- "integrity": "sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw==",
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/is-stream": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
@@ -6023,17 +6041,17 @@
}
},
"node_modules/libxmljs2": {
- "version": "0.32.0",
- "resolved": "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.32.0.tgz",
- "integrity": "sha512-DuvKfSQZeUzw0A4UWZXfcBpr3VqlcJY1b3aw99PxTiX3T5t1rEO4gSpobNrP9S74LIhyDKaAs/lphuErV+n+7w==",
+ "version": "0.33.0",
+ "resolved": "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.33.0.tgz",
+ "integrity": "sha512-Hw74f2/3rbpxc6tkTqe3yrs4v2Tx0rEukrYxaNkXSVKK540i2eqlQxzf1jjG+RlwMuv66WxkkuZHM/OQq6km4w==",
"hasInstallScript": true,
"dependencies": {
- "@mapbox/node-pre-gyp": "^1.0.10",
+ "@mapbox/node-pre-gyp": "^1.0.11",
"bindings": "~1.5.0",
- "nan": "~2.17.0"
+ "nan": "~2.18.0"
},
"engines": {
- "node": ">=16"
+ "node": ">=18"
}
},
"node_modules/lie": {
@@ -6364,9 +6382,9 @@
"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
},
"node_modules/nan": {
- "version": "2.17.0",
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
- "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="
+ "version": "2.18.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
+ "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w=="
},
"node_modules/natural-compare": {
"version": "1.4.0",
@@ -6867,17 +6885,6 @@
"url": "https://github.com/sponsors/jonschlinkert"
}
},
- "node_modules/pify": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
- "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/pirates": {
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
@@ -8571,11 +8578,58 @@
}
},
"@babel/code-frame": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
- "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+ "version": "7.22.13",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+ "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
"requires": {
- "@babel/highlight": "^7.22.5"
+ "@babel/highlight": "^7.22.13",
+ "chalk": "^2.4.2"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "requires": {
+ "color-convert": "^1.9.0"
+ }
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "requires": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ }
+ },
+ "color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "requires": {
+ "color-name": "1.1.3"
+ }
+ },
+ "color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ }
}
},
"@babel/compat-data": {
@@ -8613,11 +8667,11 @@
}
},
"@babel/generator": {
- "version": "7.22.7",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.7.tgz",
- "integrity": "sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ==",
+ "version": "7.23.3",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz",
+ "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==",
"requires": {
- "@babel/types": "^7.22.5",
+ "@babel/types": "^7.23.3",
"@jridgewell/gen-mapping": "^0.3.2",
"@jridgewell/trace-mapping": "^0.3.17",
"jsesc": "^2.5.1"
@@ -8636,17 +8690,17 @@
}
},
"@babel/helper-environment-visitor": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
- "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q=="
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+ "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
},
"@babel/helper-function-name": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
- "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+ "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
"requires": {
- "@babel/template": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/template": "^7.22.15",
+ "@babel/types": "^7.23.0"
}
},
"@babel/helper-hoist-variables": {
@@ -8707,9 +8761,9 @@
"integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
},
"@babel/helper-validator-identifier": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
- "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ=="
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+ "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
},
"@babel/helper-validator-option": {
"version": "7.22.5",
@@ -8727,12 +8781,12 @@
}
},
"@babel/highlight": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
- "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+ "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
"requires": {
- "@babel/helper-validator-identifier": "^7.22.5",
- "chalk": "^2.0.0",
+ "@babel/helper-validator-identifier": "^7.22.20",
+ "chalk": "^2.4.2",
"js-tokens": "^4.0.0"
},
"dependencies": {
@@ -8783,9 +8837,9 @@
}
},
"@babel/parser": {
- "version": "7.22.7",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
- "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
+ "version": "7.23.3",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz",
+ "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw=="
},
"@babel/plugin-syntax-async-generators": {
"version": "7.8.4",
@@ -8900,39 +8954,39 @@
}
},
"@babel/template": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
- "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+ "version": "7.22.15",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+ "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
"requires": {
- "@babel/code-frame": "^7.22.5",
- "@babel/parser": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/code-frame": "^7.22.13",
+ "@babel/parser": "^7.22.15",
+ "@babel/types": "^7.22.15"
}
},
"@babel/traverse": {
- "version": "7.22.8",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
- "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
+ "version": "7.23.3",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz",
+ "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==",
"requires": {
- "@babel/code-frame": "^7.22.5",
- "@babel/generator": "^7.22.7",
- "@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-function-name": "^7.22.5",
+ "@babel/code-frame": "^7.22.13",
+ "@babel/generator": "^7.23.3",
+ "@babel/helper-environment-visitor": "^7.22.20",
+ "@babel/helper-function-name": "^7.23.0",
"@babel/helper-hoist-variables": "^7.22.5",
"@babel/helper-split-export-declaration": "^7.22.6",
- "@babel/parser": "^7.22.7",
- "@babel/types": "^7.22.5",
+ "@babel/parser": "^7.23.3",
+ "@babel/types": "^7.23.3",
"debug": "^4.1.0",
"globals": "^11.1.0"
}
},
"@babel/types": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
- "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+ "version": "7.23.3",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz",
+ "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==",
"requires": {
"@babel/helper-string-parser": "^7.22.5",
- "@babel/helper-validator-identifier": "^7.22.5",
+ "@babel/helper-validator-identifier": "^7.22.20",
"to-fast-properties": "^2.0.0"
}
},
@@ -10026,12 +10080,6 @@
"@types/node": "*"
}
},
- "@types/tough-cookie": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.3.tgz",
- "integrity": "sha512-THo502dA5PzG/sfQH+42Lw3fvmYkceefOspdCwpHRul8ik2Jv1K8I5OZz1AT3/rs46kwgMCe9bSBmDLYkkOMGg==",
- "peer": true
- },
"@types/yargs": {
"version": "17.0.24",
"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
@@ -10349,9 +10397,9 @@
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
},
"axios": {
- "version": "1.5.1",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
- "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+ "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
"requires": {
"follow-redirects": "^1.15.0",
"form-data": "^4.0.0",
@@ -11253,13 +11301,12 @@
"integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA=="
},
"epg-grabber": {
- "version": "0.34.0",
- "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.34.0.tgz",
- "integrity": "sha512-j/2uYRBeDg9IBL6VgjFc7rSTHaefd57e9NuX6TGoHYfr4whsZGmojBAKeaX6PkcGXvGjG2oCXoqiANeWuBisaw==",
+ "version": "0.35.0",
+ "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.35.0.tgz",
+ "integrity": "sha512-DhvciNp3xCTG9VzYR9GU5uDjujW/rG3CgBCy1eP2BEI6I0V5okGWPmEGf73V/IK+hZnbpskjmbeziaK4RXOtBg==",
"requires": {
- "axios": "^0.21.1",
+ "axios": "^1.6.1",
"axios-cache-interceptor": "^0.10.3",
- "axios-cookiejar-support": "^1.0.1",
"axios-mock-adapter": "^1.20.0",
"commander": "^7.1.0",
"curl-generator": "^0.2.0",
@@ -11268,30 +11315,14 @@
"epg-parser": "^0.1.6",
"fs-extra": "^11.1.1",
"glob": "^7.1.6",
+ "http-cookie-agent": "^5.0.4",
"lodash": "^4.17.21",
"node-gzip": "^1.1.2",
- "tough-cookie": "^4.0.0",
+ "tough-cookie": "^4.1.3",
"winston": "^3.3.3",
"xml-js": "^1.6.11"
},
"dependencies": {
- "axios": {
- "version": "0.21.4",
- "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
- "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
- "requires": {
- "follow-redirects": "^1.14.0"
- }
- },
- "axios-cookiejar-support": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/axios-cookiejar-support/-/axios-cookiejar-support-1.0.1.tgz",
- "integrity": "sha512-IZJxnAJ99XxiLqNeMOqrPbfR7fRyIfaoSLdPUf4AMQEGkH8URs0ghJK/xtqBsD+KsSr3pKl4DEQjCn834pHMig==",
- "requires": {
- "is-redirect": "^1.0.0",
- "pify": "^5.0.0"
- }
- },
"commander": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
@@ -12155,11 +12186,6 @@
"resolved": "https://registry.npmjs.org/is-port-reachable/-/is-port-reachable-4.0.0.tgz",
"integrity": "sha512-9UoipoxYmSk6Xy7QFgRv2HDyaysmgSG75TFQs6S+3pDM7ZhKTF/bskZV+0UlABHzKjNVhPjYCLfeZUEg1wXxig=="
},
- "is-redirect": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
- "integrity": "sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw=="
- },
"is-stream": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
@@ -12813,13 +12839,13 @@
}
},
"libxmljs2": {
- "version": "0.32.0",
- "resolved": "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.32.0.tgz",
- "integrity": "sha512-DuvKfSQZeUzw0A4UWZXfcBpr3VqlcJY1b3aw99PxTiX3T5t1rEO4gSpobNrP9S74LIhyDKaAs/lphuErV+n+7w==",
+ "version": "0.33.0",
+ "resolved": "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.33.0.tgz",
+ "integrity": "sha512-Hw74f2/3rbpxc6tkTqe3yrs4v2Tx0rEukrYxaNkXSVKK540i2eqlQxzf1jjG+RlwMuv66WxkkuZHM/OQq6km4w==",
"requires": {
- "@mapbox/node-pre-gyp": "^1.0.10",
+ "@mapbox/node-pre-gyp": "^1.0.11",
"bindings": "~1.5.0",
- "nan": "~2.17.0"
+ "nan": "~2.18.0"
}
},
"lie": {
@@ -13078,9 +13104,9 @@
"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
},
"nan": {
- "version": "2.17.0",
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
- "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="
+ "version": "2.18.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
+ "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w=="
},
"natural-compare": {
"version": "1.4.0",
@@ -13453,11 +13479,6 @@
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
},
- "pify": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
- "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA=="
- },
"pirates": {
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
diff --git a/package.json b/package.json
index 46cbb961..c958c5ec 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
"csv-parser": "^3.0.0",
"cwait": "^1.1.2",
"dayjs": "^1.11.7",
- "epg-grabber": "^0.34.0",
+ "epg-grabber": "^0.35.0",
"epg-parser": "^0.2.0",
"eslint": "^8.17.0",
"eslint-config-prettier": "^9.0.0",
@@ -58,7 +58,7 @@
"inquirer": "^8.2.6",
"jest": "^29.7.0",
"langs": "^2.0.0",
- "libxmljs2": "^0.32.0",
+ "libxmljs2": "^0.33.0",
"lodash": "^4.17.21",
"luxon": "^3.3.0",
"markdown-include": "^0.4.3",
diff --git a/yarn.lock b/yarn.lock
index 62e54274..a28a16a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20,12 +20,13 @@
"@jridgewell/gen-mapping" "^0.3.0"
"@jridgewell/trace-mapping" "^0.3.9"
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.5":
- version "7.22.5"
- resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz"
- integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.22.5":
+ version "7.22.13"
+ resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz"
+ integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
dependencies:
- "@babel/highlight" "^7.22.5"
+ "@babel/highlight" "^7.22.13"
+ chalk "^2.4.2"
"@babel/compat-data@^7.22.6":
version "7.22.6"
@@ -53,12 +54,12 @@
gensync "^1.0.0-beta.2"
json5 "^2.2.2"
-"@babel/generator@^7.22.7", "@babel/generator@^7.7.2":
- version "7.22.7"
- resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.22.7.tgz"
- integrity sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ==
+"@babel/generator@^7.22.7", "@babel/generator@^7.23.3", "@babel/generator@^7.7.2":
+ version "7.23.3"
+ resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz"
+ integrity sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==
dependencies:
- "@babel/types" "^7.22.5"
+ "@babel/types" "^7.23.3"
"@jridgewell/gen-mapping" "^0.3.2"
"@jridgewell/trace-mapping" "^0.3.17"
jsesc "^2.5.1"
@@ -74,18 +75,18 @@
browserslist "^4.21.9"
lru-cache "^5.1.1"
-"@babel/helper-environment-visitor@^7.22.5":
- version "7.22.5"
- resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz"
- integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
+"@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.22.5":
+ version "7.22.20"
+ resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz"
+ integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
-"@babel/helper-function-name@^7.22.5":
- version "7.22.5"
- resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz"
- integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
+"@babel/helper-function-name@^7.23.0":
+ version "7.23.0"
+ resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz"
+ integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
dependencies:
- "@babel/template" "^7.22.5"
- "@babel/types" "^7.22.5"
+ "@babel/template" "^7.22.15"
+ "@babel/types" "^7.23.0"
"@babel/helper-hoist-variables@^7.22.5":
version "7.22.5"
@@ -139,10 +140,10 @@
resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz"
integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
-"@babel/helper-validator-identifier@^7.22.5":
- version "7.22.5"
- resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz"
- integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
+"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.22.5":
+ version "7.22.20"
+ resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz"
+ integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
"@babel/helper-validator-option@^7.22.5":
version "7.22.5"
@@ -158,19 +159,19 @@
"@babel/traverse" "^7.22.6"
"@babel/types" "^7.22.5"
-"@babel/highlight@^7.22.5":
- version "7.22.5"
- resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz"
- integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
+"@babel/highlight@^7.22.13":
+ version "7.22.20"
+ resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz"
+ integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
dependencies:
- "@babel/helper-validator-identifier" "^7.22.5"
- chalk "^2.0.0"
+ "@babel/helper-validator-identifier" "^7.22.20"
+ chalk "^2.4.2"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.5", "@babel/parser@^7.22.7":
- version "7.22.7"
- resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz"
- integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.22.7", "@babel/parser@^7.23.3":
+ version "7.23.3"
+ resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz"
+ integrity sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==
"@babel/plugin-syntax-async-generators@^7.8.4":
version "7.8.4"
@@ -270,38 +271,38 @@
dependencies:
"@babel/helper-plugin-utils" "^7.22.5"
-"@babel/template@^7.22.5", "@babel/template@^7.3.3":
- version "7.22.5"
- resolved "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz"
- integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
+"@babel/template@^7.22.15", "@babel/template@^7.22.5", "@babel/template@^7.3.3":
+ version "7.22.15"
+ resolved "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz"
+ integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
dependencies:
- "@babel/code-frame" "^7.22.5"
- "@babel/parser" "^7.22.5"
- "@babel/types" "^7.22.5"
+ "@babel/code-frame" "^7.22.13"
+ "@babel/parser" "^7.22.15"
+ "@babel/types" "^7.22.15"
"@babel/traverse@^7.22.5", "@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8":
- version "7.22.8"
- resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz"
- integrity sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==
+ version "7.23.3"
+ resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz"
+ integrity sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==
dependencies:
- "@babel/code-frame" "^7.22.5"
- "@babel/generator" "^7.22.7"
- "@babel/helper-environment-visitor" "^7.22.5"
- "@babel/helper-function-name" "^7.22.5"
+ "@babel/code-frame" "^7.22.13"
+ "@babel/generator" "^7.23.3"
+ "@babel/helper-environment-visitor" "^7.22.20"
+ "@babel/helper-function-name" "^7.23.0"
"@babel/helper-hoist-variables" "^7.22.5"
"@babel/helper-split-export-declaration" "^7.22.6"
- "@babel/parser" "^7.22.7"
- "@babel/types" "^7.22.5"
+ "@babel/parser" "^7.23.3"
+ "@babel/types" "^7.23.3"
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.3.3":
- version "7.22.5"
- resolved "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz"
- integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.3", "@babel/types@^7.3.3":
+ version "7.23.3"
+ resolved "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz"
+ integrity sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==
dependencies:
"@babel/helper-string-parser" "^7.22.5"
- "@babel/helper-validator-identifier" "^7.22.5"
+ "@babel/helper-validator-identifier" "^7.22.20"
to-fast-properties "^2.0.0"
"@bcoe/v8-coverage@^0.2.3":
@@ -659,7 +660,7 @@
"@jridgewell/resolve-uri" "^3.0.3"
"@jridgewell/sourcemap-codec" "^1.4.10"
-"@mapbox/node-pre-gyp@^1.0.10":
+"@mapbox/node-pre-gyp@^1.0.11":
version "1.0.11"
resolved "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz"
integrity sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==
@@ -1019,11 +1020,6 @@
dependencies:
"@types/node" "*"
-"@types/tough-cookie@>=2.3.3":
- version "4.0.3"
- resolved "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.3.tgz"
- integrity sha512-THo502dA5PzG/sfQH+42Lw3fvmYkceefOspdCwpHRul8ik2Jv1K8I5OZz1AT3/rs46kwgMCe9bSBmDLYkkOMGg==
-
"@types/yargs-parser@*":
version "21.0.0"
resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"
@@ -1313,14 +1309,6 @@ axios-cache-interceptor@^0.10.3:
fast-defer "^1.1.7"
object-code "^1.2.2"
-axios-cookiejar-support@^1.0.1:
- version "1.0.1"
- resolved "https://registry.npmjs.org/axios-cookiejar-support/-/axios-cookiejar-support-1.0.1.tgz"
- integrity sha512-IZJxnAJ99XxiLqNeMOqrPbfR7fRyIfaoSLdPUf4AMQEGkH8URs0ghJK/xtqBsD+KsSr3pKl4DEQjCn834pHMig==
- dependencies:
- is-redirect "^1.0.0"
- pify "^5.0.0"
-
axios-cookiejar-support@^4.0.7:
version "4.0.7"
resolved "https://registry.npmjs.org/axios-cookiejar-support/-/axios-cookiejar-support-4.0.7.tgz"
@@ -1337,17 +1325,10 @@ axios-mock-adapter@^1.20.0:
is-blob "^2.1.0"
is-buffer "^2.0.5"
-axios@^0.21.1, axios@>=0.16.2:
- version "0.21.4"
- resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"
- integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
- dependencies:
- follow-redirects "^1.14.0"
-
-axios@^1.5.1, "axios@>= 0.9.0", axios@>=0.20.0:
- version "1.5.1"
- resolved "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz"
- integrity sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==
+axios@^1.5.1, axios@^1.6.1, "axios@>= 0.9.0", axios@>=0.20.0:
+ version "1.6.2"
+ resolved "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz"
+ integrity sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==
dependencies:
follow-redirects "^1.15.0"
form-data "^4.0.0"
@@ -1587,7 +1568,7 @@ chalk-template@0.4.0:
dependencies:
chalk "^4.1.2"
-chalk@^2.0.0:
+chalk@^2.3.2:
version "2.4.2"
resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1596,7 +1577,7 @@ chalk@^2.0.0:
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
-chalk@^2.3.2:
+chalk@^2.4.2:
version "2.4.2"
resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2149,14 +2130,13 @@ entities@^4.2.0, entities@^4.3.0, entities@^4.4.0:
resolved "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz"
integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
-epg-grabber@^0.34.0:
- version "0.34.0"
- resolved "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.34.0.tgz"
- integrity sha512-j/2uYRBeDg9IBL6VgjFc7rSTHaefd57e9NuX6TGoHYfr4whsZGmojBAKeaX6PkcGXvGjG2oCXoqiANeWuBisaw==
+epg-grabber@^0.35.0:
+ version "0.35.0"
+ resolved "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.35.0.tgz"
+ integrity sha512-DhvciNp3xCTG9VzYR9GU5uDjujW/rG3CgBCy1eP2BEI6I0V5okGWPmEGf73V/IK+hZnbpskjmbeziaK4RXOtBg==
dependencies:
- axios "^0.21.1"
+ axios "^1.6.1"
axios-cache-interceptor "^0.10.3"
- axios-cookiejar-support "^1.0.1"
axios-mock-adapter "^1.20.0"
commander "^7.1.0"
curl-generator "^0.2.0"
@@ -2165,9 +2145,10 @@ epg-grabber@^0.34.0:
epg-parser "^0.1.6"
fs-extra "^11.1.1"
glob "^7.1.6"
+ http-cookie-agent "^5.0.4"
lodash "^4.17.21"
node-gzip "^1.1.2"
- tough-cookie "^4.0.0"
+ tough-cookie "^4.1.3"
winston "^3.3.3"
xml-js "^1.6.11"
@@ -2513,7 +2494,7 @@ fn.name@1.x.x:
resolved "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz"
integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
-follow-redirects@^1.14.0, follow-redirects@^1.15.0:
+follow-redirects@^1.15.0:
version "1.15.0"
resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz"
integrity sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==
@@ -2943,11 +2924,6 @@ is-port-reachable@4.0.0:
resolved "https://registry.npmjs.org/is-port-reachable/-/is-port-reachable-4.0.0.tgz"
integrity sha512-9UoipoxYmSk6Xy7QFgRv2HDyaysmgSG75TFQs6S+3pDM7ZhKTF/bskZV+0UlABHzKjNVhPjYCLfeZUEg1wXxig==
-is-redirect@^1.0.0:
- version "1.0.0"
- resolved "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"
- integrity sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw==
-
is-stream@^2.0.0:
version "2.0.1"
resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
@@ -3495,14 +3471,14 @@ levn@^0.4.1:
prelude-ls "^1.2.1"
type-check "~0.4.0"
-libxmljs2@^0.32.0:
- version "0.32.0"
- resolved "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.32.0.tgz"
- integrity sha512-DuvKfSQZeUzw0A4UWZXfcBpr3VqlcJY1b3aw99PxTiX3T5t1rEO4gSpobNrP9S74LIhyDKaAs/lphuErV+n+7w==
+libxmljs2@^0.33.0:
+ version "0.33.0"
+ resolved "https://registry.npmjs.org/libxmljs2/-/libxmljs2-0.33.0.tgz"
+ integrity sha512-Hw74f2/3rbpxc6tkTqe3yrs4v2Tx0rEukrYxaNkXSVKK540i2eqlQxzf1jjG+RlwMuv66WxkkuZHM/OQq6km4w==
dependencies:
- "@mapbox/node-pre-gyp" "^1.0.10"
+ "@mapbox/node-pre-gyp" "^1.0.11"
bindings "~1.5.0"
- nan "~2.17.0"
+ nan "~2.18.0"
lie@3.1.1:
version "3.1.1"
@@ -3775,10 +3751,10 @@ mute-stream@0.0.8:
resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-nan@~2.17.0:
- version "2.17.0"
- resolved "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz"
- integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
+nan@~2.18.0:
+ version "2.18.0"
+ resolved "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz"
+ integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==
natural-compare@^1.4.0:
version "1.4.0"
@@ -4119,11 +4095,6 @@ pify@^3.0.0:
resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-pify@^5.0.0:
- version "5.0.0"
- resolved "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz"
- integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==
-
pirates@^4.0.4:
version "4.0.6"
resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz"
@@ -4742,7 +4713,7 @@ to-regex-range@^5.0.1:
dependencies:
is-number "^7.0.0"
-tough-cookie@^4.0.0, tough-cookie@^4.1.3, tough-cookie@>=2.3.3, tough-cookie@>=4.0.0:
+tough-cookie@^4.0.0, tough-cookie@^4.1.3, tough-cookie@>=4.0.0:
version "4.1.3"
resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz"
integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
From f90df54839a7d845358cee8f7b84b8d9dfa45a5d Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Fri, 17 Nov 2023 05:03:34 +0300
Subject: [PATCH 03/17] Create guides.json
---
tests/__data__/expected/guides.json | 1 +
1 file changed, 1 insertion(+)
create mode 100644 tests/__data__/expected/guides.json
diff --git a/tests/__data__/expected/guides.json b/tests/__data__/expected/guides.json
new file mode 100644
index 00000000..9d0065a6
--- /dev/null
+++ b/tests/__data__/expected/guides.json
@@ -0,0 +1 @@
+[{"channel":"Channel1.us","site":"example.com","site_id":"140","site_name":"Channel 1","lang":"en"},{"channel":"Channel2.us","site":"example.com","site_id":"142","site_name":"Channel 2","lang":"en"},{"channel":"Channel1.us","site":"example.com","site_id":"140","site_name":"Channel 1","lang":"fr"},{"channel":"Channel3.us","site":"example2.com","site_id":"150","site_name":"Channel 3","lang":"en"},{"channel":"Channel4.us","site":"example2.com","site_id":"152","site_name":"Channel 4","lang":"en"},{"channel":"Channel1.us","site":"example2.com","site_id":"140","site_name":"Channel 1","lang":"fr"}]
\ No newline at end of file
From 9fb926f2f9c637323c84463a0d8fa0764d7bb4cd Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Fri, 17 Nov 2023 05:03:37 +0300
Subject: [PATCH 04/17] Create generate.test.ts
---
tests/commands/api/generate.test.ts | 31 +++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 tests/commands/api/generate.test.ts
diff --git a/tests/commands/api/generate.test.ts b/tests/commands/api/generate.test.ts
new file mode 100644
index 00000000..ab6a3ee7
--- /dev/null
+++ b/tests/commands/api/generate.test.ts
@@ -0,0 +1,31 @@
+import { execSync } from 'child_process'
+import fs from 'fs-extra'
+import path from 'path'
+import os from 'os'
+
+let ENV_VAR = 'SITES_DIR=tests/__data__/input/epg-grab/sites API_DIR=tests/__data__/output'
+if (os.platform() === 'win32') {
+ ENV_VAR =
+ 'SET "SITES_DIR=tests/__data__/input/epg-grab/sites" && SET "API_DIR=tests/__data__/output" &&'
+}
+
+beforeEach(() => {
+ fs.emptyDirSync('tests/__data__/output')
+})
+
+describe('api:generate', () => {
+ it('can generate guides.json', () => {
+ const cmd = `${ENV_VAR} npm run api:generate`
+ execSync(cmd, { encoding: 'utf8' })
+
+ expect(content('tests/__data__/output/guides.json')).toEqual(
+ content('tests/__data__/expected/guides.json')
+ )
+ })
+})
+
+function content(filepath: string) {
+ return fs.readFileSync(path.resolve(filepath), {
+ encoding: 'utf8'
+ })
+}
From 74806359200b4ed7a9e71a2dab1819b62cc76d0e Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Fri, 17 Nov 2023 05:03:51 +0300
Subject: [PATCH 05/17] Update constants.ts
---
scripts/constants.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/constants.ts b/scripts/constants.ts
index 85bb51cc..7498bf81 100644
--- a/scripts/constants.ts
+++ b/scripts/constants.ts
@@ -1,3 +1,4 @@
export const SITES_DIR = process.env.SITES_DIR || './sites'
export const GUIDES_DIR = process.env.GUIDES_DIR || './guides'
export const DATA_DIR = process.env.DATA_DIR || './temp/data'
+export const API_DIR = process.env.API_DIR || '.api'
From 7cb449da0664b955786e63c3939efa92fd4a5252 Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Fri, 17 Nov 2023 05:03:54 +0300
Subject: [PATCH 06/17] Create generate.ts
---
scripts/commands/api/generate.ts | 51 ++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 scripts/commands/api/generate.ts
diff --git a/scripts/commands/api/generate.ts b/scripts/commands/api/generate.ts
new file mode 100644
index 00000000..a51b4dc5
--- /dev/null
+++ b/scripts/commands/api/generate.ts
@@ -0,0 +1,51 @@
+import { Logger, Storage, Collection } from '@freearhey/core'
+import { ChannelsParser } from '../../core'
+import path from 'path'
+import { SITES_DIR, API_DIR } from '../../constants'
+import { Channel } from 'epg-grabber'
+
+type OutputItem = {
+ channel: string
+ site: string
+ site_id: string
+ site_name: string
+ lang: string
+}
+
+async function main() {
+ const logger = new Logger()
+
+ logger.start('staring...')
+
+ logger.info('loading channels...')
+ const sitesStorage = new Storage(SITES_DIR)
+ const parser = new ChannelsParser({ storage: sitesStorage })
+
+ let files: string[] = []
+ files = await sitesStorage.list('**/*.channels.xml')
+
+ let parsedChannels = new Collection()
+ for (const filepath of files) {
+ parsedChannels = parsedChannels.concat(await parser.parse(filepath))
+ }
+
+ logger.info(` found ${parsedChannels.count()} channel(s)`)
+
+ const output = parsedChannels.map((channel: Channel): OutputItem => {
+ return {
+ channel: channel.xmltv_id || '',
+ site: channel.site || '',
+ site_id: channel.site_id || '',
+ site_name: channel.name,
+ lang: channel.lang || ''
+ }
+ })
+
+ const apiStorage = new Storage(API_DIR)
+ const outputFilename = 'guides.json'
+ await apiStorage.save('guides.json', output.toJSON())
+
+ logger.info(`saved to "${path.join(API_DIR, outputFilename)}"`)
+}
+
+main()
From b538940e503dedbe399f91af0573aa317c53ca19 Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Fri, 17 Nov 2023 05:04:04 +0300
Subject: [PATCH 07/17] Create update.yml
---
.github/workflows/update.yml | 49 ++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
create mode 100644 .github/workflows/update.yml
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
new file mode 100644
index 00000000..6799ad2a
--- /dev/null
+++ b/.github/workflows/update.yml
@@ -0,0 +1,49 @@
+name: update
+on:
+ workflow_dispatch:
+ schedule:
+ - cron: '0 0 * * *'
+jobs:
+ main:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - uses: tibdex/github-app-token@v1.8.2
+ if: ${{ !env.ACT }}
+ id: create-app-token
+ with:
+ app_id: ${{ secrets.APP_ID }}
+ private_key: ${{ secrets.APP_PRIVATE_KEY }}
+ - uses: actions/checkout@v3
+ if: ${{ !env.ACT }}
+ with:
+ token: ${{ steps.create-app-token.outputs.token }}
+ - name: setup git
+ run: |
+ git config user.name "iptv-bot[bot]"
+ git config user.email "84861620+iptv-bot[bot]@users.noreply.github.com"
+ - uses: actions/setup-node@v3
+ if: ${{ !env.ACT }}
+ with:
+ node-version: 18
+ cache: 'npm'
+ - name: install dependencies
+ run: npm install
+ - name: check *.channels.xml
+ run: |
+ npm run channels:lint
+ - name: generate .api/guides.json
+ run: npm run api:generate
+ - run: git status
+ - name: move .api/guides.json to iptv-org/api
+ uses: JamesIves/github-pages-deploy-action@4.1.1
+ if: ${{ !env.ACT && github.ref == 'refs/heads/master' }}
+ with:
+ repository-name: iptv-org/api
+ branch: gh-pages
+ folder: .api
+ token: ${{ steps.create-app-token.outputs.token }}
+ git-config-name: iptv-bot[bot]
+ git-config-email: 84861620+iptv-bot[bot]@users.noreply.github.com
+ commit-message: '[Bot] Deploy to iptv-org/api'
+ clean: false
\ No newline at end of file
From 1285c5217d5dc3a1d162085700159363ff691d46 Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Fri, 17 Nov 2023 05:04:11 +0300
Subject: [PATCH 08/17] Update package.json
---
package.json | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package.json b/package.json
index c958c5ec..e08b52c7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,9 @@
{
"name": "epg",
"scripts": {
+ "act:update": "act workflow_dispatch -W .github/workflows/update.yml",
"api:load": "npx tsx scripts/commands/api/load.ts",
+ "api:generate": "npx tsx scripts/commands/api/generate.ts",
"channels:lint": "npx tsx scripts/commands/channels/lint.ts",
"channels:parse": "npx tsx scripts/commands/channels/parse.ts",
"channels:editor": "npx tsx scripts/commands/channels/editor.ts",
From 6cb39aa48d67756d07b7174279840f55e89797b0 Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Fri, 17 Nov 2023 05:04:23 +0300
Subject: [PATCH 09/17] Update CONTRIBUTING.md
---
CONTRIBUTING.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d8f71f04..453aa443 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -130,6 +130,7 @@ After that, all that remains is to commit all the changes and send a pull reques
- `.github/`
- `ISSUE_TEMPLATE/`: issue templates for the repository.
+ - `workflows`: contains [GitHub actions](https://docs.github.com/en/actions/quickstart) workflows.
- `CODE_OF_CONDUCT.md`: rules you shouldn't break if you don't want to get banned.
- `scripts/`: contains all scripts used in the repository.
- `sites/`: contains configurations, channel lists and tests for all sites.
@@ -146,7 +147,9 @@ For scripts to work, you must have [Node.js](https://nodejs.org/en) installed on
To run scripts use the `npm run ` command.
+- `act:update`: allows to test the [update](https://github.com/iptv-org/iptv/blob/master/.github/workflows/update.yml) workflow locally. Depends on [nektos/act](https://github.com/nektos/act).
- `api:load`: downloads the latest channels data from the [iptv-org/api](https://github.com/iptv-org/api).
+- `api:generate`: generates a JSON file with all channels for the [iptv-org/api](https://github.com/iptv-org/api) repository.
- `channels:lint`: сhecks the channel lists for syntax errors.
- `channels:parse`: generates a list of channels based on the site configuration.
- `channels:editor`: utility for quick channels markup.
From 4aeef51c10f5f007d0e18bf63fcfd43f35c8c1e5 Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Fri, 17 Nov 2023 15:11:46 +0300
Subject: [PATCH 10/17] Update 9tv.co.il.channels.xml
---
sites/9tv.co.il/9tv.co.il.channels.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sites/9tv.co.il/9tv.co.il.channels.xml b/sites/9tv.co.il/9tv.co.il.channels.xml
index b1ac4ae5..117aa8d5 100644
--- a/sites/9tv.co.il/9tv.co.il.channels.xml
+++ b/sites/9tv.co.il/9tv.co.il.channels.xml
@@ -1,4 +1,4 @@
-
-
- 9 канал
-
+
+
+ 9 канал
+
From d310ff388db1ae1c1e75806818ae6185585f58f2 Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Fri, 17 Nov 2023 16:41:14 +0300
Subject: [PATCH 11/17] Update editor.ts
---
scripts/commands/channels/editor.ts | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/scripts/commands/channels/editor.ts b/scripts/commands/channels/editor.ts
index d94f35a6..ef6ead42 100644
--- a/scripts/commands/channels/editor.ts
+++ b/scripts/commands/channels/editor.ts
@@ -29,7 +29,7 @@ async function main() {
const parser = new ChannelsParser({ storage })
const parsedChannels = await parser.parse(filepath)
- options = parsedChannels.map((channel: Channel) => {
+ options = parsedChannels.map((channel: Channel): { channel: Channel; delete: boolean } => {
return {
channel,
delete: false
@@ -41,18 +41,18 @@ async function main() {
const channels = new Collection(channelsContent).map(data => new ApiChannel(data))
const buffer = new Dictionary()
- options.forEach(async (option: { channel: Channel; delete: boolean }) => {
- const channel = option.channel
+ for (let option of options.all()) {
+ const channel: Channel = option.channel
if (channel.xmltv_id) {
if (channel.xmltv_id !== '-') {
buffer.set(`${channel.xmltv_id}/${channel.lang}`, true)
}
- return
+ continue
}
const choices = getOptions(channels, channel)
const question: QuestionCollection = {
name: 'option',
- message: 'Choose an option:',
+ message: `Choose xmltv_id for "${channel.name}" (${channel.site_id}):`,
type: 'list',
choices,
pageSize: 10
@@ -103,7 +103,7 @@ async function main() {
}
}
})
- })
+ }
}
main()
@@ -154,7 +154,7 @@ function getOptions(channels: Collection, channel: Channel) {
const closed = _channel.closed ? `[closed:${_channel.closed}]` : ''
const replacedBy = _channel.replacedBy ? `[replaced_by:${_channel.replacedBy}]` : ''
- variants.add(`${_channel.name}${altNames} | ${_channel.id} ${closed}${replacedBy}[api]`)
+ variants.add(`${_channel.name}${altNames} | ${_channel.id}${closed}${replacedBy}`)
})
variants.add('Overwrite')
variants.add('Skip')
From 4a8d6f906f2df3dcee11b0fefd95c6a628e3a8be Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Fri, 17 Nov 2023 16:42:21 +0300
Subject: [PATCH 12/17] Update queueCreator.ts
---
scripts/core/queueCreator.ts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/core/queueCreator.ts b/scripts/core/queueCreator.ts
index 8516dc71..5e56bce3 100644
--- a/scripts/core/queueCreator.ts
+++ b/scripts/core/queueCreator.ts
@@ -1,7 +1,7 @@
import { Storage, Collection, DateTime, Logger } from '@freearhey/core'
import { ChannelsParser, ConfigLoader, ApiChannel, Queue } from './'
import { SITES_DIR, DATA_DIR } from '../constants'
-import { SiteConfig } from 'epg-grabber'
+import { Channel, SiteConfig } from 'epg-grabber'
import path from 'path'
import { GrabOptions } from '../commands/epg/grab'
@@ -47,6 +47,7 @@ export class QueueCreator {
)
if (found) {
channel.logo = found.logo
+ channel.name = found.name
}
const days = this.options.days || config.days || 1
From ec8f119970f1f0effef3caca000ce871e97a2aba Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Fri, 17 Nov 2023 16:43:13 +0300
Subject: [PATCH 13/17] Update abc.net.au
---
sites/abc.net.au/abc.net.au.channels.xml | 572 +++++++++++++++++++++--
sites/abc.net.au/abc.net.au.config.js | 50 +-
sites/abc.net.au/abc.net.au.test.js | 5 +-
3 files changed, 590 insertions(+), 37 deletions(-)
diff --git a/sites/abc.net.au/abc.net.au.channels.xml b/sites/abc.net.au/abc.net.au.channels.xml
index 230ce842..c18761eb 100644
--- a/sites/abc.net.au/abc.net.au.channels.xml
+++ b/sites/abc.net.au/abc.net.au.channels.xml
@@ -1,35 +1,543 @@
- 10 Bold
- 10 Peach
- 10 Shake
- 7flix
- 7mate
- 7two
- 9 Gem
- 9 Go!
- 9 Life
- 9 Rush
- ABC News
- ABC Kids
- ABC ME
- ABC TV Plus
- ABC TV
- ABC TV HD
- Channel 10
- Channel 10 HD
- Channel 7
- Channel 7 HD
- Channel 9
- Channel 9 HD
- NITV
- Racing.com
- SBS Food
- SBS One
- SBS HD
- SBS Viceland
- SBS World Movies
- SBS World Watch
- Spree TV
- TSVN
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ONE
+ 11
+ SHAKE
+ 7bravo
+ 7bravo
+ 7flix
+ 7flix
+ 7HD
+ 7MATE
+ 7MATE
+ 7TWO
+ 7TWO
+ GEM
+ GO
+ 9HD
+ 9Life
+ 9Life
+ 9Rush
+ 9Rush
+ ABCN
+ ABC4KIDS
+ ABC3
+ ABC2
+ ABC1
+ ABCHD
+ 10
+ 10
+ TENHD
+ 44
+ 7
+ 7
+ 7HD
+ 9
+ 9
+ 9HD
+ NITV
+ NITV
+ RTV
+ SBS
+ SBS3
+ SBS
+ SBSHD
+ VICHD
+ SBS2
+ SBSWW
+ SPREE
+ TVSN
diff --git a/sites/abc.net.au/abc.net.au.config.js b/sites/abc.net.au/abc.net.au.config.js
index 26388f47..0a3eec0d 100644
--- a/sites/abc.net.au/abc.net.au.config.js
+++ b/sites/abc.net.au/abc.net.au.config.js
@@ -1,3 +1,4 @@
+const axios = require('axios')
const dayjs = require('dayjs')
const utc = require('dayjs/plugin/utc')
const timezone = require('dayjs/plugin/timezone')
@@ -15,8 +16,10 @@ module.exports = {
ttl: 60 * 60 * 1000 // 1 hour
}
},
- url({ date }) {
- return `https://epg.abctv.net.au/processed/Sydney_${date.format('YYYY-MM-DD')}.json`
+ url({ date, channel }) {
+ const [region] = channel.site_id.split('#')
+
+ return `https://epg.abctv.net.au/processed/${region}_${date.format('YYYY-MM-DD')}.json`
},
parser({ content, channel }) {
let programs = []
@@ -37,6 +40,46 @@ module.exports = {
})
return programs
+ },
+ async channels() {
+ const now = dayjs()
+ const regions = [
+ 'Sydney',
+ 'Melbourne',
+ 'Brisbane',
+ 'GoldCoast',
+ 'Perth',
+ 'Adelaide',
+ 'Hobart',
+ 'Darwin',
+ 'Canberra',
+ 'New South Wales',
+ 'Victoria',
+ 'Townsville',
+ 'Queensland',
+ 'Western Australia',
+ 'South Australia',
+ 'Tasmania',
+ 'Northern Territory'
+ ]
+
+ let channels = []
+ for (let region of regions) {
+ const data = await axios
+ .get(`https://epg.abctv.net.au/processed/${region}_${now.format('YYYY-MM-DD')}.json`)
+ .then(r => r.data)
+ .catch(console.log)
+
+ for (let item of data.schedule) {
+ channels.push({
+ lang: 'en',
+ site_id: `${region}#${item.channel}`,
+ name: item.channel
+ })
+ }
+ }
+
+ return channels
}
}
@@ -46,7 +89,8 @@ function parseItems(content, channel) {
if (!data) return []
if (!Array.isArray(data.schedule)) return []
- const channelData = data.schedule.find(i => i.channel == channel.site_id)
+ const [, channelId] = channel.site_id.split('#')
+ const channelData = data.schedule.find(i => i.channel == channelId)
return channelData.listing && Array.isArray(channelData.listing) ? channelData.listing : []
} catch (err) {
return []
diff --git a/sites/abc.net.au/abc.net.au.test.js b/sites/abc.net.au/abc.net.au.test.js
index 791302a7..e7a23093 100644
--- a/sites/abc.net.au/abc.net.au.test.js
+++ b/sites/abc.net.au/abc.net.au.test.js
@@ -1,3 +1,4 @@
+// npm run channels:parse -- --config=./sites/abc.net.au/abc.net.au.config.js --output=./sites/abc.net.au/abc.net.au.channels.xml
// npm run grab -- --site=abc.net.au
const { parser, url } = require('./abc.net.au.config.js')
@@ -7,11 +8,11 @@ dayjs.extend(utc)
const date = dayjs.utc('2022-12-22', 'YYYY-MM-DD').startOf('d')
const channel = {
- site_id: 'ABC1',
+ site_id: 'Sydney#ABC1',
xmltv_id: 'ABCTV.au'
}
it('can generate valid url', () => {
- expect(url({ date })).toBe('https://epg.abctv.net.au/processed/Sydney_2022-12-22.json')
+ expect(url({ date, channel })).toBe('https://epg.abctv.net.au/processed/Sydney_2022-12-22.json')
})
it('can parse response', () => {
From 6c5032ccb3ed63d358fbe7421087864e0caa7814 Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Fri, 17 Nov 2023 17:00:54 +0300
Subject: [PATCH 14/17] Update abc.net.au.channels.xml
---
sites/abc.net.au/abc.net.au.channels.xml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sites/abc.net.au/abc.net.au.channels.xml b/sites/abc.net.au/abc.net.au.channels.xml
index c18761eb..55267d65 100644
--- a/sites/abc.net.au/abc.net.au.channels.xml
+++ b/sites/abc.net.au/abc.net.au.channels.xml
@@ -178,7 +178,6 @@
-
@@ -219,7 +218,6 @@
-
@@ -252,7 +250,6 @@
-
@@ -312,7 +309,6 @@
-
@@ -345,7 +341,6 @@
-
@@ -374,7 +369,6 @@
-
@@ -440,7 +434,6 @@
-
@@ -472,7 +465,6 @@
-
@@ -515,9 +507,17 @@
ABCN
ABC4KIDS
ABC3
+ ABC1
+ ABC1
ABC2
+ ABC1
+ ABC1
ABC1
ABCHD
+ ABC1
+ ABC1
+ ABC1
+ 31
10
10
TENHD
From 05d8185f8e72478a9baf2628669008e28d1e05ee Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Fri, 17 Nov 2023 17:48:28 +0300
Subject: [PATCH 15/17] Update parse.ts
---
scripts/commands/channels/parse.ts | 32 +++++++++++++++++++-----------
1 file changed, 20 insertions(+), 12 deletions(-)
diff --git a/scripts/commands/channels/parse.ts b/scripts/commands/channels/parse.ts
index c9185652..a141db3d 100644
--- a/scripts/commands/channels/parse.ts
+++ b/scripts/commands/channels/parse.ts
@@ -9,7 +9,6 @@ program
.requiredOption('-c, --config ', 'Config file')
.option('-s, --set [args...]', 'Set custom arguments')
.option('-o, --output
diff --git a/sites/allente.se/allente.se_no.channels.xml b/sites/allente.se/allente.se_no.channels.xml
index 9aa1ecf7..f9c2abe4 100644
--- a/sites/allente.se/allente.se_no.channels.xml
+++ b/sites/allente.se/allente.se_no.channels.xml
@@ -1,39 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Aljazeera
BBC World News
Cartoon Network
CNBC
CNN
Discovery Channel
- Disney Channel
- Disney Junior
DR 2
- E!
- EuroNews
- Eurosport 1
Eurosport
+ Eurosport 1
FEM
Kunskapskanalen
- Matkanalen
Max
MTV 00s
MTV 80s
- MTV Hits
MTV Nordic
National Geographic
- National Geographic Wild
- NFL Network
- Nickelodeon
Nick Jr
Nicktoons
NRK1
NRK2
NRK3
- Sky News International
SVT 1
SVT 2
- SVT 24
SVT Barn
TV 2
TV 2
@@ -43,11 +59,8 @@
TV 2 Sport 2
TV 2 Sport Premium
TV 2 Zebra
- TV 3 Danmark
TV 3 Norge
- TV 3 Sverige
TV 6 Norge
- TV 6 Sverige
TV Norge
V 4
V Film Action
@@ -56,7 +69,6 @@
V Film Premiere
Viasat Explore
Viasat History HD
- Viasat Nature
Vox
V Series
V Sport 1
@@ -70,4 +82,4 @@
V Sport Live 5
V Sport +
V Sport Ultra HD
-
\ No newline at end of file
+
diff --git a/sites/allente.se/allente.se_se.channels.xml b/sites/allente.se/allente.se_se.channels.xml
index 17851a22..2b988b33 100644
--- a/sites/allente.se/allente.se_se.channels.xml
+++ b/sites/allente.se/allente.se_se.channels.xml
@@ -1,112 +1,95 @@
- Aljazeera
- Animal Planet Sverige
- ATG Live
- BBC Earth HD
- BBC Brit HD
- BBC World News
- Bloomberg TV
- Boomerang
- Cartoon Network
- C More First
- C More Fotboll
- C More Hits
- C More Hockey
- C More Live
- C More Live 2
- C More Live 3
- C More Live 4
- C More Live 5
- C More Mix
- C More Series
- C More Stars
- CNBC
- CNN
- Discovery Channel Sverige
- Discovery Science Sverige
- Disney Channel
- Disney Junior
- Discovery+ Extra 1
- Discovery+ Extra 2
- Discovery+ Extra 3
- Discovery+ Extra 4
- Discovery+ Extra 5
- Discovery+ Extra 6
- Discovery+ Extra 7
- Discovery+ Extra 8
- DR 1
- DR 2
- DR Ramasjang
- E!
- EuroNews
- Eurosport 1
- Eurosport 2
- Godare
- God TV
- History
- H2
- Horse & Country TV
- Investigation Discovery Sverige
- Kanal 5
- Kanal 9
- Kanal 11
- Kunskapskanalen
- MTV 00s
- MTV 80s
- MTV Hits
- MTV Nordic
- Motorvision
- National Geographic
- National Geographic Wild
- NFL Network
- Nickelodeon
- Nick Jr
- Nicktoons
- NRK1
- NRK2
- NRK3
- Paramount Network
- Paramount+ Movies
- Paramount+ Series
- SF-kanalen
- Sjuan
- Sky News International
- Sportkanalen
- SVT 1
- SVT 2
- SVT 24
- SVT Barn
- TLC Sverige
- TV 2
- TV 3
- TV 4
- TV 4 Fakta
- TV 4 Film
- TV 4 Guld
- TV 6
- TV 8
- TV 10
- TV 12
- V Film Action
- V Film Family
- V Film Hits
- V Film Premiere
- Viasat Explore
- Viasat History HD
- Viasat Nature
- V Series
- V Sport 1
- V Sport Extra
- V Sport Football
- V Sport Golf
- V Sport Live 1
- V Sport Live 2
- V Sport Live 3
- V Sport Live 4
- V Sport Live 5
- V Sport Motor
- V Sport Premium
- V Sport Ultra HD
- V Sport Vinter
+ Al Jazeera English -OTT
+ Animal Planet HD (T)
+ ATG Live HD (T)
+ Axess TV HD -IP
+ BBC Nordic HD (S/D/F) (T)
+ BBC News (T)
+ Bloomberg (T)
+ Cartoonito (T)
+ Cartoon Network (T)
+ TV4 Fotboll (T)
+ TV4 Hits (T)
+ TV4 Hockey (T)
+ TV4 Sport Live 2 (T)
+ TV4 Sport Live 3 (T)
+ TV4 Sport Live 4 (T)
+ TV4 Sport Live 1 (T)
+ TV4 Motor (T)
+ TV4 Stars (T)
+ CNBC (T)
+ CNN (T)
+ Discovery Channel HD (S) (T)
+ Discovery Science (T)
+ DR1 HD (T)
+ DR2 HD (T)
+ DR Ramasjang (T)
+ DW English (T)
+ Eurosport 1 HD (S) (T)
+ Eurosport 2 HD (S/F) (T)
+ France 24 (T)
+ Godare HD -IP
+ HISTORY 2 HD (T)
+ HISTORY HD (S) (T)
+ Horse & Country HD -IP
+ ID Investigation Discovery (S) (T)
+ Kanal 5 HD (S) (T)
+ Kanal 9 HD (S) (T)
+ Kanal 11 HD (S) (T)
+ Kunskapskanalen HD (T)
+ MOTORVISION TV HD (T)
+ MTV 00s (T)
+ MTV 80s (T)
+ MTV (Nordic) (T)
+ National Geographic HD (S/F) (T)
+ Nickelodeon (Nordic) (T)
+ Nick Jr. (T)
+ Nicktoons (T)
+ NRK1 HD (T)
+ NRK2 HD (T)
+ NRK3/ NRK Super HD (T)
+ SkyShowtime 2 (T)
+ SkyShowtime 1 (T)
+ SF Kanalen (T)
+ Sjuan HD (S) (T)
+ Sky News (T)
+ TV4 Sportkanalen (T)
+ SVT1 HD (T)
+ SVT2 HD (T)
+ SVT24 HD (T)
+ SVT Barn HD (T)
+ TLC Sverige HD (T)
+ TV 2 HD (D) (T)
+ TV3 HD (S) (T)
+ TV4 HD (T)
+ TV4 Fakta (T)
+ TV4 Film (T)
+ TV4 Guld (T)
+ TV4 Tennis (T)
+ TV6 HD (S) (T)
+ TV8 HD (S) (T)
+ TV10 HD (S) (T)
+ TV12 HD (S) (T)
+ V film action HD (T)
+ V film family (T)
+ V film hits HD (T)
+ V film premiere HD (T)
+ Viasat Explore HD (T)
+ Viasat History HD (T)
+ Viasat Nature HD (T)
+ V series HD (T)
+ V sport 1 HD (S/F) (T)
+ V sport extra HD (T)
+ V sport football HD (T)
+ V sport golf HD (T)
+ V sport live 1 (T)
+ V sport live 2 (T)
+ V sport live 3 (T)
+ V sport live 4 (T)
+ V sport live 5 (T)
+ V sport motor HD (T)
+ V sport premium HD (T)
+ V sport ultra HD (T)
+ V sport vinter HD (T)
From 35ec9d725bd515e584a18223fc45f7184c52ba39 Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Fri, 17 Nov 2023 17:59:25 +0300
Subject: [PATCH 17/17] Fixes xmltv_id
---
sites/astro.com.my/astro.com.my.channels.xml | 2 +-
sites/horizon.tv/horizon.tv.channels.xml | 2 +-
sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml | 2 +-
sites/melita.com/melita.com.channels.xml | 2 +-
sites/mtel.ba/mtel.ba.channels.xml | 2 +-
sites/mts.rs/mts.rs.channels.xml | 2 +-
sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml | 2 +-
sites/musor.tv/musor.tv.channels.xml | 2 +-
sites/novacyprus.com/novacyprus.com.channels.xml | 2 +-
sites/telkku.com/telkku.com.channels.xml | 2 +-
sites/telkussa.fi/telkussa.fi.channels.xml | 2 +-
sites/tv.dir.bg/tv.dir.bg.channels.xml | 2 +-
sites/tv.nu/tv.nu.channels.xml | 4 ++--
sites/tv.yettel.hu/tv.yettel.hu.channels.xml | 2 +-
sites/tv24.se/tv24.se.channels.xml | 4 ++--
sites/tvmusor.hu/tvmusor.hu.channels.xml | 2 +-
sites/vivacom.bg/vivacom.bg.channels.xml | 2 +-
17 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/sites/astro.com.my/astro.com.my.channels.xml b/sites/astro.com.my/astro.com.my.channels.xml
index e9337b05..528b8113 100644
--- a/sites/astro.com.my/astro.com.my.channels.xml
+++ b/sites/astro.com.my/astro.com.my.channels.xml
@@ -4,7 +4,7 @@
8TV
Adithya TV
Aljazeera
- Animal Planet
+ Animal Planet
Asian Food Network
Astro AEC
Astro AOD 311
diff --git a/sites/horizon.tv/horizon.tv.channels.xml b/sites/horizon.tv/horizon.tv.channels.xml
index 5f1e964e..0fb50f2a 100644
--- a/sites/horizon.tv/horizon.tv.channels.xml
+++ b/sites/horizon.tv/horizon.tv.channels.xml
@@ -52,7 +52,7 @@
France 24
RTVS 24 HD
AMC HD
- Animal Planet HD
+ Animal Planet HD
Magyar ATV
Auto Motor Sport
Barrandov Krimi HD
diff --git a/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml b/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
index a6b2fb2c..2a999c81 100644
--- a/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
+++ b/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
@@ -3,7 +3,7 @@
BN TV Satelitski
AMC Cesko
- Animal Planet
+ Animal Planet
Auto Motor und Sport
AXN Black
AXN
diff --git a/sites/melita.com/melita.com.channels.xml b/sites/melita.com/melita.com.channels.xml
index def891cc..76e95505 100644
--- a/sites/melita.com/melita.com.channels.xml
+++ b/sites/melita.com/melita.com.channels.xml
@@ -5,7 +5,7 @@
RTL II
Al Jazeera Arabic
Al Jazeera English
- Animal Planet HD
+ Animal Planet HD
Baby TV
BBC Earth HD
BBC Entertainment
diff --git a/sites/mtel.ba/mtel.ba.channels.xml b/sites/mtel.ba/mtel.ba.channels.xml
index d8032634..7b1dd072 100644
--- a/sites/mtel.ba/mtel.ba.channels.xml
+++ b/sites/mtel.ba/mtel.ba.channels.xml
@@ -7,7 +7,7 @@
Agro TV
Aljazeera Balkans
Amari TV
- Animal Planet
+ Animal Planet
Arena Esport
Arena Fight
Arena Sport 1
diff --git a/sites/mts.rs/mts.rs.channels.xml b/sites/mts.rs/mts.rs.channels.xml
index ab878f26..f9e62ec4 100644
--- a/sites/mts.rs/mts.rs.channels.xml
+++ b/sites/mts.rs/mts.rs.channels.xml
@@ -8,7 +8,7 @@
Agro TV
Aljazeera Balkans
Alternativna TV
- Animal Planet
+ Animal Planet
Arena Esport
Arena Fight
Arena Premium 1
diff --git a/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml b/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml
index c85c3a80..a556e449 100644
--- a/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml
+++ b/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml
@@ -47,7 +47,7 @@
3SAT
AMC
- Animal Planet
+ Animal Planet
ARTE
Auto Motor Sport HD
AXN Black
diff --git a/sites/musor.tv/musor.tv.channels.xml b/sites/musor.tv/musor.tv.channels.xml
index 8b503e89..313b1af9 100644
--- a/sites/musor.tv/musor.tv.channels.xml
+++ b/sites/musor.tv/musor.tv.channels.xml
@@ -22,7 +22,7 @@
Travel XP
7.TV
AMC
- Animal Planet
+ Animal Planet
Apostol TV
Arena4
ATV
diff --git a/sites/novacyprus.com/novacyprus.com.channels.xml b/sites/novacyprus.com/novacyprus.com.channels.xml
index 9444e4f3..56251098 100644
--- a/sites/novacyprus.com/novacyprus.com.channels.xml
+++ b/sites/novacyprus.com/novacyprus.com.channels.xml
@@ -1,6 +1,6 @@
- Animal Planet Africa
+ Animal Planet Africa
Boomerang Central & Eastern Europe
Disney Channel Middle East
EuroNews Ellinika
diff --git a/sites/telkku.com/telkku.com.channels.xml b/sites/telkku.com/telkku.com.channels.xml
index 978a929a..7050a3d3 100644
--- a/sites/telkku.com/telkku.com.channels.xml
+++ b/sites/telkku.com/telkku.com.channels.xml
@@ -45,7 +45,7 @@
AlfaTV
- Animal Planet
+ Animal Planet
Ava
Cartoon Network
C More First
diff --git a/sites/telkussa.fi/telkussa.fi.channels.xml b/sites/telkussa.fi/telkussa.fi.channels.xml
index 4efe7f50..8924a862 100644
--- a/sites/telkussa.fi/telkussa.fi.channels.xml
+++ b/sites/telkussa.fi/telkussa.fi.channels.xml
@@ -3,7 +3,7 @@
AlfaTV
- Animal Planet
+ Animal Planet
AVA
C More First
C More Hits
diff --git a/sites/tv.dir.bg/tv.dir.bg.channels.xml b/sites/tv.dir.bg/tv.dir.bg.channels.xml
index 7eed8b70..13c7b7dd 100644
--- a/sites/tv.dir.bg/tv.dir.bg.channels.xml
+++ b/sites/tv.dir.bg/tv.dir.bg.channels.xml
@@ -4,7 +4,7 @@
7/8 TV
Alfa TV
AMC
- Animal Planet
+ Animal Planet
AXN Black
AXN
AXN White
diff --git a/sites/tv.nu/tv.nu.channels.xml b/sites/tv.nu/tv.nu.channels.xml
index 10c8d100..c300a7bb 100644
--- a/sites/tv.nu/tv.nu.channels.xml
+++ b/sites/tv.nu/tv.nu.channels.xml
@@ -3,7 +3,7 @@
3sat
Adult Channel (UK)
Al Jazeera English
- Animal Planet
+ Animal Planet
ARTE
ATG Live
Axess TV
@@ -27,7 +27,7 @@
C More Live 2
C More Live 3
C More Live 4
- C More Live 5
+ C More Live 5
C More Mix
C More Series
C More Stars
diff --git a/sites/tv.yettel.hu/tv.yettel.hu.channels.xml b/sites/tv.yettel.hu/tv.yettel.hu.channels.xml
index 8c294995..9b753ceb 100644
--- a/sites/tv.yettel.hu/tv.yettel.hu.channels.xml
+++ b/sites/tv.yettel.hu/tv.yettel.hu.channels.xml
@@ -7,7 +7,7 @@
MTV90s
MTV Hits
AMC
- Animal Planet
+ Animal Planet
Arena4
ATV
BBC Earth
diff --git a/sites/tv24.se/tv24.se.channels.xml b/sites/tv24.se/tv24.se.channels.xml
index 0a4c2f90..8fdd9564 100644
--- a/sites/tv24.se/tv24.se.channels.xml
+++ b/sites/tv24.se/tv24.se.channels.xml
@@ -151,7 +151,7 @@
3sat
The Adult Channel
Al Arabiya
- Animal Planet
+ Animal Planet
ATG Live
Axess TV
Boomerang
@@ -167,7 +167,7 @@
C More Live 2
C More Live 3
C More Live 4
- C More Live 5
+ C More Live 5
C More Mix
C More Series
C More Sport SF-Kanalen
diff --git a/sites/tvmusor.hu/tvmusor.hu.channels.xml b/sites/tvmusor.hu/tvmusor.hu.channels.xml
index f0dd09f1..6c55a8ca 100644
--- a/sites/tvmusor.hu/tvmusor.hu.channels.xml
+++ b/sites/tvmusor.hu/tvmusor.hu.channels.xml
@@ -6,7 +6,7 @@
EuroNews
Sky News International
AMC
- Animal Planet
+ Animal Planet
ATV
AXN
BBC Earth
diff --git a/sites/vivacom.bg/vivacom.bg.channels.xml b/sites/vivacom.bg/vivacom.bg.channels.xml
index 1c4db3f4..7de3ac88 100644
--- a/sites/vivacom.bg/vivacom.bg.channels.xml
+++ b/sites/vivacom.bg/vivacom.bg.channels.xml
@@ -6,7 +6,7 @@
Agro TV
Alfa TV
AMC
- Animal Planet
+ Animal Planet
AXN Black
AXN
AXN White