From 537f5e4d13f85ebfa449efdaf0cf689ee4660375 Mon Sep 17 00:00:00 2001 From: Abu-Vovan-Al-Yahudi <202685450+Abu-Vovan-Al-Yahudi@users.noreply.github.com> Date: Tue, 1 Apr 2025 11:44:06 +0300 Subject: [PATCH 01/40] Update us_thetvapp.m3u --- streams/us_thetvapp.m3u | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/streams/us_thetvapp.m3u b/streams/us_thetvapp.m3u index bd4a14116a..59e66578af 100644 --- a/streams/us_thetvapp.m3u +++ b/streams/us_thetvapp.m3u @@ -1,4 +1,6 @@ #EXTM3U +#EXTINF:-1 tvg-id="ACCNetwork.us",ACC NETWORK +https://v1.thetvapp.to/hls/ACCNetwork/index.m3u8 #EXTINF:-1 tvg-id="AEEast.us",A&E East https://v1.thetvapp.to/hls/AEEast/index.m3u8 #EXTINF:-1 tvg-id="CSPAN.us",C-SPAN @@ -17,6 +19,12 @@ https://v1.thetvapp.to/hls/DisneyJuniorEast/index.m3u8 https://v1.thetvapp.to/hls/DisneyXDEast/index.m3u8 #EXTINF:-1 tvg-id="EEast.us",E! East https://v1.thetvapp.to/hls/EEast/index.m3u8 +#EXTINF:-1 tvg-id="ESPNDeportes.us",ESPN Deportes +https://v1.thetvapp.to/hls/espn-deportes/index.m3u8 +#EXTINF:-1 tvg-id="ESPNews.us",ESPN NEWS +https://v1.thetvapp.to/hls/ESPNews/index.m3u8 +#EXTINF:-1 tvg-id="ESPNU.us",ESPN U +https://v1.thetvapp.to/hls/ESPNU/index.m3u8 #EXTINF:-1 tvg-id="FoxBusinessNetwork.us",Fox Business Network https://v1.thetvapp.to/hls/FoxBusiness/index.m3u8 #EXTINF:-1 tvg-id="FoxNewsChannel.us",Fox News Channel @@ -33,6 +41,8 @@ https://v1.thetvapp.to/hls/FXMovieChannel/index.m3u8 https://v1.thetvapp.to/hls/FXXEast/index.m3u8 #EXTINF:-1 tvg-id="FYIEast.us",FYI East https://v1.thetvapp.to/hls/FYIEast/index.m3u8 +#EXTINF:-1 tvg-id="GameShowNetwork.us",Game Show Network +https://v1.thetvapp.to/hls/game-show-network-east/index.m3u8 #EXTINF:-1 tvg-id="GolfChannel.us",Golf Channel https://v1.thetvapp.to/hls/GolfChannel/index.m3u8 #EXTINF:-1 tvg-id="HallmarkDrama.us",Hallmark Drama @@ -77,8 +87,16 @@ https://v1.thetvapp.to/hls/nbc-sports-philadelphia/index.m3u8 https://v1.thetvapp.to/hls/NewsmaxTV/index.m3u8 #EXTINF:-1 tvg-id="NFLRedZone.us",NFL RedZone https://v1.thetvapp.to/hls/NFLRedZone/index.m3u8 +#EXTINF:-1 tvg-id="SECNetwork.us",SEC Network +https://v1.thetvapp.to/hls/SECN/index.m3u8 +#EXTINF:-1 tvg-id="Sportsnet360.ca",Sportsnet 360 +https://v1.thetvapp.to/hls/sportsnet-360/index.m3u8 +#EXTINF:-1 tvg-id="SportsnetOne.ca",Sportsnet One +https://v1.thetvapp.to/hls/sportsnet-one/index.m3u8 #EXTINF:-1 tvg-id="StarzEast.us",Starz East https://v1.thetvapp.to/hls/StarzEast/index.m3u8 +#EXTINF:-1 tvg-id="SundanceTV.us",Sundance TV +https://v1.thetvapp.to/hls/SundanceTVEast/index.m3u8 #EXTINF:-1 tvg-id="TSN1.ca",TSN1 https://v1.thetvapp.to/hls/tsn1/index.m3u8 #EXTINF:-1 tvg-id="TSN2.ca",TSN2 From 396185dc6931b72de3470c4ef63ce3d1fafc9b3b Mon Sep 17 00:00:00 2001 From: Abu-Vovan-Al-Yahudi <202685450+Abu-Vovan-Al-Yahudi@users.noreply.github.com> Date: Tue, 1 Apr 2025 15:15:12 +0300 Subject: [PATCH 02/40] Update us_thetvapp.m3u --- streams/us_thetvapp.m3u | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/streams/us_thetvapp.m3u b/streams/us_thetvapp.m3u index 59e66578af..175adf6eb1 100644 --- a/streams/us_thetvapp.m3u +++ b/streams/us_thetvapp.m3u @@ -71,9 +71,9 @@ https://v1.thetvapp.to/hls/marquee-sports-network/index.m3u8 https://v1.thetvapp.to/hls/msg-madison-square-gardens/index.m3u8 #EXTINF:-1 tvg-id="MSNBC.us",MSNBC https://v1.thetvapp.to/hls/MSNBC/index.m3u8 -#EXTINF:-1 tvg-id="NationalGeographicindex.m3u8East.us",National Geographic index.m3u8 East +#EXTINF:-1 tvg-id="NationalGeographicEast.us",National Geographic East https://v1.thetvapp.to/hls/NationalGeographicEast/index.m3u8 -#EXTINF:-1 tvg-id="NationalGeographicWildindex.m3u8East.us",National Geographic Wild index.m3u8 East +#EXTINF:-1 tvg-id="NationalGeographicWildEast.us",National Geographic Wild East https://v1.thetvapp.to/hls/NationalGeographicWildEast/index.m3u8 #EXTINF:-1 tvg-id="NBATV.us",NBA TV https://v1.thetvapp.to/hls/NBATV/index.m3u8 From 2bff43c8913640783f45299d8146886c73864dcf Mon Sep 17 00:00:00 2001 From: Abu-Vovan-Al-Yahudi <202685450+Abu-Vovan-Al-Yahudi@users.noreply.github.com> Date: Wed, 2 Apr 2025 13:01:37 +0300 Subject: [PATCH 03/40] Update streams/us_thetvapp.m3u Co-authored-by: Aleksandr Statciuk <7253922+freearhey@users.noreply.github.com> --- streams/us_thetvapp.m3u | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streams/us_thetvapp.m3u b/streams/us_thetvapp.m3u index 175adf6eb1..b336d1bce5 100644 --- a/streams/us_thetvapp.m3u +++ b/streams/us_thetvapp.m3u @@ -71,7 +71,7 @@ https://v1.thetvapp.to/hls/marquee-sports-network/index.m3u8 https://v1.thetvapp.to/hls/msg-madison-square-gardens/index.m3u8 #EXTINF:-1 tvg-id="MSNBC.us",MSNBC https://v1.thetvapp.to/hls/MSNBC/index.m3u8 -#EXTINF:-1 tvg-id="NationalGeographicEast.us",National Geographic East +#EXTINF:-1 tvg-id="NationalGeographic.us@East",National Geographic East https://v1.thetvapp.to/hls/NationalGeographicEast/index.m3u8 #EXTINF:-1 tvg-id="NationalGeographicWildEast.us",National Geographic Wild East https://v1.thetvapp.to/hls/NationalGeographicWildEast/index.m3u8 From f8b72e57a0cfce93b4150675562dfe6c3e75f403 Mon Sep 17 00:00:00 2001 From: Abu-Vovan-Al-Yahudi <202685450+Abu-Vovan-Al-Yahudi@users.noreply.github.com> Date: Wed, 2 Apr 2025 13:01:45 +0300 Subject: [PATCH 04/40] Update streams/us_thetvapp.m3u Co-authored-by: Aleksandr Statciuk <7253922+freearhey@users.noreply.github.com> --- streams/us_thetvapp.m3u | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streams/us_thetvapp.m3u b/streams/us_thetvapp.m3u index b336d1bce5..ff48cd229c 100644 --- a/streams/us_thetvapp.m3u +++ b/streams/us_thetvapp.m3u @@ -73,7 +73,7 @@ https://v1.thetvapp.to/hls/msg-madison-square-gardens/index.m3u8 https://v1.thetvapp.to/hls/MSNBC/index.m3u8 #EXTINF:-1 tvg-id="NationalGeographic.us@East",National Geographic East https://v1.thetvapp.to/hls/NationalGeographicEast/index.m3u8 -#EXTINF:-1 tvg-id="NationalGeographicWildEast.us",National Geographic Wild East +#EXTINF:-1 tvg-id="NationalGeographicWild.us@East",National Geographic Wild East https://v1.thetvapp.to/hls/NationalGeographicWildEast/index.m3u8 #EXTINF:-1 tvg-id="NBATV.us",NBA TV https://v1.thetvapp.to/hls/NBATV/index.m3u8 From 1e3540fe8a5920fe1c805766101253c09f5a2c38 Mon Sep 17 00:00:00 2001 From: Alstruit <34786806+Alstruit@users.noreply.github.com> Date: Wed, 2 Apr 2025 18:14:50 -0500 Subject: [PATCH 05/40] Remove streams. --- streams/de_adultswim.m3u | 25 ------------------------- streams/us_adultswim.m3u | 29 ----------------------------- 2 files changed, 54 deletions(-) delete mode 100644 streams/de_adultswim.m3u delete mode 100644 streams/us_adultswim.m3u diff --git a/streams/de_adultswim.m3u b/streams/de_adultswim.m3u deleted file mode 100644 index d17fff02e7..0000000000 --- a/streams/de_adultswim.m3u +++ /dev/null @@ -1,25 +0,0 @@ -#EXTM3U -#EXTINF:-1 tvg-id="",Adult Swim Daily Animated (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/daily_animated_1/stream_de.m3u8 -#EXTINF:-1 tvg-id="",Adult Swim Daily Live Action (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/daily_liveaction_1/stream_de.m3u8 -#EXTINF:-1 tvg-id="",Adult Swim Home Movies (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/test-2/stream_de.m3u8 -#EXTINF:-1 tvg-id="",Adult Swim Mr. Pickles (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/mr-pickles/stream_de.m3u8 -#EXTINF:-1 tvg-id="",Adult Swim Squidbillies (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/squidbillies/stream_de.m3u8 -#EXTINF:-1 tvg-id="",Adult Swim Superjail! (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/superjail/stream_de.m3u8 -#EXTINF:-1 tvg-id="",Adult Swim Tim and Eric (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/tim-and-eric/stream_de.m3u8 -#EXTINF:-1 tvg-id="",test Channel 1 (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/test-1/stream_de.m3u8 -#EXTINF:-1 tvg-id="",test Channel 3 (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/test-3/stream_de.m3u8 -#EXTINF:-1 tvg-id="",test Channel 4 (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/test-4/stream_de.m3u8 -#EXTINF:-1 tvg-id="",test Channel 5 (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/test-5/stream_de.m3u8 -#EXTINF:-1 tvg-id="Toonami.fr",Toonami (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/toonami/stream_de.m3u8 diff --git a/streams/us_adultswim.m3u b/streams/us_adultswim.m3u deleted file mode 100644 index 271e9c58ca..0000000000 --- a/streams/us_adultswim.m3u +++ /dev/null @@ -1,29 +0,0 @@ -#EXTM3U -#EXTINF:-1 tvg-id="",Adult Swim Daily Animated (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/daily_animated_1/stream.m3u8 -#EXTINF:-1 tvg-id="",Adult Swim Daily Live Action (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/daily_liveaction_1/stream.m3u8 -#EXTINF:-1 tvg-id="",Adult Swim Home Movies (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/test-2/stream.m3u8 -#EXTINF:-1 tvg-id="",Adult Swim Mr. Pickles (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/mr-pickles/stream.m3u8 -#EXTINF:-1 tvg-id="",Adult Swim Primal (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/primal/stream.m3u8 -#EXTINF:-1 tvg-id="",Adult Swim Squidbillies (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/squidbillies/stream.m3u8 -#EXTINF:-1 tvg-id="",Adult Swim Superjail! (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/superjail/stream.m3u8 -#EXTINF:-1 tvg-id="",Adult Swim Tim and Eric (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/tim-and-eric/stream.m3u8 -#EXTINF:-1 tvg-id="",Adult Swim Williams Stream (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/williams-stream/stream_html5.m3u8 -#EXTINF:-1 tvg-id="",test Channel 1 (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/test-1/stream.m3u8 -#EXTINF:-1 tvg-id="",test Channel 3 (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/test-3/stream.m3u8 -#EXTINF:-1 tvg-id="",test Channel 4 (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/test-4/stream.m3u8 -#EXTINF:-1 tvg-id="",test Channel 5 (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/test-5/stream.m3u8 -#EXTINF:-1 tvg-id="",Toonami (1080p) [Geo-blocked] -https://adultswim-vodlive.cdn.turner.com/live/toonami/stream.m3u8 From 0854fb4a24dd9d5b219fd66fab886767344d0b96 Mon Sep 17 00:00:00 2001 From: Abu-Vovan-Al-Yahudi <202685450+Abu-Vovan-Al-Yahudi@users.noreply.github.com> Date: Thu, 3 Apr 2025 11:21:25 +0300 Subject: [PATCH 06/40] Update us_thetvapp.m3u --- streams/us_thetvapp.m3u | 120 ++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/streams/us_thetvapp.m3u b/streams/us_thetvapp.m3u index ff48cd229c..4fd71a51fd 100644 --- a/streams/us_thetvapp.m3u +++ b/streams/us_thetvapp.m3u @@ -1,121 +1,121 @@ #EXTM3U -#EXTINF:-1 tvg-id="ACCNetwork.us",ACC NETWORK +#EXTINF:-1 tvg-id="ACCNetwork.us",ACC NETWORK [Geo-blocked] https://v1.thetvapp.to/hls/ACCNetwork/index.m3u8 -#EXTINF:-1 tvg-id="AEEast.us",A&E East +#EXTINF:-1 tvg-id="AEEast.us",A&E East [Geo-blocked] https://v1.thetvapp.to/hls/AEEast/index.m3u8 -#EXTINF:-1 tvg-id="CSPAN.us",C-SPAN +#EXTINF:-1 tvg-id="CSPAN.us",C-SPAN [Geo-blocked] https://v1.thetvapp.to/hls/CSPAN/index.m3u8 -#EXTINF:-1 tvg-id="CSPAN2.us",C-SPAN 2 +#EXTINF:-1 tvg-id="CSPAN2.us",C-SPAN 2 [Geo-blocked] https://v1.thetvapp.to/hls/CSPAN2/index.m3u8 -#EXTINF:-1 tvg-id="CNBC.us",CNBC +#EXTINF:-1 tvg-id="CNBC.us",CNBC [Geo-blocked] https://v1.thetvapp.to/hls/CNBC/index.m3u8 -#EXTINF:-1 tvg-id="CrimePlusInvestigation.us",Crime + Investigation +#EXTINF:-1 tvg-id="CrimePlusInvestigation.us",Crime + Investigation [Geo-blocked] https://v1.thetvapp.to/hls/CrimePlusInvestigation/index.m3u8 -#EXTINF:-1 tvg-id="DisneyChannelEast.us",Disney Channel East +#EXTINF:-1 tvg-id="DisneyChannelEast.us",Disney Channel East [Geo-blocked] https://v1.thetvapp.to/hls/DisneyChannelEast/index.m3u8 -#EXTINF:-1 tvg-id="DisneyJuniorEast.us",Disney Junior East +#EXTINF:-1 tvg-id="DisneyJuniorEast.us",Disney Junior East [Geo-blocked] https://v1.thetvapp.to/hls/DisneyJuniorEast/index.m3u8 -#EXTINF:-1 tvg-id="DisneyXDEast.us",Disney XD East +#EXTINF:-1 tvg-id="DisneyXDEast.us",Disney XD East [Geo-blocked] https://v1.thetvapp.to/hls/DisneyXDEast/index.m3u8 -#EXTINF:-1 tvg-id="EEast.us",E! East +#EXTINF:-1 tvg-id="EEast.us",E! East [Geo-blocked] https://v1.thetvapp.to/hls/EEast/index.m3u8 -#EXTINF:-1 tvg-id="ESPNDeportes.us",ESPN Deportes +#EXTINF:-1 tvg-id="ESPNDeportes.us",ESPN Deportes [Geo-blocked] https://v1.thetvapp.to/hls/espn-deportes/index.m3u8 -#EXTINF:-1 tvg-id="ESPNews.us",ESPN NEWS +#EXTINF:-1 tvg-id="ESPNews.us",ESPN NEWS [Geo-blocked] https://v1.thetvapp.to/hls/ESPNews/index.m3u8 -#EXTINF:-1 tvg-id="ESPNU.us",ESPN U +#EXTINF:-1 tvg-id="ESPNU.us",ESPN U [Geo-blocked] https://v1.thetvapp.to/hls/ESPNU/index.m3u8 -#EXTINF:-1 tvg-id="FoxBusinessNetwork.us",Fox Business Network +#EXTINF:-1 tvg-id="FoxBusinessNetwork.us",Fox Business Network [Geo-blocked] https://v1.thetvapp.to/hls/FoxBusiness/index.m3u8 -#EXTINF:-1 tvg-id="FoxNewsChannel.us",Fox News Channel +#EXTINF:-1 tvg-id="FoxNewsChannel.us",Fox News Channel [Geo-blocked] https://v1.thetvapp.to/hls/FoxNewsChannel/index.m3u8 -#EXTINF:-1 tvg-id="FoxSports2.us",Fox Sports 2 +#EXTINF:-1 tvg-id="FoxSports2.us",Fox Sports 2 [Geo-blocked] https://v1.thetvapp.to/hls/FoxSports2/index.m3u8 -#EXTINF:-1 tvg-id="FuseEast.us",Fuse East +#EXTINF:-1 tvg-id="FuseEast.us",Fuse East [Geo-blocked] https://v1.thetvapp.to/hls/FuseEast/index.m3u8 -#EXTINF:-1 tvg-id="FXEast.us",FX East +#EXTINF:-1 tvg-id="FXEast.us",FX East [Geo-blocked] https://v1.thetvapp.to/hls/FXEast/index.m3u8 -#EXTINF:-1 tvg-id="FXMovieChannel.us",FX Movie Channel +#EXTINF:-1 tvg-id="FXMovieChannel.us",FX Movie Channel [Geo-blocked] https://v1.thetvapp.to/hls/FXMovieChannel/index.m3u8 -#EXTINF:-1 tvg-id="FXXEast.us",FXX East +#EXTINF:-1 tvg-id="FXXEast.us",FXX East [Geo-blocked] https://v1.thetvapp.to/hls/FXXEast/index.m3u8 -#EXTINF:-1 tvg-id="FYIEast.us",FYI East +#EXTINF:-1 tvg-id="FYIEast.us",FYI East [Geo-blocked] https://v1.thetvapp.to/hls/FYIEast/index.m3u8 -#EXTINF:-1 tvg-id="GameShowNetwork.us",Game Show Network +#EXTINF:-1 tvg-id="GameShowNetwork.us",Game Show Network [Geo-blocked] https://v1.thetvapp.to/hls/game-show-network-east/index.m3u8 -#EXTINF:-1 tvg-id="GolfChannel.us",Golf Channel +#EXTINF:-1 tvg-id="GolfChannel.us",Golf Channel [Geo-blocked] https://v1.thetvapp.to/hls/GolfChannel/index.m3u8 -#EXTINF:-1 tvg-id="HallmarkDrama.us",Hallmark Drama +#EXTINF:-1 tvg-id="HallmarkDrama.us",Hallmark Drama [Geo-blocked] https://v1.thetvapp.to/hls/HallmarkDrama/index.m3u8 -#EXTINF:-1 tvg-id="HallmarkMoviesMysteriesEast.us",Hallmark Movies & Mysteries East +#EXTINF:-1 tvg-id="HallmarkMoviesMysteriesEast.us",Hallmark Movies & Mysteries East [Geo-blocked] https://v1.thetvapp.to/hls/HallmarkMoviesMysteriesEast/index.m3u8 -#EXTINF:-1 tvg-id="IFCEast.us",IFC East +#EXTINF:-1 tvg-id="IFCEast.us",IFC East [Geo-blocked] https://v1.thetvapp.to/hls/IFCEast/index.m3u8 -#EXTINF:-1 tvg-id="KABCDT1.us",KABC-DT1 +#EXTINF:-1 tvg-id="KABCDT1.us",KABC-DT1 [Geo-blocked] https://v1.thetvapp.to/hls/abc-kabc-los-angeles-ca/index.m3u8 -#EXTINF:-1 tvg-id="KCBSDT1.us",KCBS-DT1 +#EXTINF:-1 tvg-id="KCBSDT1.us",KCBS-DT1 [Geo-blocked] https://v1.thetvapp.to/hls/cbs-kcbs-los-angeles-ca/index.m3u8 -#EXTINF:-1 tvg-id="KFMBDT2.us",KFMB-DT2 +#EXTINF:-1 tvg-id="KFMBDT2.us",KFMB-DT2 [Geo-blocked] https://v1.thetvapp.to/hls/cw-kfmbtv2-san-diego-ca/index.m3u8 -#EXTINF:-1 tvg-id="KNBCDT1.us",KNBC-DT1 +#EXTINF:-1 tvg-id="KNBCDT1.us",KNBC-DT1 [Geo-blocked] https://v1.thetvapp.to/hls/nbc-knbc-los-angeles-ca/index.m3u8 -#EXTINF:-1 tvg-id="KTTVDT1.us",KTTV-DT1 +#EXTINF:-1 tvg-id="KTTVDT1.us",KTTV-DT1 [Geo-blocked] https://v1.thetvapp.to/hls/fox-kttv-los-angeles-ca/index.m3u8 -#EXTINF:-1 tvg-id="LifetimeMoviesEast.us",Lifetime Movies East +#EXTINF:-1 tvg-id="LifetimeMoviesEast.us",Lifetime Movies East [Geo-blocked] https://v1.thetvapp.to/hls/LifetimeMoviesEast/index.m3u8 -#EXTINF:-1 tvg-id="LogoEast.us",Logo East +#EXTINF:-1 tvg-id="LogoEast.us",Logo East [Geo-blocked] https://v1.thetvapp.to/hls/LogoEast/index.m3u8 -#EXTINF:-1 tvg-id="MarqueeSportsNetwork.us",Marquee Sports Network +#EXTINF:-1 tvg-id="MarqueeSportsNetwork.us",Marquee Sports Network [Geo-blocked] https://v1.thetvapp.to/hls/marquee-sports-network/index.m3u8 -#EXTINF:-1 tvg-id="MSG.us",MSG +#EXTINF:-1 tvg-id="MSG.us",MSG [Geo-blocked] https://v1.thetvapp.to/hls/msg-madison-square-gardens/index.m3u8 -#EXTINF:-1 tvg-id="MSNBC.us",MSNBC +#EXTINF:-1 tvg-id="MSNBC.us",MSNBC [Geo-blocked] https://v1.thetvapp.to/hls/MSNBC/index.m3u8 -#EXTINF:-1 tvg-id="NationalGeographic.us@East",National Geographic East +#EXTINF:-1 tvg-id="NationalGeographic.us@East",National Geographic East [Geo-blocked] https://v1.thetvapp.to/hls/NationalGeographicEast/index.m3u8 -#EXTINF:-1 tvg-id="NationalGeographicWild.us@East",National Geographic Wild East +#EXTINF:-1 tvg-id="NationalGeographicWild.us@East",National Geographic Wild East [Geo-blocked] https://v1.thetvapp.to/hls/NationalGeographicWildEast/index.m3u8 -#EXTINF:-1 tvg-id="NBATV.us",NBA TV +#EXTINF:-1 tvg-id="NBATV.us",NBA TV [Geo-blocked] https://v1.thetvapp.to/hls/NBATV/index.m3u8 -#EXTINF:-1 tvg-id="NBCSportsBayArea.us",NBC Sports Bay Area +#EXTINF:-1 tvg-id="NBCSportsBayArea.us",NBC Sports Bay Area [Geo-blocked] https://v1.thetvapp.to/hls/nbc-sports-bay-area/index.m3u8 -#EXTINF:-1 tvg-id="NBCSportsBoston.us",NBC Sports Boston +#EXTINF:-1 tvg-id="NBCSportsBoston.us",NBC Sports Boston [Geo-blocked] https://v1.thetvapp.to/hls/nbc-sports-boston/index.m3u8 -#EXTINF:-1 tvg-id="NBCSportsPhiladelphia.us",NBC Sports Philadelphia +#EXTINF:-1 tvg-id="NBCSportsPhiladelphia.us",NBC Sports Philadelphia [Geo-blocked] https://v1.thetvapp.to/hls/nbc-sports-philadelphia/index.m3u8 -#EXTINF:-1 tvg-id="NewsmaxTV.us",Newsmax TV +#EXTINF:-1 tvg-id="NewsmaxTV.us",Newsmax TV [Geo-blocked] https://v1.thetvapp.to/hls/NewsmaxTV/index.m3u8 -#EXTINF:-1 tvg-id="NFLRedZone.us",NFL RedZone +#EXTINF:-1 tvg-id="NFLRedZone.us",NFL RedZone [Geo-blocked] https://v1.thetvapp.to/hls/NFLRedZone/index.m3u8 -#EXTINF:-1 tvg-id="SECNetwork.us",SEC Network +#EXTINF:-1 tvg-id="SECNetwork.us",SEC Network [Geo-blocked] https://v1.thetvapp.to/hls/SECN/index.m3u8 -#EXTINF:-1 tvg-id="Sportsnet360.ca",Sportsnet 360 +#EXTINF:-1 tvg-id="Sportsnet360.ca",Sportsnet 360 [Geo-blocked] https://v1.thetvapp.to/hls/sportsnet-360/index.m3u8 -#EXTINF:-1 tvg-id="SportsnetOne.ca",Sportsnet One +#EXTINF:-1 tvg-id="SportsnetOne.ca",Sportsnet One [Geo-blocked] https://v1.thetvapp.to/hls/sportsnet-one/index.m3u8 -#EXTINF:-1 tvg-id="StarzEast.us",Starz East +#EXTINF:-1 tvg-id="StarzEast.us",Starz East [Geo-blocked] https://v1.thetvapp.to/hls/StarzEast/index.m3u8 -#EXTINF:-1 tvg-id="SundanceTV.us",Sundance TV +#EXTINF:-1 tvg-id="SundanceTV.us",Sundance TV [Geo-blocked] https://v1.thetvapp.to/hls/SundanceTVEast/index.m3u8 -#EXTINF:-1 tvg-id="TSN1.ca",TSN1 +#EXTINF:-1 tvg-id="TSN1.ca",TSN1 [Geo-blocked] https://v1.thetvapp.to/hls/tsn1/index.m3u8 -#EXTINF:-1 tvg-id="TSN2.ca",TSN2 +#EXTINF:-1 tvg-id="TSN2.ca",TSN2 [Geo-blocked] https://v1.thetvapp.to/hls/tsn2/index.m3u8 -#EXTINF:-1 tvg-id="TSN3.ca",TSN3 +#EXTINF:-1 tvg-id="TSN3.ca",TSN3 [Geo-blocked] https://v1.thetvapp.to/hls/tsn3/index.m3u8 -#EXTINF:-1 tvg-id="TSN4.ca",TSN4 +#EXTINF:-1 tvg-id="TSN4.ca",TSN4 [Geo-blocked] https://v1.thetvapp.to/hls/tsn4/index.m3u8 -#EXTINF:-1 tvg-id="TSN5.ca",TSN5 +#EXTINF:-1 tvg-id="TSN5.ca",TSN5 [Geo-blocked] https://v1.thetvapp.to/hls/tsn5/index.m3u8 -#EXTINF:-1 tvg-id="USANetworkEast.us",USA Network East +#EXTINF:-1 tvg-id="USANetworkEast.us",USA Network East [Geo-blocked] https://v1.thetvapp.to/hls/USANetworkEast/index.m3u8 -#EXTINF:-1 tvg-id="WABCDT1.us",WABC-DT1 +#EXTINF:-1 tvg-id="WABCDT1.us",WABC-DT1 [Geo-blocked] https://v1.thetvapp.to/hls/WABCDT1/index.m3u8 -#EXTINF:-1 tvg-id="WNBCDT1.us",WNBC-DT1 +#EXTINF:-1 tvg-id="WNBCDT1.us",WNBC-DT1 [Geo-blocked] https://v1.thetvapp.to/hls/WNBCDT1/index.m3u8 -#EXTINF:-1 tvg-id="WNETDT1.us",WNET-DT1 +#EXTINF:-1 tvg-id="WNETDT1.us",WNET-DT1 [Geo-blocked] https://v1.thetvapp.to/hls/WNET/index.m3u8 -#EXTINF:-1 tvg-id="WNJUDT1.us",WNJU-DT1 +#EXTINF:-1 tvg-id="WNJUDT1.us",WNJU-DT1 [Geo-blocked] https://v1.thetvapp.to/hls/TelemundoEast/index.m3u8 -#EXTINF:-1 tvg-id="WNYWDT1.us",WNYW-DT1 +#EXTINF:-1 tvg-id="WNYWDT1.us",WNYW-DT1 [Geo-blocked] https://v1.thetvapp.to/hls/WNYWDT1/index.m3u8 From 55da5f67309fa0fb4a8df89684ff3e849ba23582 Mon Sep 17 00:00:00 2001 From: Abu-Vovan-Al-Yahudi <202685450+Abu-Vovan-Al-Yahudi@users.noreply.github.com> Date: Wed, 9 Apr 2025 11:06:27 +0300 Subject: [PATCH 07/40] Update us_thetvapp.m3u --- streams/us_thetvapp.m3u | 180 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) diff --git a/streams/us_thetvapp.m3u b/streams/us_thetvapp.m3u index 4fd71a51fd..3a58b718e5 100644 --- a/streams/us_thetvapp.m3u +++ b/streams/us_thetvapp.m3u @@ -1,121 +1,301 @@ #EXTM3U #EXTINF:-1 tvg-id="ACCNetwork.us",ACC NETWORK [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/ACCNetwork/index.m3u8 #EXTINF:-1 tvg-id="AEEast.us",A&E East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/AEEast/index.m3u8 #EXTINF:-1 tvg-id="CSPAN.us",C-SPAN [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/CSPAN/index.m3u8 #EXTINF:-1 tvg-id="CSPAN2.us",C-SPAN 2 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/CSPAN2/index.m3u8 #EXTINF:-1 tvg-id="CNBC.us",CNBC [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/CNBC/index.m3u8 #EXTINF:-1 tvg-id="CrimePlusInvestigation.us",Crime + Investigation [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/CrimePlusInvestigation/index.m3u8 #EXTINF:-1 tvg-id="DisneyChannelEast.us",Disney Channel East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/DisneyChannelEast/index.m3u8 #EXTINF:-1 tvg-id="DisneyJuniorEast.us",Disney Junior East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/DisneyJuniorEast/index.m3u8 #EXTINF:-1 tvg-id="DisneyXDEast.us",Disney XD East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/DisneyXDEast/index.m3u8 #EXTINF:-1 tvg-id="EEast.us",E! East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/EEast/index.m3u8 #EXTINF:-1 tvg-id="ESPNDeportes.us",ESPN Deportes [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/espn-deportes/index.m3u8 #EXTINF:-1 tvg-id="ESPNews.us",ESPN NEWS [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/ESPNews/index.m3u8 #EXTINF:-1 tvg-id="ESPNU.us",ESPN U [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/ESPNU/index.m3u8 #EXTINF:-1 tvg-id="FoxBusinessNetwork.us",Fox Business Network [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/FoxBusiness/index.m3u8 #EXTINF:-1 tvg-id="FoxNewsChannel.us",Fox News Channel [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/FoxNewsChannel/index.m3u8 #EXTINF:-1 tvg-id="FoxSports2.us",Fox Sports 2 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/FoxSports2/index.m3u8 #EXTINF:-1 tvg-id="FuseEast.us",Fuse East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/FuseEast/index.m3u8 #EXTINF:-1 tvg-id="FXEast.us",FX East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/FXEast/index.m3u8 #EXTINF:-1 tvg-id="FXMovieChannel.us",FX Movie Channel [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/FXMovieChannel/index.m3u8 #EXTINF:-1 tvg-id="FXXEast.us",FXX East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/FXXEast/index.m3u8 #EXTINF:-1 tvg-id="FYIEast.us",FYI East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/FYIEast/index.m3u8 #EXTINF:-1 tvg-id="GameShowNetwork.us",Game Show Network [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/game-show-network-east/index.m3u8 #EXTINF:-1 tvg-id="GolfChannel.us",Golf Channel [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/GolfChannel/index.m3u8 #EXTINF:-1 tvg-id="HallmarkDrama.us",Hallmark Drama [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/HallmarkDrama/index.m3u8 #EXTINF:-1 tvg-id="HallmarkMoviesMysteriesEast.us",Hallmark Movies & Mysteries East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/HallmarkMoviesMysteriesEast/index.m3u8 #EXTINF:-1 tvg-id="IFCEast.us",IFC East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/IFCEast/index.m3u8 #EXTINF:-1 tvg-id="KABCDT1.us",KABC-DT1 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/abc-kabc-los-angeles-ca/index.m3u8 #EXTINF:-1 tvg-id="KCBSDT1.us",KCBS-DT1 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/cbs-kcbs-los-angeles-ca/index.m3u8 #EXTINF:-1 tvg-id="KFMBDT2.us",KFMB-DT2 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/cw-kfmbtv2-san-diego-ca/index.m3u8 #EXTINF:-1 tvg-id="KNBCDT1.us",KNBC-DT1 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/nbc-knbc-los-angeles-ca/index.m3u8 #EXTINF:-1 tvg-id="KTTVDT1.us",KTTV-DT1 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/fox-kttv-los-angeles-ca/index.m3u8 #EXTINF:-1 tvg-id="LifetimeMoviesEast.us",Lifetime Movies East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/LifetimeMoviesEast/index.m3u8 #EXTINF:-1 tvg-id="LogoEast.us",Logo East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/LogoEast/index.m3u8 #EXTINF:-1 tvg-id="MarqueeSportsNetwork.us",Marquee Sports Network [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/marquee-sports-network/index.m3u8 #EXTINF:-1 tvg-id="MSG.us",MSG [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/msg-madison-square-gardens/index.m3u8 #EXTINF:-1 tvg-id="MSNBC.us",MSNBC [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/MSNBC/index.m3u8 #EXTINF:-1 tvg-id="NationalGeographic.us@East",National Geographic East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/NationalGeographicEast/index.m3u8 #EXTINF:-1 tvg-id="NationalGeographicWild.us@East",National Geographic Wild East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/NationalGeographicWildEast/index.m3u8 #EXTINF:-1 tvg-id="NBATV.us",NBA TV [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/NBATV/index.m3u8 #EXTINF:-1 tvg-id="NBCSportsBayArea.us",NBC Sports Bay Area [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/nbc-sports-bay-area/index.m3u8 #EXTINF:-1 tvg-id="NBCSportsBoston.us",NBC Sports Boston [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/nbc-sports-boston/index.m3u8 #EXTINF:-1 tvg-id="NBCSportsPhiladelphia.us",NBC Sports Philadelphia [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/nbc-sports-philadelphia/index.m3u8 #EXTINF:-1 tvg-id="NewsmaxTV.us",Newsmax TV [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/NewsmaxTV/index.m3u8 #EXTINF:-1 tvg-id="NFLRedZone.us",NFL RedZone [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/NFLRedZone/index.m3u8 #EXTINF:-1 tvg-id="SECNetwork.us",SEC Network [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/SECN/index.m3u8 #EXTINF:-1 tvg-id="Sportsnet360.ca",Sportsnet 360 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/sportsnet-360/index.m3u8 #EXTINF:-1 tvg-id="SportsnetOne.ca",Sportsnet One [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/sportsnet-one/index.m3u8 #EXTINF:-1 tvg-id="StarzEast.us",Starz East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/StarzEast/index.m3u8 #EXTINF:-1 tvg-id="SundanceTV.us",Sundance TV [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/SundanceTVEast/index.m3u8 #EXTINF:-1 tvg-id="TSN1.ca",TSN1 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/tsn1/index.m3u8 #EXTINF:-1 tvg-id="TSN2.ca",TSN2 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/tsn2/index.m3u8 #EXTINF:-1 tvg-id="TSN3.ca",TSN3 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/tsn3/index.m3u8 #EXTINF:-1 tvg-id="TSN4.ca",TSN4 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/tsn4/index.m3u8 #EXTINF:-1 tvg-id="TSN5.ca",TSN5 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/tsn5/index.m3u8 #EXTINF:-1 tvg-id="USANetworkEast.us",USA Network East [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/USANetworkEast/index.m3u8 #EXTINF:-1 tvg-id="WABCDT1.us",WABC-DT1 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/WABCDT1/index.m3u8 #EXTINF:-1 tvg-id="WNBCDT1.us",WNBC-DT1 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/WNBCDT1/index.m3u8 #EXTINF:-1 tvg-id="WNETDT1.us",WNET-DT1 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/WNET/index.m3u8 #EXTINF:-1 tvg-id="WNJUDT1.us",WNJU-DT1 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/TelemundoEast/index.m3u8 #EXTINF:-1 tvg-id="WNYWDT1.us",WNYW-DT1 [Geo-blocked] +#EXTVLCOPT:http-origin=https://thetvapp.to +#EXTVLCOPT:http-referrer=https://thetvapp.to/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 https://v1.thetvapp.to/hls/WNYWDT1/index.m3u8 From 90d065d22340c2e738a0b4d4f95c47648e5f4f68 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 16 Apr 2025 20:19:05 +0300 Subject: [PATCH 08/40] Update dependencies --- package-lock.json | 532 +++++++++++++++++++++++++++++++++++++++++----- package.json | 5 +- yarn.lock | 189 ++++++++++++++-- 3 files changed, 652 insertions(+), 74 deletions(-) diff --git a/package-lock.json b/package-lock.json index a9d29de735..4df46535d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,8 @@ "@eslint/eslintrc": "^3.3.0", "@eslint/js": "^9.21.0", "@freearhey/core": "^0.7.0", + "@freearhey/search-js": "^0.1.2", + "@inquirer/prompts": "^7.4.1", "@octokit/core": "^6.1.4", "@octokit/plugin-paginate-rest": "^11.4.3", "@octokit/plugin-rest-endpoint-methods": "^7.1.3", @@ -36,8 +38,8 @@ "lodash": "^4.17.21", "m3u-linter": "^0.4.2", "markdown-include": "^0.4.3", + "node-cleanup": "^2.1.2", "numeral": "^2.0.6", - "transliteration": "^2.3.5", "ts-jest": "^29.2.5", "tsx": "^4.6.2", "valid-url": "^1.0.9" @@ -1093,6 +1095,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@freearhey/search-js": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@freearhey/search-js/-/search-js-0.1.2.tgz", + "integrity": "sha512-F2o+xpGCXOK4OsZfKEHfXNNkAZmny2eBnPOp+P0iyV20ja7gJGfTFaEc6okcuEo6OB6P7LnSxTvISkoArFtlfg==", + "dependencies": { + "lodash": "^4.17.21" + }, + "engines": { + "node": ">=16.0.0" + } + }, "node_modules/@humanfs/core": { "version": "0.19.1", "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", @@ -1149,13 +1162,36 @@ "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@inquirer/confirm": { - "version": "5.1.7", - "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.7.tgz", - "integrity": "sha512-Xrfbrw9eSiHb+GsesO8TQIeHSMTP0xyvTCeeYevgZ4sKW+iz9w/47bgfG9b0niQm+xaLY2EWPBINUPldLwvYiw==", + "node_modules/@inquirer/checkbox": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.1.5.tgz", + "integrity": "sha512-swPczVU+at65xa5uPfNP9u3qx/alNwiaykiI/ExpsmMSQW55trmZcwhYWzw/7fj+n6Q8z1eENvR7vFfq9oPSAQ==", "dependencies": { - "@inquirer/core": "^10.1.8", - "@inquirer/type": "^3.0.5" + "@inquirer/core": "^10.1.10", + "@inquirer/figures": "^1.0.11", + "@inquirer/type": "^3.0.6", + "ansi-escapes": "^4.3.2", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } + } + }, + "node_modules/@inquirer/confirm": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.9.tgz", + "integrity": "sha512-NgQCnHqFTjF7Ys2fsqK2WtnA8X1kHyInyG+nMIuHowVTIgIuS10T4AznI/PvbqSpJqjCUqNBlKGh1v3bwLFL4w==", + "dependencies": { + "@inquirer/core": "^10.1.10", + "@inquirer/type": "^3.0.6" }, "engines": { "node": ">=18" @@ -1170,12 +1206,12 @@ } }, "node_modules/@inquirer/core": { - "version": "10.1.8", - "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.8.tgz", - "integrity": "sha512-HpAqR8y715zPpM9e/9Q+N88bnGwqqL8ePgZ0SMv/s3673JLMv3bIkoivGmjPqXlEgisUksSXibweQccUwEx4qQ==", + "version": "10.1.10", + "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.10.tgz", + "integrity": "sha512-roDaKeY1PYY0aCqhRmXihrHjoSW2A00pV3Ke5fTpMCkzcGF64R8e0lw3dK+eLEHwS4vB5RnW1wuQmvzoRul8Mw==", "dependencies": { "@inquirer/figures": "^1.0.11", - "@inquirer/type": "^3.0.5", + "@inquirer/type": "^3.0.6", "ansi-escapes": "^4.3.2", "cli-width": "^4.1.0", "mute-stream": "^2.0.0", @@ -1219,6 +1255,48 @@ "node": ">=8" } }, + "node_modules/@inquirer/editor": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.10.tgz", + "integrity": "sha512-5GVWJ+qeI6BzR6TIInLP9SXhWCEcvgFQYmcRG6d6RIlhFjM5TyG18paTGBgRYyEouvCmzeco47x9zX9tQEofkw==", + "dependencies": { + "@inquirer/core": "^10.1.10", + "@inquirer/type": "^3.0.6", + "external-editor": "^3.1.0" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } + } + }, + "node_modules/@inquirer/expand": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.12.tgz", + "integrity": "sha512-jV8QoZE1fC0vPe6TnsOfig+qwu7Iza1pkXoUJ3SroRagrt2hxiL+RbM432YAihNR7m7XnU0HWl/WQ35RIGmXHw==", + "dependencies": { + "@inquirer/core": "^10.1.10", + "@inquirer/type": "^3.0.6", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } + } + }, "node_modules/@inquirer/figures": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.11.tgz", @@ -1227,10 +1305,165 @@ "node": ">=18" } }, + "node_modules/@inquirer/input": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.1.9.tgz", + "integrity": "sha512-mshNG24Ij5KqsQtOZMgj5TwEjIf+F2HOESk6bjMwGWgcH5UBe8UoljwzNFHqdMbGYbgAf6v2wU/X9CAdKJzgOA==", + "dependencies": { + "@inquirer/core": "^10.1.10", + "@inquirer/type": "^3.0.6" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } + } + }, + "node_modules/@inquirer/number": { + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.12.tgz", + "integrity": "sha512-7HRFHxbPCA4e4jMxTQglHJwP+v/kpFsCf2szzfBHy98Wlc3L08HL76UDiA87TOdX5fwj2HMOLWqRWv9Pnn+Z5Q==", + "dependencies": { + "@inquirer/core": "^10.1.10", + "@inquirer/type": "^3.0.6" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } + } + }, + "node_modules/@inquirer/password": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.12.tgz", + "integrity": "sha512-FlOB0zvuELPEbnBYiPaOdJIaDzb2PmJ7ghi/SVwIHDDSQ2K4opGBkF+5kXOg6ucrtSUQdLhVVY5tycH0j0l+0g==", + "dependencies": { + "@inquirer/core": "^10.1.10", + "@inquirer/type": "^3.0.6", + "ansi-escapes": "^4.3.2" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } + } + }, + "node_modules/@inquirer/prompts": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.4.1.tgz", + "integrity": "sha512-UlmM5FVOZF0gpoe1PT/jN4vk8JmpIWBlMvTL8M+hlvPmzN89K6z03+IFmyeu/oFCenwdwHDr2gky7nIGSEVvlA==", + "dependencies": { + "@inquirer/checkbox": "^4.1.5", + "@inquirer/confirm": "^5.1.9", + "@inquirer/editor": "^4.2.10", + "@inquirer/expand": "^4.0.12", + "@inquirer/input": "^4.1.9", + "@inquirer/number": "^3.0.12", + "@inquirer/password": "^4.0.12", + "@inquirer/rawlist": "^4.0.12", + "@inquirer/search": "^3.0.12", + "@inquirer/select": "^4.1.1" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } + } + }, + "node_modules/@inquirer/rawlist": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.0.12.tgz", + "integrity": "sha512-wNPJZy8Oc7RyGISPxp9/MpTOqX8lr0r+lCCWm7hQra+MDtYRgINv1hxw7R+vKP71Bu/3LszabxOodfV/uTfsaA==", + "dependencies": { + "@inquirer/core": "^10.1.10", + "@inquirer/type": "^3.0.6", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } + } + }, + "node_modules/@inquirer/search": { + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.12.tgz", + "integrity": "sha512-H/kDJA3kNlnNIjB8YsaXoQI0Qccgf0Na14K1h8ExWhNmUg2E941dyFPrZeugihEa9AZNW5NdsD/NcvUME83OPQ==", + "dependencies": { + "@inquirer/core": "^10.1.10", + "@inquirer/figures": "^1.0.11", + "@inquirer/type": "^3.0.6", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } + } + }, + "node_modules/@inquirer/select": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.1.1.tgz", + "integrity": "sha512-IUXzzTKVdiVNMA+2yUvPxWsSgOG4kfX93jOM4Zb5FgujeInotv5SPIJVeXQ+fO4xu7tW8VowFhdG5JRmmCyQ1Q==", + "dependencies": { + "@inquirer/core": "^10.1.10", + "@inquirer/figures": "^1.0.11", + "@inquirer/type": "^3.0.6", + "ansi-escapes": "^4.3.2", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } + } + }, "node_modules/@inquirer/type": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.5.tgz", - "integrity": "sha512-ZJpeIYYueOz/i/ONzrfof8g89kNdO2hjGuvULROo3O8rlB2CRtSseE5KeirnyE4t/thAn/EwvS/vuQeJCn+NZg==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.6.tgz", + "integrity": "sha512-/mKVCtVpyBu3IDarv0G+59KC4stsD5mDsGpYh+GKs1NZT88Jh52+cuoA1AtLk2Q0r/quNl+1cSUyLRHBFeD0XA==", "engines": { "node": ">=18" }, @@ -2862,6 +3095,11 @@ "node": ">=10" } }, + "node_modules/chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" + }, "node_modules/ci-info": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", @@ -3447,6 +3685,19 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dependencies": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/fast-content-type-parse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-2.0.1.tgz", @@ -3948,6 +4199,17 @@ "node": ">=10.17.0" } }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", @@ -5409,6 +5671,11 @@ "node": ">=18" } }, + "node_modules/node-cleanup": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/node-cleanup/-/node-cleanup-2.1.2.tgz", + "integrity": "sha512-qN8v/s2PAJwGUtr1/hYTpNKlD6Y9rc4p8KSmJXyGdYGZsDGKXrGThikLFP9OCHFeLeEpQzPwiAtdIvBLqm//Hw==" + }, "node_modules/node-gzip": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/node-gzip/-/node-gzip-1.1.2.tgz", @@ -5514,6 +5781,14 @@ "node": ">= 0.8.0" } }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/outvariant": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz", @@ -6069,6 +6344,11 @@ "run-script-os": "index.js" } }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, "node_modules/semver": { "version": "7.6.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", @@ -6443,6 +6723,17 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", @@ -6474,21 +6765,6 @@ "node": ">=6" } }, - "node_modules/transliteration": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/transliteration/-/transliteration-2.3.5.tgz", - "integrity": "sha512-HAGI4Lq4Q9dZ3Utu2phaWgtm3vB6PkLUFqWAScg/UW+1eZ/Tg6Exo4oC0/3VUol/w4BlefLhUUSVBr/9/ZGQOw==", - "dependencies": { - "yargs": "^17.5.1" - }, - "bin": { - "slugify": "dist/bin/slugify", - "transliterate": "dist/bin/transliterate" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/ts-api-utils": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz", @@ -7491,6 +7767,14 @@ } } }, + "@freearhey/search-js": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@freearhey/search-js/-/search-js-0.1.2.tgz", + "integrity": "sha512-F2o+xpGCXOK4OsZfKEHfXNNkAZmny2eBnPOp+P0iyV20ja7gJGfTFaEc6okcuEo6OB6P7LnSxTvISkoArFtlfg==", + "requires": { + "lodash": "^4.17.21" + } + }, "@humanfs/core": { "version": "0.19.1", "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", @@ -7522,22 +7806,34 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz", "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==" }, - "@inquirer/confirm": { - "version": "5.1.7", - "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.7.tgz", - "integrity": "sha512-Xrfbrw9eSiHb+GsesO8TQIeHSMTP0xyvTCeeYevgZ4sKW+iz9w/47bgfG9b0niQm+xaLY2EWPBINUPldLwvYiw==", + "@inquirer/checkbox": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.1.5.tgz", + "integrity": "sha512-swPczVU+at65xa5uPfNP9u3qx/alNwiaykiI/ExpsmMSQW55trmZcwhYWzw/7fj+n6Q8z1eENvR7vFfq9oPSAQ==", "requires": { - "@inquirer/core": "^10.1.8", - "@inquirer/type": "^3.0.5" + "@inquirer/core": "^10.1.10", + "@inquirer/figures": "^1.0.11", + "@inquirer/type": "^3.0.6", + "ansi-escapes": "^4.3.2", + "yoctocolors-cjs": "^2.1.2" + } + }, + "@inquirer/confirm": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.9.tgz", + "integrity": "sha512-NgQCnHqFTjF7Ys2fsqK2WtnA8X1kHyInyG+nMIuHowVTIgIuS10T4AznI/PvbqSpJqjCUqNBlKGh1v3bwLFL4w==", + "requires": { + "@inquirer/core": "^10.1.10", + "@inquirer/type": "^3.0.6" } }, "@inquirer/core": { - "version": "10.1.8", - "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.8.tgz", - "integrity": "sha512-HpAqR8y715zPpM9e/9Q+N88bnGwqqL8ePgZ0SMv/s3673JLMv3bIkoivGmjPqXlEgisUksSXibweQccUwEx4qQ==", + "version": "10.1.10", + "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.10.tgz", + "integrity": "sha512-roDaKeY1PYY0aCqhRmXihrHjoSW2A00pV3Ke5fTpMCkzcGF64R8e0lw3dK+eLEHwS4vB5RnW1wuQmvzoRul8Mw==", "requires": { "@inquirer/figures": "^1.0.11", - "@inquirer/type": "^3.0.5", + "@inquirer/type": "^3.0.6", "ansi-escapes": "^4.3.2", "cli-width": "^4.1.0", "mute-stream": "^2.0.0", @@ -7563,15 +7859,113 @@ } } }, + "@inquirer/editor": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.10.tgz", + "integrity": "sha512-5GVWJ+qeI6BzR6TIInLP9SXhWCEcvgFQYmcRG6d6RIlhFjM5TyG18paTGBgRYyEouvCmzeco47x9zX9tQEofkw==", + "requires": { + "@inquirer/core": "^10.1.10", + "@inquirer/type": "^3.0.6", + "external-editor": "^3.1.0" + } + }, + "@inquirer/expand": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.12.tgz", + "integrity": "sha512-jV8QoZE1fC0vPe6TnsOfig+qwu7Iza1pkXoUJ3SroRagrt2hxiL+RbM432YAihNR7m7XnU0HWl/WQ35RIGmXHw==", + "requires": { + "@inquirer/core": "^10.1.10", + "@inquirer/type": "^3.0.6", + "yoctocolors-cjs": "^2.1.2" + } + }, "@inquirer/figures": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.11.tgz", "integrity": "sha512-eOg92lvrn/aRUqbxRyvpEWnrvRuTYRifixHkYVpJiygTgVSBIHDqLh0SrMQXkafvULg3ck11V7xvR+zcgvpHFw==" }, + "@inquirer/input": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.1.9.tgz", + "integrity": "sha512-mshNG24Ij5KqsQtOZMgj5TwEjIf+F2HOESk6bjMwGWgcH5UBe8UoljwzNFHqdMbGYbgAf6v2wU/X9CAdKJzgOA==", + "requires": { + "@inquirer/core": "^10.1.10", + "@inquirer/type": "^3.0.6" + } + }, + "@inquirer/number": { + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.12.tgz", + "integrity": "sha512-7HRFHxbPCA4e4jMxTQglHJwP+v/kpFsCf2szzfBHy98Wlc3L08HL76UDiA87TOdX5fwj2HMOLWqRWv9Pnn+Z5Q==", + "requires": { + "@inquirer/core": "^10.1.10", + "@inquirer/type": "^3.0.6" + } + }, + "@inquirer/password": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.12.tgz", + "integrity": "sha512-FlOB0zvuELPEbnBYiPaOdJIaDzb2PmJ7ghi/SVwIHDDSQ2K4opGBkF+5kXOg6ucrtSUQdLhVVY5tycH0j0l+0g==", + "requires": { + "@inquirer/core": "^10.1.10", + "@inquirer/type": "^3.0.6", + "ansi-escapes": "^4.3.2" + } + }, + "@inquirer/prompts": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.4.1.tgz", + "integrity": "sha512-UlmM5FVOZF0gpoe1PT/jN4vk8JmpIWBlMvTL8M+hlvPmzN89K6z03+IFmyeu/oFCenwdwHDr2gky7nIGSEVvlA==", + "requires": { + "@inquirer/checkbox": "^4.1.5", + "@inquirer/confirm": "^5.1.9", + "@inquirer/editor": "^4.2.10", + "@inquirer/expand": "^4.0.12", + "@inquirer/input": "^4.1.9", + "@inquirer/number": "^3.0.12", + "@inquirer/password": "^4.0.12", + "@inquirer/rawlist": "^4.0.12", + "@inquirer/search": "^3.0.12", + "@inquirer/select": "^4.1.1" + } + }, + "@inquirer/rawlist": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.0.12.tgz", + "integrity": "sha512-wNPJZy8Oc7RyGISPxp9/MpTOqX8lr0r+lCCWm7hQra+MDtYRgINv1hxw7R+vKP71Bu/3LszabxOodfV/uTfsaA==", + "requires": { + "@inquirer/core": "^10.1.10", + "@inquirer/type": "^3.0.6", + "yoctocolors-cjs": "^2.1.2" + } + }, + "@inquirer/search": { + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.12.tgz", + "integrity": "sha512-H/kDJA3kNlnNIjB8YsaXoQI0Qccgf0Na14K1h8ExWhNmUg2E941dyFPrZeugihEa9AZNW5NdsD/NcvUME83OPQ==", + "requires": { + "@inquirer/core": "^10.1.10", + "@inquirer/figures": "^1.0.11", + "@inquirer/type": "^3.0.6", + "yoctocolors-cjs": "^2.1.2" + } + }, + "@inquirer/select": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.1.1.tgz", + "integrity": "sha512-IUXzzTKVdiVNMA+2yUvPxWsSgOG4kfX93jOM4Zb5FgujeInotv5SPIJVeXQ+fO4xu7tW8VowFhdG5JRmmCyQ1Q==", + "requires": { + "@inquirer/core": "^10.1.10", + "@inquirer/figures": "^1.0.11", + "@inquirer/type": "^3.0.6", + "ansi-escapes": "^4.3.2", + "yoctocolors-cjs": "^2.1.2" + } + }, "@inquirer/type": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.5.tgz", - "integrity": "sha512-ZJpeIYYueOz/i/ONzrfof8g89kNdO2hjGuvULROo3O8rlB2CRtSseE5KeirnyE4t/thAn/EwvS/vuQeJCn+NZg==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.6.tgz", + "integrity": "sha512-/mKVCtVpyBu3IDarv0G+59KC4stsD5mDsGpYh+GKs1NZT88Jh52+cuoA1AtLk2Q0r/quNl+1cSUyLRHBFeD0XA==", "requires": {} }, "@isaacs/cliui": { @@ -8832,6 +9226,11 @@ "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", "peer": true }, + "chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" + }, "ci-info": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", @@ -9245,6 +9644,16 @@ "jest-util": "^29.7.0" } }, + "external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "requires": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + } + }, "fast-content-type-parse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-2.0.1.tgz", @@ -9603,6 +10012,14 @@ "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", "peer": true }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, "ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", @@ -10689,6 +11106,11 @@ "resolved": "https://registry.npmjs.org/natural-orderby/-/natural-orderby-3.0.2.tgz", "integrity": "sha512-x7ZdOwBxZCEm9MM7+eQCjkrNLrW3rkBKNHVr78zbtqnMGVNlnDi6C/eUEYgxHNrcbu0ymvjzcwIL/6H1iHri9g==" }, + "node-cleanup": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/node-cleanup/-/node-cleanup-2.1.2.tgz", + "integrity": "sha512-qN8v/s2PAJwGUtr1/hYTpNKlD6Y9rc4p8KSmJXyGdYGZsDGKXrGThikLFP9OCHFeLeEpQzPwiAtdIvBLqm//Hw==" + }, "node-gzip": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/node-gzip/-/node-gzip-1.1.2.tgz", @@ -10767,6 +11189,11 @@ "word-wrap": "^1.2.5" } }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==" + }, "outvariant": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz", @@ -11138,6 +11565,11 @@ "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz", "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==" }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, "semver": { "version": "7.6.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", @@ -11414,6 +11846,14 @@ } } }, + "tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "requires": { + "os-tmpdir": "~1.0.2" + } + }, "tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", @@ -11439,14 +11879,6 @@ "url-parse": "^1.5.3" } }, - "transliteration": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/transliteration/-/transliteration-2.3.5.tgz", - "integrity": "sha512-HAGI4Lq4Q9dZ3Utu2phaWgtm3vB6PkLUFqWAScg/UW+1eZ/Tg6Exo4oC0/3VUol/w4BlefLhUUSVBr/9/ZGQOw==", - "requires": { - "yargs": "^17.5.1" - } - }, "ts-api-utils": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz", diff --git a/package.json b/package.json index d3aec1ea83..6533852a23 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "playlist:validate": "tsx scripts/commands/playlist/validate.ts", "playlist:lint": "npx m3u-linter -c m3u-linter.json", "playlist:test": "tsx scripts/commands/playlist/test.ts", + "playlist:edit": "tsx scripts/commands/playlist/edit.ts", "playlist:deploy": "npx gh-pages-clean && npx gh-pages -m \"Deploy to GitHub Pages\" -d .gh-pages -r https://$GITHUB_TOKEN@github.com/iptv-org/iptv.git", "readme:update": "tsx scripts/commands/readme/update.ts", "report:create": "tsx scripts/commands/report/create.ts", @@ -40,6 +41,8 @@ "@eslint/eslintrc": "^3.3.0", "@eslint/js": "^9.21.0", "@freearhey/core": "^0.7.0", + "@freearhey/search-js": "^0.1.2", + "@inquirer/prompts": "^7.4.1", "@octokit/core": "^6.1.4", "@octokit/plugin-paginate-rest": "^11.4.3", "@octokit/plugin-rest-endpoint-methods": "^7.1.3", @@ -65,8 +68,8 @@ "lodash": "^4.17.21", "m3u-linter": "^0.4.2", "markdown-include": "^0.4.3", + "node-cleanup": "^2.1.2", "numeral": "^2.0.6", - "transliteration": "^2.3.5", "ts-jest": "^29.2.5", "tsx": "^4.6.2", "valid-url": "^1.0.9" diff --git a/yarn.lock b/yarn.lock index 82088c20d6..94e14d2f5d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -385,6 +385,13 @@ run-script-os "^1.1.6" signale "^1.4.0" +"@freearhey/search-js@^0.1.2": + version "0.1.2" + resolved "https://registry.npmjs.org/@freearhey/search-js/-/search-js-0.1.2.tgz" + integrity sha512-F2o+xpGCXOK4OsZfKEHfXNNkAZmny2eBnPOp+P0iyV20ja7gJGfTFaEc6okcuEo6OB6P7LnSxTvISkoArFtlfg== + dependencies: + lodash "^4.17.21" + "@humanfs/core@^0.19.1": version "0.19.1" resolved "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz" @@ -413,21 +420,32 @@ resolved "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz" integrity sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ== -"@inquirer/confirm@^5.0.0": - version "5.1.7" - resolved "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.7.tgz" - integrity sha512-Xrfbrw9eSiHb+GsesO8TQIeHSMTP0xyvTCeeYevgZ4sKW+iz9w/47bgfG9b0niQm+xaLY2EWPBINUPldLwvYiw== +"@inquirer/checkbox@^4.1.5": + version "4.1.5" + resolved "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.1.5.tgz" + integrity sha512-swPczVU+at65xa5uPfNP9u3qx/alNwiaykiI/ExpsmMSQW55trmZcwhYWzw/7fj+n6Q8z1eENvR7vFfq9oPSAQ== dependencies: - "@inquirer/core" "^10.1.8" - "@inquirer/type" "^3.0.5" + "@inquirer/core" "^10.1.10" + "@inquirer/figures" "^1.0.11" + "@inquirer/type" "^3.0.6" + ansi-escapes "^4.3.2" + yoctocolors-cjs "^2.1.2" -"@inquirer/core@^10.1.8": - version "10.1.8" - resolved "https://registry.npmjs.org/@inquirer/core/-/core-10.1.8.tgz" - integrity sha512-HpAqR8y715zPpM9e/9Q+N88bnGwqqL8ePgZ0SMv/s3673JLMv3bIkoivGmjPqXlEgisUksSXibweQccUwEx4qQ== +"@inquirer/confirm@^5.0.0", "@inquirer/confirm@^5.1.9": + version "5.1.9" + resolved "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.9.tgz" + integrity sha512-NgQCnHqFTjF7Ys2fsqK2WtnA8X1kHyInyG+nMIuHowVTIgIuS10T4AznI/PvbqSpJqjCUqNBlKGh1v3bwLFL4w== + dependencies: + "@inquirer/core" "^10.1.10" + "@inquirer/type" "^3.0.6" + +"@inquirer/core@^10.1.10": + version "10.1.10" + resolved "https://registry.npmjs.org/@inquirer/core/-/core-10.1.10.tgz" + integrity sha512-roDaKeY1PYY0aCqhRmXihrHjoSW2A00pV3Ke5fTpMCkzcGF64R8e0lw3dK+eLEHwS4vB5RnW1wuQmvzoRul8Mw== dependencies: "@inquirer/figures" "^1.0.11" - "@inquirer/type" "^3.0.5" + "@inquirer/type" "^3.0.6" ansi-escapes "^4.3.2" cli-width "^4.1.0" mute-stream "^2.0.0" @@ -435,15 +453,104 @@ wrap-ansi "^6.2.0" yoctocolors-cjs "^2.1.2" +"@inquirer/editor@^4.2.10": + version "4.2.10" + resolved "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.10.tgz" + integrity sha512-5GVWJ+qeI6BzR6TIInLP9SXhWCEcvgFQYmcRG6d6RIlhFjM5TyG18paTGBgRYyEouvCmzeco47x9zX9tQEofkw== + dependencies: + "@inquirer/core" "^10.1.10" + "@inquirer/type" "^3.0.6" + external-editor "^3.1.0" + +"@inquirer/expand@^4.0.12": + version "4.0.12" + resolved "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.12.tgz" + integrity sha512-jV8QoZE1fC0vPe6TnsOfig+qwu7Iza1pkXoUJ3SroRagrt2hxiL+RbM432YAihNR7m7XnU0HWl/WQ35RIGmXHw== + dependencies: + "@inquirer/core" "^10.1.10" + "@inquirer/type" "^3.0.6" + yoctocolors-cjs "^2.1.2" + "@inquirer/figures@^1.0.11": version "1.0.11" resolved "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.11.tgz" integrity sha512-eOg92lvrn/aRUqbxRyvpEWnrvRuTYRifixHkYVpJiygTgVSBIHDqLh0SrMQXkafvULg3ck11V7xvR+zcgvpHFw== -"@inquirer/type@^3.0.5": - version "3.0.5" - resolved "https://registry.npmjs.org/@inquirer/type/-/type-3.0.5.tgz" - integrity sha512-ZJpeIYYueOz/i/ONzrfof8g89kNdO2hjGuvULROo3O8rlB2CRtSseE5KeirnyE4t/thAn/EwvS/vuQeJCn+NZg== +"@inquirer/input@^4.1.9": + version "4.1.9" + resolved "https://registry.npmjs.org/@inquirer/input/-/input-4.1.9.tgz" + integrity sha512-mshNG24Ij5KqsQtOZMgj5TwEjIf+F2HOESk6bjMwGWgcH5UBe8UoljwzNFHqdMbGYbgAf6v2wU/X9CAdKJzgOA== + dependencies: + "@inquirer/core" "^10.1.10" + "@inquirer/type" "^3.0.6" + +"@inquirer/number@^3.0.12": + version "3.0.12" + resolved "https://registry.npmjs.org/@inquirer/number/-/number-3.0.12.tgz" + integrity sha512-7HRFHxbPCA4e4jMxTQglHJwP+v/kpFsCf2szzfBHy98Wlc3L08HL76UDiA87TOdX5fwj2HMOLWqRWv9Pnn+Z5Q== + dependencies: + "@inquirer/core" "^10.1.10" + "@inquirer/type" "^3.0.6" + +"@inquirer/password@^4.0.12": + version "4.0.12" + resolved "https://registry.npmjs.org/@inquirer/password/-/password-4.0.12.tgz" + integrity sha512-FlOB0zvuELPEbnBYiPaOdJIaDzb2PmJ7ghi/SVwIHDDSQ2K4opGBkF+5kXOg6ucrtSUQdLhVVY5tycH0j0l+0g== + dependencies: + "@inquirer/core" "^10.1.10" + "@inquirer/type" "^3.0.6" + ansi-escapes "^4.3.2" + +"@inquirer/prompts@^7.4.1": + version "7.4.1" + resolved "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.4.1.tgz" + integrity sha512-UlmM5FVOZF0gpoe1PT/jN4vk8JmpIWBlMvTL8M+hlvPmzN89K6z03+IFmyeu/oFCenwdwHDr2gky7nIGSEVvlA== + dependencies: + "@inquirer/checkbox" "^4.1.5" + "@inquirer/confirm" "^5.1.9" + "@inquirer/editor" "^4.2.10" + "@inquirer/expand" "^4.0.12" + "@inquirer/input" "^4.1.9" + "@inquirer/number" "^3.0.12" + "@inquirer/password" "^4.0.12" + "@inquirer/rawlist" "^4.0.12" + "@inquirer/search" "^3.0.12" + "@inquirer/select" "^4.1.1" + +"@inquirer/rawlist@^4.0.12": + version "4.0.12" + resolved "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.0.12.tgz" + integrity sha512-wNPJZy8Oc7RyGISPxp9/MpTOqX8lr0r+lCCWm7hQra+MDtYRgINv1hxw7R+vKP71Bu/3LszabxOodfV/uTfsaA== + dependencies: + "@inquirer/core" "^10.1.10" + "@inquirer/type" "^3.0.6" + yoctocolors-cjs "^2.1.2" + +"@inquirer/search@^3.0.12": + version "3.0.12" + resolved "https://registry.npmjs.org/@inquirer/search/-/search-3.0.12.tgz" + integrity sha512-H/kDJA3kNlnNIjB8YsaXoQI0Qccgf0Na14K1h8ExWhNmUg2E941dyFPrZeugihEa9AZNW5NdsD/NcvUME83OPQ== + dependencies: + "@inquirer/core" "^10.1.10" + "@inquirer/figures" "^1.0.11" + "@inquirer/type" "^3.0.6" + yoctocolors-cjs "^2.1.2" + +"@inquirer/select@^4.1.1": + version "4.1.1" + resolved "https://registry.npmjs.org/@inquirer/select/-/select-4.1.1.tgz" + integrity sha512-IUXzzTKVdiVNMA+2yUvPxWsSgOG4kfX93jOM4Zb5FgujeInotv5SPIJVeXQ+fO4xu7tW8VowFhdG5JRmmCyQ1Q== + dependencies: + "@inquirer/core" "^10.1.10" + "@inquirer/figures" "^1.0.11" + "@inquirer/type" "^3.0.6" + ansi-escapes "^4.3.2" + yoctocolors-cjs "^2.1.2" + +"@inquirer/type@^3.0.6": + version "3.0.6" + resolved "https://registry.npmjs.org/@inquirer/type/-/type-3.0.6.tgz" + integrity sha512-/mKVCtVpyBu3IDarv0G+59KC4stsD5mDsGpYh+GKs1NZT88Jh52+cuoA1AtLk2Q0r/quNl+1cSUyLRHBFeD0XA== "@isaacs/cliui@^8.0.2": version "8.0.2" @@ -1401,6 +1508,11 @@ char-regex@^1.0.2: resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== +chardet@^0.7.0: + version "0.7.0" + resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz" + integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== + ci-info@^3.2.0: version "3.9.0" resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz" @@ -1802,6 +1914,15 @@ expect@^29.0.0, expect@^29.7.0: jest-message-util "^29.7.0" jest-util "^29.7.0" +external-editor@^3.1.0: + version "3.1.0" + resolved "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz" + integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== + dependencies: + chardet "^0.7.0" + iconv-lite "^0.4.24" + tmp "^0.0.33" + fast-content-type-parse@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-2.0.1.tgz" @@ -2120,6 +2241,13 @@ human-signals@^2.1.0: resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== +iconv-lite@^0.4.24: + version "0.4.24" + resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + ignore@^5.2.0, ignore@^5.3.1: version "5.3.2" resolved "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz" @@ -3068,6 +3196,11 @@ natural-orderby@^3.0.2: resolved "https://registry.npmjs.org/natural-orderby/-/natural-orderby-3.0.2.tgz" integrity sha512-x7ZdOwBxZCEm9MM7+eQCjkrNLrW3rkBKNHVr78zbtqnMGVNlnDi6C/eUEYgxHNrcbu0ymvjzcwIL/6H1iHri9g== +node-cleanup@^2.1.2: + version "2.1.2" + resolved "https://registry.npmjs.org/node-cleanup/-/node-cleanup-2.1.2.tgz" + integrity sha512-qN8v/s2PAJwGUtr1/hYTpNKlD6Y9rc4p8KSmJXyGdYGZsDGKXrGThikLFP9OCHFeLeEpQzPwiAtdIvBLqm//Hw== + node-gzip@^1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/node-gzip/-/node-gzip-1.1.2.tgz" @@ -3141,6 +3274,11 @@ optionator@^0.9.3: type-check "^0.4.0" word-wrap "^1.2.5" +os-tmpdir@~1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz" + integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== + outvariant@^1.4.0, outvariant@^1.4.3: version "1.4.3" resolved "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz" @@ -3441,6 +3579,11 @@ run-script-os@^1.1.6: resolved "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz" integrity sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw== +"safer-buffer@>= 2.1.2 < 3": + version "2.1.2" + resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + semver@^6.3.0: version "6.3.1" resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz" @@ -3680,6 +3823,13 @@ test-exclude@^6.0.0: glob "^7.1.4" minimatch "^3.0.4" +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz" + integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== + dependencies: + os-tmpdir "~1.0.2" + tmpl@1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz" @@ -3702,13 +3852,6 @@ tough-cookie@^4.1.4: universalify "^0.2.0" url-parse "^1.5.3" -transliteration@^2.3.5: - version "2.3.5" - resolved "https://registry.npmjs.org/transliteration/-/transliteration-2.3.5.tgz" - integrity sha512-HAGI4Lq4Q9dZ3Utu2phaWgtm3vB6PkLUFqWAScg/UW+1eZ/Tg6Exo4oC0/3VUol/w4BlefLhUUSVBr/9/ZGQOw== - dependencies: - yargs "^17.5.1" - ts-api-utils@^1.3.0: version "1.4.3" resolved "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz" @@ -3911,7 +4054,7 @@ yargs-parser@^21.1.1: resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@^17.3.1, yargs@^17.5.1, yargs@^17.7.2: +yargs@^17.3.1, yargs@^17.7.2: version "17.7.2" resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz" integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== From 8225e59a0ac653c35655413c40f00078a8d61f60 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 16 Apr 2025 20:19:19 +0300 Subject: [PATCH 09/40] Update tests/__data__ --- tests/__data__/input/data/guides.json | 1 + tests/__data__/input/data/streams.json | 1 + tests/__data__/input/playlist_edit/playlist.m3u | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 tests/__data__/input/data/guides.json create mode 100644 tests/__data__/input/data/streams.json create mode 100644 tests/__data__/input/playlist_edit/playlist.m3u diff --git a/tests/__data__/input/data/guides.json b/tests/__data__/input/data/guides.json new file mode 100644 index 0000000000..0637a088a0 --- /dev/null +++ b/tests/__data__/input/data/guides.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/__data__/input/data/streams.json b/tests/__data__/input/data/streams.json new file mode 100644 index 0000000000..0637a088a0 --- /dev/null +++ b/tests/__data__/input/data/streams.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/__data__/input/playlist_edit/playlist.m3u b/tests/__data__/input/playlist_edit/playlist.m3u new file mode 100644 index 0000000000..2ebf1ffa7a --- /dev/null +++ b/tests/__data__/input/playlist_edit/playlist.m3u @@ -0,0 +1,5 @@ +#EXTM3U +#EXTINF:-1 tvg-id="HewadTV.af",Hewad TV (720p) [Not 24/7] +http://51.210.199.58/hls/stream.m3u8 +#EXTINF:-1 tvg-id="",Télévision française 1 (480p) +https://live.relentlessinnovations.net:1936/imantv/imantv/playlist.m3u8 \ No newline at end of file From 2d44218887ddee930933faec87761af88a486b4c Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 16 Apr 2025 20:19:31 +0300 Subject: [PATCH 10/40] Update tests --- tests/commands/playlist/edit.test.ts | 43 ++++++++++++++++++++++++ tests/commands/playlist/generate.test.ts | 4 ++- tests/commands/playlist/validate.test.ts | 5 ++- 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 tests/commands/playlist/edit.test.ts diff --git a/tests/commands/playlist/edit.test.ts b/tests/commands/playlist/edit.test.ts new file mode 100644 index 0000000000..4651e5ef88 --- /dev/null +++ b/tests/commands/playlist/edit.test.ts @@ -0,0 +1,43 @@ +import { execSync } from 'child_process' +import fs from 'fs-extra' +import os from 'os' + +type ExecError = { + status: number + stdout: string +} + +let ENV_VAR = 'DATA_DIR=tests/__data__/input/data' +if (os.platform() === 'win32') { + ENV_VAR = 'SET "DATA_DIR=tests/__data__/input/data" &&' +} + +beforeEach(() => { + fs.emptyDirSync('tests/__data__/output') + fs.copySync( + 'tests/__data__/input/playlist_edit/playlist.m3u', + 'tests/__data__/output/playlist.m3u' + ) +}) + +describe('playlist:edit', () => { + it('shows list of options for a streams', () => { + const cmd = `${ENV_VAR} npm run playlist:edit --- tests/__data__/output/playlist.m3u` + try { + const stdout = execSync(cmd, { encoding: 'utf8' }) + if (process.env.DEBUG === 'true') console.log(cmd, stdout) + checkStdout(stdout) + } catch (error) { + // NOTE: for Windows only + if (process.env.DEBUG === 'true') console.log(cmd, error) + checkStdout((error as ExecError).stdout) + } + }) +}) + +function checkStdout(stdout: string) { + expect(stdout).toContain('TF1.fr (TF1, Télévision française 1)') + expect(stdout).toContain('Type...') + expect(stdout).toContain('Skip') + expect(stdout).toContain("File 'tests/__data__/output/playlist.m3u' successfully saved") +} diff --git a/tests/commands/playlist/generate.test.ts b/tests/commands/playlist/generate.test.ts index 54c4e61e0b..389ee022ee 100644 --- a/tests/commands/playlist/generate.test.ts +++ b/tests/commands/playlist/generate.test.ts @@ -7,11 +7,13 @@ beforeEach(() => { }) it('can generate playlists and logs', () => { - execSync( + const stdout = execSync( 'STREAMS_DIR=tests/__data__/input/playlist_generate DATA_DIR=tests/__data__/input/data PUBLIC_DIR=tests/__data__/output/.gh-pages LOGS_DIR=tests/__data__/output/logs npm run playlist:generate', { encoding: 'utf8' } ) + if (process.env.DEBUG === 'true') console.log(stdout) + const playlists = glob .sync('tests/__data__/expected/playlist_generate/.gh-pages/**/*.m3u') .map((file: string) => file.replace('tests/__data__/expected/playlist_generate/', '')) diff --git a/tests/commands/playlist/validate.test.ts b/tests/commands/playlist/validate.test.ts index 38dd104ee4..b2a43324e4 100644 --- a/tests/commands/playlist/validate.test.ts +++ b/tests/commands/playlist/validate.test.ts @@ -7,14 +7,16 @@ type ExecError = { it('show an error if channel id in the blocklist', () => { try { - execSync( + const stdout = execSync( 'DATA_DIR=tests/__data__/input/data STREAMS_DIR=tests/__data__/input/playlist_validate npm run playlist:validate -- us_blocked.m3u', { encoding: 'utf8' } ) + if (process.env.DEBUG === 'true') console.log(stdout) process.exit(1) } catch (error) { + if (process.env.DEBUG === 'true') console.log((error as ExecError).stdout) expect((error as ExecError).status).toBe(1) expect((error as ExecError).stdout).toContain(`us_blocked.m3u 2 error "FoxSports2.us" is on the blocklist due to claims of copyright holders (https://github.com/iptv-org/iptv/issues/0002) @@ -31,6 +33,7 @@ it('show a warning if channel has wrong id', () => { encoding: 'utf8' } ) + if (process.env.DEBUG === 'true') console.log(stdout) expect(stdout).toContain( 'wrong_id.m3u\n 2 warning "qib22lAq1L.us" is not in the database\n\n1 problems (0 errors, 1 warnings)\n' From 1cd6a31854c65bab40ebb8bdf4d76374bed3122f Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 16 Apr 2025 20:53:58 +0300 Subject: [PATCH 11/40] Update template.md --- .readme/template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.readme/template.md b/.readme/template.md index 5dd4d1cf87..84a8f70133 100644 --- a/.readme/template.md +++ b/.readme/template.md @@ -93,12 +93,12 @@ Same thing, but split up into separate files: ### Grouped by region +Playlists in which channels are grouped by the region for which they are broadcasted. +
Expand
-Playlists in which channels are grouped by the region for which they are broadcasted. - ``` https://iptv-org.github.io/iptv/index.region.m3u ``` From d39af32f189a112f1aead8bd21083c89550b7ac4 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 16 Apr 2025 20:54:01 +0300 Subject: [PATCH 12/40] Update CONTRIBUTING.md --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 556ed05c7b..022381c639 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -176,6 +176,7 @@ To run scripts use the `npm run ` command. - `playlist:validate`: сhecks ids and links in internal playlists for errors. - `playlist:lint`: сhecks internal playlists for syntax errors. - `playlist:test`: tests links in internal playlists. +- `playlist:edit`: utility for quick streams mapping. - `playlist:deploy`: allows to manually publish all generated via `playlist:generate` playlists. To run the script you must provide your [personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) with write access to the repository. - `readme:update`: updates the list of playlists in [README.md](README.md). - `report:create`: creates a report on current issues. From d42b102cdfb2db19fec869d393815066919fe65e Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 16 Apr 2025 20:54:55 +0300 Subject: [PATCH 13/40] Update scripts --- scripts/commands/api/generate.ts | 27 ++-- scripts/commands/api/load.ts | 35 ++--- scripts/commands/playlist/edit.ts | 208 ++++++++++++++++++++++++++ scripts/commands/playlist/format.ts | 29 ++-- scripts/commands/playlist/generate.ts | 100 +++---------- scripts/commands/playlist/test.ts | 22 ++- scripts/commands/playlist/update.ts | 98 +++++------- scripts/commands/playlist/validate.ts | 59 ++++---- scripts/commands/report/create.ts | 53 ++++--- scripts/core/apiClient.ts | 57 +------ scripts/core/dataLoader.ts | 100 +++++++++++++ scripts/core/dataProcessor.ts | 110 ++++++++++++++ scripts/core/index.ts | 18 ++- scripts/core/playlistParser.ts | 13 +- scripts/models/blocked.ts | 17 --- scripts/models/blocklistRecord.ts | 15 ++ scripts/models/category.ts | 12 +- scripts/models/channel.ts | 145 ++++++++++++++---- scripts/models/country.ts | 50 +++++-- scripts/models/feed.ts | 86 +++++++---- scripts/models/guide.ts | 54 +++++++ scripts/models/index.ts | 17 ++- scripts/models/language.ts | 23 ++- scripts/models/region.ts | 53 +++++-- scripts/models/stream.ts | 121 ++++++++------- scripts/models/subdivision.ts | 33 ++-- scripts/models/timezone.ts | 4 +- scripts/types/blocklistRecord.d.ts | 5 + scripts/types/category.d.ts | 9 ++ scripts/types/channel.d.ts | 52 +++++++ scripts/types/country.d.ts | 20 +++ scripts/types/dataLoader.d.ts | 19 +++ scripts/types/dataProcessor.d.ts | 27 ++++ scripts/types/feed.d.ts | 12 ++ scripts/types/guide.d.ts | 17 +++ scripts/types/language.d.ts | 9 ++ scripts/types/region.d.ts | 13 ++ scripts/types/stream.d.ts | 10 ++ scripts/types/subdivision.d.ts | 12 ++ 39 files changed, 1256 insertions(+), 508 deletions(-) create mode 100644 scripts/commands/playlist/edit.ts create mode 100644 scripts/core/dataLoader.ts create mode 100644 scripts/core/dataProcessor.ts delete mode 100644 scripts/models/blocked.ts create mode 100644 scripts/models/blocklistRecord.ts create mode 100644 scripts/models/guide.ts create mode 100644 scripts/types/blocklistRecord.d.ts create mode 100644 scripts/types/category.d.ts create mode 100644 scripts/types/channel.d.ts create mode 100644 scripts/types/country.d.ts create mode 100644 scripts/types/dataLoader.d.ts create mode 100644 scripts/types/dataProcessor.d.ts create mode 100644 scripts/types/feed.d.ts create mode 100644 scripts/types/guide.d.ts create mode 100644 scripts/types/language.d.ts create mode 100644 scripts/types/region.d.ts create mode 100644 scripts/types/stream.d.ts create mode 100644 scripts/types/subdivision.d.ts diff --git a/scripts/commands/api/generate.ts b/scripts/commands/api/generate.ts index 670fa091d8..f264260f9b 100644 --- a/scripts/commands/api/generate.ts +++ b/scripts/commands/api/generate.ts @@ -1,30 +1,25 @@ -import { Logger, Storage, Collection } from '@freearhey/core' +import { DataLoader, DataProcessor, PlaylistParser } from '../../core' +import type { DataProcessorData } from '../../types/dataProcessor' import { API_DIR, STREAMS_DIR, DATA_DIR } from '../../constants' -import { PlaylistParser } from '../../core' -import { Stream, Channel, Feed } from '../../models' -import { uniqueId } from 'lodash' +import type { DataLoaderData } from '../../types/dataLoader' +import { Logger, Storage } from '@freearhey/core' +import { Stream } from '../../models' async function main() { const logger = new Logger() - logger.info('loading api data...') + logger.info('loading data from api...') + const processor = new DataProcessor() const dataStorage = new Storage(DATA_DIR) - const channelsData = await dataStorage.json('channels.json') - const channels = new Collection(channelsData).map(data => new Channel(data)) - const channelsGroupedById = channels.keyBy((channel: Channel) => channel.id) - const feedsData = await dataStorage.json('feeds.json') - const feeds = new Collection(feedsData).map(data => - new Feed(data).withChannel(channelsGroupedById) - ) - const feedsGroupedByChannelId = feeds.groupBy((feed: Feed) => - feed.channel ? feed.channel.id : uniqueId() - ) + const dataLoader = new DataLoader({ storage: dataStorage }) + const data: DataLoaderData = await dataLoader.load() + const { channelsKeyById, feedsGroupedByChannelId }: DataProcessorData = processor.process(data) logger.info('loading streams...') const streamsStorage = new Storage(STREAMS_DIR) const parser = new PlaylistParser({ storage: streamsStorage, - channelsGroupedById, + channelsKeyById, feedsGroupedByChannelId }) const files = await streamsStorage.list('**/*.m3u') diff --git a/scripts/commands/api/load.ts b/scripts/commands/api/load.ts index fbb1fea437..3fdc70043c 100644 --- a/scripts/commands/api/load.ts +++ b/scripts/commands/api/load.ts @@ -1,23 +1,24 @@ -import { Logger } from '@freearhey/core' -import { ApiClient } from '../../core' +import { DATA_DIR } from '../../constants' +import { Storage } from '@freearhey/core' +import { DataLoader } from '../../core' async function main() { - const logger = new Logger() - const client = new ApiClient({ logger }) + const storage = new Storage(DATA_DIR) + const loader = new DataLoader({ storage }) - const requests = [ - client.download('blocklist.json'), - client.download('categories.json'), - client.download('channels.json'), - client.download('countries.json'), - client.download('languages.json'), - client.download('regions.json'), - client.download('subdivisions.json'), - client.download('feeds.json'), - client.download('timezones.json') - ] - - await Promise.all(requests) + await Promise.all([ + loader.download('blocklist.json'), + loader.download('categories.json'), + loader.download('channels.json'), + loader.download('countries.json'), + loader.download('languages.json'), + loader.download('regions.json'), + loader.download('subdivisions.json'), + loader.download('feeds.json'), + loader.download('timezones.json'), + loader.download('guides.json'), + loader.download('streams.json') + ]) } main() diff --git a/scripts/commands/playlist/edit.ts b/scripts/commands/playlist/edit.ts new file mode 100644 index 0000000000..c57a62d1e1 --- /dev/null +++ b/scripts/commands/playlist/edit.ts @@ -0,0 +1,208 @@ +import { Storage, Collection, Logger, Dictionary } from '@freearhey/core' +import { DataLoader, DataProcessor, PlaylistParser } from '../../core' +import { Channel, Feed, Playlist, Stream } from '../../models' +import type { ChannelSearchableData } from '../../types/channel' +import { DataProcessorData } from '../../types/dataProcessor' +import { DataLoaderData } from '../../types/dataLoader' +import { select, input } from '@inquirer/prompts' +import { DATA_DIR } from '../../constants' +import nodeCleanup from 'node-cleanup' +import sjs from '@freearhey/search-js' +import { Command } from 'commander' +import readline from 'readline' + +type ChoiceValue = { type: string; value?: Feed | Channel } +type Choice = { name: string; short?: string; value: ChoiceValue; default?: boolean } + +if (process.platform === 'win32') { + readline + .createInterface({ + input: process.stdin, + output: process.stdout + }) + .on('SIGINT', function () { + process.emit('SIGINT') + }) +} + +const program = new Command() + +program.argument('', 'Path to *.channels.xml file to edit').parse(process.argv) + +const filepath = program.args[0] +const logger = new Logger() +const storage = new Storage() +let parsedStreams = new Collection() + +main(filepath) +nodeCleanup(() => { + save(filepath) +}) + +export default async function main(filepath: string) { + if (!(await storage.exists(filepath))) { + throw new Error(`File "${filepath}" does not exists`) + } + + logger.info('loading data from api...') + const processor = new DataProcessor() + const dataStorage = new Storage(DATA_DIR) + const loader = new DataLoader({ storage: dataStorage }) + const data: DataLoaderData = await loader.load() + const { channels, channelsKeyById, feedsGroupedByChannelId }: DataProcessorData = + processor.process(data) + + logger.info('loading streams...') + const parser = new PlaylistParser({ storage, feedsGroupedByChannelId, channelsKeyById }) + parsedStreams = await parser.parseFile(filepath) + const streamsWithoutId = parsedStreams.filter((stream: Stream) => !stream.id) + + logger.info( + `found ${parsedStreams.count()} streams (including ${streamsWithoutId.count()} without ID)` + ) + + logger.info('creating search index...') + const items = channels.map((channel: Channel) => channel.getSearchable()).all() + const searchIndex = sjs.createIndex(items, { + searchable: ['name', 'altNames', 'guideNames', 'streamNames', 'feedFullNames'] + }) + + logger.info('starting...\n') + + for (const stream of streamsWithoutId.all()) { + try { + stream.id = await selectChannel(stream, searchIndex, feedsGroupedByChannelId, channelsKeyById) + } catch (err) { + logger.info(err.message) + break + } + } + + streamsWithoutId.forEach((stream: Stream) => { + if (stream.id === '-') { + stream.id = '' + } + }) +} + +async function selectChannel( + stream: Stream, + searchIndex, + feedsGroupedByChannelId: Dictionary, + channelsKeyById: Dictionary +): Promise { + const query = escapeRegex(stream.getName()) + const similarChannels = searchIndex + .search(query) + .map((item: ChannelSearchableData) => channelsKeyById.get(item.id)) + + const url = stream.url.length > 50 ? stream.url.slice(0, 50) + '...' : stream.url + + const selected: ChoiceValue = await select({ + message: `Select channel ID for "${stream.name}" (${url}):`, + choices: getChannelChoises(new Collection(similarChannels)), + pageSize: 10 + }) + + switch (selected.type) { + case 'skip': + return '-' + case 'type': { + const typedChannelId = await input({ message: ' Channel ID:' }) + if (!typedChannelId) return '' + const selectedFeedId = await selectFeed(typedChannelId, feedsGroupedByChannelId) + if (selectedFeedId === '-') return typedChannelId + return [typedChannelId, selectedFeedId].join('@') + } + case 'channel': { + const selectedChannel = selected.value + if (!selectedChannel) return '' + const selectedFeedId = await selectFeed(selectedChannel.id, feedsGroupedByChannelId) + if (selectedFeedId === '-') return selectedChannel.id + return [selectedChannel.id, selectedFeedId].join('@') + } + } + + return '' +} + +async function selectFeed(channelId: string, feedsGroupedByChannelId: Dictionary): Promise { + const channelFeeds = new Collection(feedsGroupedByChannelId.get(channelId)) || new Collection() + const choices = getFeedChoises(channelFeeds) + + const selected: ChoiceValue = await select({ + message: `Select feed ID for "${channelId}":`, + choices, + pageSize: 10 + }) + + switch (selected.type) { + case 'skip': + return '-' + case 'type': + return await input({ message: ' Feed ID:', default: 'SD' }) + case 'feed': + const selectedFeed = selected.value + if (!selectedFeed) return '' + return selectedFeed.id + } + + return '' +} + +function getChannelChoises(channels: Collection): Choice[] { + const choises: Choice[] = [] + + channels.forEach((channel: Channel) => { + const names = new Collection([channel.name, ...channel.altNames.all()]).uniq().join(', ') + + choises.push({ + value: { + type: 'channel', + value: channel + }, + name: `${channel.id} (${names})`, + short: `${channel.id}` + }) + }) + + choises.push({ name: 'Type...', value: { type: 'type' } }) + choises.push({ name: 'Skip', value: { type: 'skip' } }) + + return choises +} + +function getFeedChoises(feeds: Collection): Choice[] { + const choises: Choice[] = [] + + feeds.forEach((feed: Feed) => { + let name = `${feed.id} (${feed.name})` + if (feed.isMain) name += ' [main]' + + choises.push({ + value: { + type: 'feed', + value: feed + }, + default: feed.isMain, + name, + short: feed.id + }) + }) + + choises.push({ name: 'Type...', value: { type: 'type' } }) + choises.push({ name: 'Skip', value: { type: 'skip' } }) + + return choises +} + +function save(filepath: string) { + if (!storage.existsSync(filepath)) return + const playlist = new Playlist(parsedStreams) + storage.saveSync(filepath, playlist.toString()) + logger.info(`\nFile '${filepath}' successfully saved`) +} + +function escapeRegex(string: string) { + return string.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&') +} diff --git a/scripts/commands/playlist/format.ts b/scripts/commands/playlist/format.ts index 6ac14cb625..43868b73e3 100644 --- a/scripts/commands/playlist/format.ts +++ b/scripts/commands/playlist/format.ts @@ -1,33 +1,28 @@ -import { Logger, Storage, Collection } from '@freearhey/core' +import { Logger, Storage } from '@freearhey/core' import { STREAMS_DIR, DATA_DIR } from '../../constants' -import { PlaylistParser } from '../../core' -import { Stream, Playlist, Channel, Feed } from '../../models' +import { DataLoader, DataProcessor, PlaylistParser } from '../../core' +import { Stream, Playlist } from '../../models' import { program } from 'commander' -import { uniqueId } from 'lodash' +import { DataLoaderData } from '../../types/dataLoader' +import { DataProcessorData } from '../../types/dataProcessor' program.argument('[filepath]', 'Path to file to validate').parse(process.argv) async function main() { - const streamsStorage = new Storage(STREAMS_DIR) const logger = new Logger() logger.info('loading data from api...') + const processor = new DataProcessor() const dataStorage = new Storage(DATA_DIR) - const channelsData = await dataStorage.json('channels.json') - const channels = new Collection(channelsData).map(data => new Channel(data)) - const channelsGroupedById = channels.keyBy((channel: Channel) => channel.id) - const feedsData = await dataStorage.json('feeds.json') - const feeds = new Collection(feedsData).map(data => - new Feed(data).withChannel(channelsGroupedById) - ) - const feedsGroupedByChannelId = feeds.groupBy(feed => - feed.channel ? feed.channel.id : uniqueId() - ) + const loader = new DataLoader({ storage: dataStorage }) + const data: DataLoaderData = await loader.load() + const { channelsKeyById, feedsGroupedByChannelId }: DataProcessorData = processor.process(data) logger.info('loading streams...') + const streamsStorage = new Storage(STREAMS_DIR) const parser = new PlaylistParser({ storage: streamsStorage, - channelsGroupedById, + channelsKeyById, feedsGroupedByChannelId }) const files = program.args.length ? program.args : await streamsStorage.list('**/*.m3u') @@ -46,7 +41,7 @@ async function main() { logger.info('removing wrong id...') streams = streams.map((stream: Stream) => { - if (!stream.channel || channelsGroupedById.missing(stream.channel.id)) { + if (!stream.channel || channelsKeyById.missing(stream.channel.id)) { stream.id = '' } diff --git a/scripts/commands/playlist/generate.ts b/scripts/commands/playlist/generate.ts index 7acbbba4b1..c323d5395c 100644 --- a/scripts/commands/playlist/generate.ts +++ b/scripts/commands/playlist/generate.ts @@ -1,16 +1,6 @@ -import { Logger, Storage, Collection } from '@freearhey/core' -import { PlaylistParser } from '../../core' -import { - Stream, - Category, - Channel, - Language, - Country, - Region, - Subdivision, - Feed, - Timezone -} from '../../models' +import { Logger, Storage } from '@freearhey/core' +import { PlaylistParser, DataProcessor, DataLoader } from '../../core' +import { Stream } from '../../models' import { uniqueId } from 'lodash' import { CategoriesGenerator, @@ -24,86 +14,36 @@ import { IndexRegionGenerator } from '../../generators' import { DATA_DIR, LOGS_DIR, STREAMS_DIR } from '../../constants' +import type { DataProcessorData } from '../../types/dataProcessor' +import type { DataLoaderData } from '../../types/dataLoader' async function main() { const logger = new Logger() - const dataStorage = new Storage(DATA_DIR) const generatorsLogger = new Logger({ stream: await new Storage(LOGS_DIR).createStream(`generators.log`) }) logger.info('loading data from api...') - const categoriesData = await dataStorage.json('categories.json') - const countriesData = await dataStorage.json('countries.json') - const languagesData = await dataStorage.json('languages.json') - const regionsData = await dataStorage.json('regions.json') - const subdivisionsData = await dataStorage.json('subdivisions.json') - const timezonesData = await dataStorage.json('timezones.json') - const channelsData = await dataStorage.json('channels.json') - const feedsData = await dataStorage.json('feeds.json') - - logger.info('preparing data...') - const subdivisions = new Collection(subdivisionsData).map(data => new Subdivision(data)) - const subdivisionsGroupedByCode = subdivisions.keyBy( - (subdivision: Subdivision) => subdivision.code - ) - const subdivisionsGroupedByCountryCode = subdivisions.groupBy( - (subdivision: Subdivision) => subdivision.countryCode - ) - let regions = new Collection(regionsData).map(data => - new Region(data).withSubdivisions(subdivisions) - ) - const regionsGroupedByCode = regions.keyBy((region: Region) => region.code) - const categories = new Collection(categoriesData).map(data => new Category(data)) - const categoriesGroupedById = categories.keyBy((category: Category) => category.id) - const languages = new Collection(languagesData).map(data => new Language(data)) - const languagesGroupedByCode = languages.keyBy((language: Language) => language.code) - const countries = new Collection(countriesData).map(data => - new Country(data) - .withRegions(regions) - .withLanguage(languagesGroupedByCode) - .withSubdivisions(subdivisionsGroupedByCountryCode) - ) - const countriesGroupedByCode = countries.keyBy((country: Country) => country.code) - regions = regions.map((region: Region) => region.withCountries(countriesGroupedByCode)) - - const timezones = new Collection(timezonesData).map(data => - new Timezone(data).withCountries(countriesGroupedByCode) - ) - const timezonesGroupedById = timezones.keyBy((timezone: Timezone) => timezone.id) - - const channels = new Collection(channelsData).map(data => - new Channel(data) - .withCategories(categoriesGroupedById) - .withCountry(countriesGroupedByCode) - .withSubdivision(subdivisionsGroupedByCode) - ) - const channelsGroupedById = channels.keyBy((channel: Channel) => channel.id) - const feeds = new Collection(feedsData).map(data => - new Feed(data) - .withChannel(channelsGroupedById) - .withLanguages(languagesGroupedByCode) - .withTimezones(timezonesGroupedById) - .withBroadcastCountries( - countriesGroupedByCode, - regionsGroupedByCode, - subdivisionsGroupedByCode - ) - .withBroadcastRegions(regions) - .withBroadcastSubdivisions(subdivisionsGroupedByCode) - ) - const feedsGroupedByChannelId = feeds.groupBy((feed: Feed) => - feed.channel ? feed.channel.id : uniqueId() - ) + const processor = new DataProcessor() + const dataStorage = new Storage(DATA_DIR) + const loader = new DataLoader({ storage: dataStorage }) + const data: DataLoaderData = await loader.load() + const { + categories, + countries, + regions, + channelsKeyById, + feedsGroupedByChannelId + }: DataProcessorData = processor.process(data) logger.info('loading streams...') - const storage = new Storage(STREAMS_DIR) + const streamsStorage = new Storage(STREAMS_DIR) const parser = new PlaylistParser({ - storage, - channelsGroupedById, + storage: streamsStorage, + channelsKeyById, feedsGroupedByChannelId }) - const files = await storage.list('**/*.m3u') + const files = await streamsStorage.list('**/*.m3u') let streams = await parser.parse(files) const totalStreams = streams.count() streams = streams.uniqBy((stream: Stream) => diff --git a/scripts/commands/playlist/test.ts b/scripts/commands/playlist/test.ts index f32f2e0c2c..cc6f1dc148 100644 --- a/scripts/commands/playlist/test.ts +++ b/scripts/commands/playlist/test.ts @@ -1,13 +1,15 @@ import { Logger, Storage, Collection } from '@freearhey/core' import { ROOT_DIR, STREAMS_DIR, DATA_DIR } from '../../constants' -import { PlaylistParser, StreamTester, CliTable } from '../../core' -import { Stream, Feed, Channel } from '../../models' +import { PlaylistParser, StreamTester, CliTable, DataProcessor, DataLoader } from '../../core' +import { Stream } from '../../models' import { program } from 'commander' import { eachLimit } from 'async-es' import commandExists from 'command-exists' import chalk from 'chalk' import os from 'node:os' import dns from 'node:dns' +import type { DataLoaderData } from '../../types/dataLoader' +import type { DataProcessorData } from '../../types/dataProcessor' const cpus = os.cpus() @@ -54,22 +56,18 @@ async function main() { return } - logger.info('loading channels from api...') + logger.info('loading data from api...') + const processor = new DataProcessor() const dataStorage = new Storage(DATA_DIR) - const channelsData = await dataStorage.json('channels.json') - const channels = new Collection(channelsData).map(data => new Channel(data)) - const channelsGroupedById = channels.keyBy((channel: Channel) => channel.id) - const feedsData = await dataStorage.json('feeds.json') - const feeds = new Collection(feedsData).map(data => - new Feed(data).withChannel(channelsGroupedById) - ) - const feedsGroupedByChannelId = feeds.groupBy(feed => feed.channel) + const loader = new DataLoader({ storage: dataStorage }) + const data: DataLoaderData = await loader.load() + const { channelsKeyById, feedsGroupedByChannelId }: DataProcessorData = processor.process(data) logger.info('loading streams...') const rootStorage = new Storage(ROOT_DIR) const parser = new PlaylistParser({ storage: rootStorage, - channelsGroupedById, + channelsKeyById, feedsGroupedByChannelId }) const files = program.args.length ? program.args : await rootStorage.list(`${STREAMS_DIR}/*.m3u`) diff --git a/scripts/commands/playlist/update.ts b/scripts/commands/playlist/update.ts index b2ac5b8143..55551b67d0 100644 --- a/scripts/commands/playlist/update.ts +++ b/scripts/commands/playlist/update.ts @@ -1,38 +1,33 @@ +import { DataLoader, DataProcessor, IssueLoader, PlaylistParser } from '../../core' import { Logger, Storage, Collection, Dictionary } from '@freearhey/core' +import type { DataProcessorData } from '../../types/dataProcessor' +import { Stream, Playlist, Channel, Issue } from '../../models' +import type { DataLoaderData } from '../../types/dataLoader' import { DATA_DIR, STREAMS_DIR } from '../../constants' -import { IssueLoader, PlaylistParser } from '../../core' -import { Stream, Playlist, Channel, Feed, Issue } from '../../models' import validUrl from 'valid-url' -import { uniqueId } from 'lodash' let processedIssues = new Collection() async function main() { const logger = new Logger({ disabled: true }) - const loader = new IssueLoader() + const issueLoader = new IssueLoader() logger.info('loading issues...') - const issues = await loader.load() + const issues = await issueLoader.load() - logger.info('loading channels from api...') + logger.info('loading data from api...') + const processor = new DataProcessor() const dataStorage = new Storage(DATA_DIR) - const channelsData = await dataStorage.json('channels.json') - const channels = new Collection(channelsData).map(data => new Channel(data)) - const channelsGroupedById = channels.keyBy((channel: Channel) => channel.id) - const feedsData = await dataStorage.json('feeds.json') - const feeds = new Collection(feedsData).map(data => - new Feed(data).withChannel(channelsGroupedById) - ) - const feedsGroupedByChannelId = feeds.groupBy((feed: Feed) => - feed.channel ? feed.channel.id : uniqueId() - ) + const dataLoader = new DataLoader({ storage: dataStorage }) + const data: DataLoaderData = await dataLoader.load() + const { channelsKeyById, feedsGroupedByChannelId }: DataProcessorData = processor.process(data) logger.info('loading streams...') const streamsStorage = new Storage(STREAMS_DIR) const parser = new PlaylistParser({ storage: streamsStorage, feedsGroupedByChannelId, - channelsGroupedById + channelsKeyById }) const files = await streamsStorage.list('**/*.m3u') const streams = await parser.parse(files) @@ -44,7 +39,7 @@ async function main() { await editStreams({ streams, issues, - channelsGroupedById, + channelsKeyById, feedsGroupedByChannelId }) @@ -52,7 +47,7 @@ async function main() { await addStreams({ streams, issues, - channelsGroupedById, + channelsKeyById, feedsGroupedByChannelId }) @@ -101,12 +96,12 @@ async function removeStreams({ streams, issues }: { streams: Collection; issues: async function editStreams({ streams, issues, - channelsGroupedById, + channelsKeyById, feedsGroupedByChannelId }: { streams: Collection issues: Collection - channelsGroupedById: Dictionary + channelsKeyById: Dictionary feedsGroupedByChannelId: Dictionary }) { const requests = issues.filter( @@ -129,7 +124,7 @@ async function editStreams({ stream .setChannelId(channelId) .setFeedId(feedId) - .withChannel(channelsGroupedById) + .withChannel(channelsKeyById) .withFeed(feedsGroupedByChannelId) .updateId() .updateName() @@ -143,8 +138,8 @@ async function editStreams({ if (data.has('label')) stream.setLabel(label) if (data.has('quality')) stream.setQuality(quality) - if (data.has('httpUserAgent')) stream.setHttpUserAgent(httpUserAgent) - if (data.has('httpReferrer')) stream.setHttpReferrer(httpReferrer) + if (data.has('httpUserAgent')) stream.setUserAgent(httpUserAgent) + if (data.has('httpReferrer')) stream.setReferrer(httpReferrer) processedIssues.add(issue.number) }) @@ -153,12 +148,12 @@ async function editStreams({ async function addStreams({ streams, issues, - channelsGroupedById, + channelsKeyById, feedsGroupedByChannelId }: { streams: Collection issues: Collection - channelsGroupedById: Dictionary + channelsKeyById: Dictionary feedsGroupedByChannelId: Dictionary }) { const requests = issues.filter( @@ -168,51 +163,32 @@ async function addStreams({ const data = issue.data if (data.missing('streamId') || data.missing('streamUrl')) return if (streams.includes((_stream: Stream) => _stream.url === data.getString('streamUrl'))) return - const stringUrl = data.getString('streamUrl') || '' - if (!isUri(stringUrl)) return + const streamUrl = data.getString('streamUrl') || '' + if (!isUri(streamUrl)) return const streamId = data.getString('streamId') || '' - const [channelId] = streamId.split('@') + const [channelId, feedId] = streamId.split('@') - const channel: Channel = channelsGroupedById.get(channelId) + const channel: Channel = channelsKeyById.get(channelId) if (!channel) return - const label = data.getString('label') || '' - const quality = data.getString('quality') || '' - const httpUserAgent = data.getString('httpUserAgent') || '' - const httpReferrer = data.getString('httpReferrer') || '' + const label = data.getString('label') || null + const quality = data.getString('quality') || null + const httpUserAgent = data.getString('httpUserAgent') || null + const httpReferrer = data.getString('httpReferrer') || null const stream = new Stream({ - tvg: { - id: streamId, - name: '', - url: '', - logo: '', - rec: '', - shift: '' - }, + channel: channelId, + feed: feedId, name: data.getString('channelName') || channel.name, - url: stringUrl, - group: { - title: '' - }, - http: { - 'user-agent': httpUserAgent, - referrer: httpReferrer - }, - line: -1, - raw: '', - timeshift: '', - catchup: { - type: '', - source: '', - days: '' - } + url: streamUrl, + user_agent: httpUserAgent, + referrer: httpReferrer, + quality, + label }) - .withChannel(channelsGroupedById) + .withChannel(channelsKeyById) .withFeed(feedsGroupedByChannelId) - .setLabel(label) - .setQuality(quality) .updateName() .updateFilepath() diff --git a/scripts/commands/playlist/validate.ts b/scripts/commands/playlist/validate.ts index 6296b5651f..57bca4f6fb 100644 --- a/scripts/commands/playlist/validate.ts +++ b/scripts/commands/playlist/validate.ts @@ -1,10 +1,11 @@ import { Logger, Storage, Collection, Dictionary } from '@freearhey/core' -import { PlaylistParser } from '../../core' -import { Channel, Stream, Blocked, Feed } from '../../models' +import { DataLoader, DataProcessor, PlaylistParser } from '../../core' +import { DataProcessorData } from '../../types/dataProcessor' +import { DATA_DIR, STREAMS_DIR } from '../../constants' +import { DataLoaderData } from '../../types/dataLoader' +import { BlocklistRecord, Stream } from '../../models' import { program } from 'commander' import chalk from 'chalk' -import { uniqueId } from 'lodash' -import { DATA_DIR, STREAMS_DIR } from '../../constants' program.argument('[filepath]', 'Path to file to validate').parse(process.argv) @@ -18,26 +19,21 @@ async function main() { const logger = new Logger() logger.info('loading data from api...') + const processor = new DataProcessor() const dataStorage = new Storage(DATA_DIR) - const channelsData = await dataStorage.json('channels.json') - const channels = new Collection(channelsData).map(data => new Channel(data)) - const channelsGroupedById = channels.keyBy((channel: Channel) => channel.id) - const feedsData = await dataStorage.json('feeds.json') - const feeds = new Collection(feedsData).map(data => - new Feed(data).withChannel(channelsGroupedById) - ) - const feedsGroupedByChannelId = feeds.groupBy((feed: Feed) => - feed.channel ? feed.channel.id : uniqueId() - ) - const blocklistContent = await dataStorage.json('blocklist.json') - const blocklist = new Collection(blocklistContent).map(data => new Blocked(data)) - const blocklistGroupedByChannelId = blocklist.keyBy((blocked: Blocked) => blocked.channelId) + const loader = new DataLoader({ storage: dataStorage }) + const data: DataLoaderData = await loader.load() + const { + channelsKeyById, + feedsGroupedByChannelId, + blocklistRecordsGroupedByChannelId + }: DataProcessorData = processor.process(data) logger.info('loading streams...') const streamsStorage = new Storage(STREAMS_DIR) const parser = new PlaylistParser({ storage: streamsStorage, - channelsGroupedById, + channelsKeyById, feedsGroupedByChannelId }) const files = program.args.length ? program.args : await streamsStorage.list('**/*.m3u') @@ -55,11 +51,11 @@ async function main() { const buffer = new Dictionary() streams.forEach((stream: Stream) => { if (stream.channelId) { - const channel = channelsGroupedById.get(stream.channelId) + const channel = channelsKeyById.get(stream.channelId) if (!channel) { log.add({ type: 'warning', - line: stream.line, + line: stream.getLine(), message: `"${stream.id}" is not in the database` }) } @@ -69,29 +65,32 @@ async function main() { if (duplicate) { log.add({ type: 'warning', - line: stream.line, + line: stream.getLine(), message: `"${stream.url}" is already on the playlist` }) } else { buffer.set(stream.url, true) } - const blocked = stream.channel ? blocklistGroupedByChannelId.get(stream.channel.id) : false - if (blocked) { - if (blocked.reason === 'dmca') { + const blocklistRecords = stream.channel + ? new Collection(blocklistRecordsGroupedByChannelId.get(stream.channel.id)) + : new Collection() + + blocklistRecords.forEach((blocklistRecord: BlocklistRecord) => { + if (blocklistRecord.reason === 'dmca') { log.add({ type: 'error', - line: stream.line, - message: `"${blocked.channelId}" is on the blocklist due to claims of copyright holders (${blocked.ref})` + line: stream.getLine(), + message: `"${blocklistRecord.channelId}" is on the blocklist due to claims of copyright holders (${blocklistRecord.ref})` }) - } else if (blocked.reason === 'nsfw') { + } else if (blocklistRecord.reason === 'nsfw') { log.add({ type: 'error', - line: stream.line, - message: `"${blocked.channelId}" is on the blocklist due to NSFW content (${blocked.ref})` + line: stream.getLine(), + message: `"${blocklistRecord.channelId}" is on the blocklist due to NSFW content (${blocklistRecord.ref})` }) } - } + }) }) if (log.notEmpty()) { diff --git a/scripts/commands/report/create.ts b/scripts/commands/report/create.ts index 7584105d11..4ad272de34 100644 --- a/scripts/commands/report/create.ts +++ b/scripts/commands/report/create.ts @@ -1,44 +1,41 @@ +import { DataLoader, DataProcessor, IssueLoader, PlaylistParser } from '../../core' import { Logger, Storage, Collection, Dictionary } from '@freearhey/core' +import { DataProcessorData } from '../../types/dataProcessor' import { DATA_DIR, STREAMS_DIR } from '../../constants' -import { IssueLoader, PlaylistParser } from '../../core' -import { Blocked, Channel, Issue, Stream, Feed } from '../../models' -import { uniqueId } from 'lodash' +import { DataLoaderData } from '../../types/dataLoader' +import { Issue, Stream } from '../../models' async function main() { const logger = new Logger() - const loader = new IssueLoader() + const issueLoader = new IssueLoader() let report = new Collection() logger.info('loading issues...') - const issues = await loader.load() + const issues = await issueLoader.load() logger.info('loading data from api...') + const processor = new DataProcessor() const dataStorage = new Storage(DATA_DIR) - const channelsData = await dataStorage.json('channels.json') - const channels = new Collection(channelsData).map(data => new Channel(data)) - const channelsGroupedById = channels.keyBy((channel: Channel) => channel.id) - const feedsData = await dataStorage.json('feeds.json') - const feeds = new Collection(feedsData).map(data => - new Feed(data).withChannel(channelsGroupedById) - ) - const feedsGroupedByChannelId = feeds.groupBy((feed: Feed) => - feed.channel ? feed.channel.id : uniqueId() - ) - const blocklistContent = await dataStorage.json('blocklist.json') - const blocklist = new Collection(blocklistContent).map(data => new Blocked(data)) - const blocklistGroupedByChannelId = blocklist.keyBy((blocked: Blocked) => blocked.channelId) + const dataLoader = new DataLoader({ storage: dataStorage }) + const data: DataLoaderData = await dataLoader.load() + const { + channelsKeyById, + feedsGroupedByChannelId, + blocklistRecordsGroupedByChannelId + }: DataProcessorData = processor.process(data) logger.info('loading streams...') const streamsStorage = new Storage(STREAMS_DIR) const parser = new PlaylistParser({ storage: streamsStorage, - channelsGroupedById, + channelsKeyById, feedsGroupedByChannelId }) const files = await streamsStorage.list('**/*.m3u') const streams = await parser.parse(files) const streamsGroupedByUrl = streams.groupBy((stream: Stream) => stream.url) const streamsGroupedByChannelId = streams.groupBy((stream: Stream) => stream.channelId) + const streamsGroupedById = streams.groupBy((stream: Stream) => stream.getId()) logger.info('checking broken streams reports...') const brokenStreamReports = issues.filter(issue => @@ -94,8 +91,8 @@ async function main() { if (!channelId) result.status = 'missing_id' else if (!streamUrl) result.status = 'missing_link' - else if (blocklistGroupedByChannelId.has(channelId)) result.status = 'blocked' - else if (channelsGroupedById.missing(channelId)) result.status = 'wrong_id' + else if (blocklistRecordsGroupedByChannelId.has(channelId)) result.status = 'blocked' + else if (channelsKeyById.missing(channelId)) result.status = 'wrong_id' else if (streamsGroupedByUrl.has(streamUrl)) result.status = 'on_playlist' else if (addRequestsBuffer.has(streamUrl)) result.status = 'duplicate' else result.status = 'pending' @@ -124,7 +121,7 @@ async function main() { if (!streamUrl) result.status = 'missing_link' else if (streamsGroupedByUrl.missing(streamUrl)) result.status = 'invalid_link' - else if (channelId && channelsGroupedById.missing(channelId)) result.status = 'invalid_id' + else if (channelId && channelsKeyById.missing(channelId)) result.status = 'invalid_id' report.add(result) }) @@ -147,16 +144,16 @@ async function main() { } if (!channelId) result.status = 'missing_id' - else if (channelsGroupedById.missing(channelId)) result.status = 'invalid_id' - else if (channelSearchRequestsBuffer.has(channelId)) result.status = 'duplicate' - else if (blocklistGroupedByChannelId.has(channelId)) result.status = 'blocked' - else if (streamsGroupedByChannelId.has(channelId)) result.status = 'fulfilled' + else if (channelsKeyById.missing(channelId)) result.status = 'invalid_id' + else if (channelSearchRequestsBuffer.has(streamId)) result.status = 'duplicate' + else if (blocklistRecordsGroupedByChannelId.has(channelId)) result.status = 'blocked' + else if (streamsGroupedById.has(streamId)) result.status = 'fulfilled' else { - const channelData = channelsGroupedById.get(channelId) + const channelData = channelsKeyById.get(channelId) if (channelData.length && channelData[0].closed) result.status = 'closed' } - channelSearchRequestsBuffer.set(channelId, true) + channelSearchRequestsBuffer.set(streamId, true) report.add(result) }) diff --git a/scripts/core/apiClient.ts b/scripts/core/apiClient.ts index 3b62919082..e4815a81aa 100644 --- a/scripts/core/apiClient.ts +++ b/scripts/core/apiClient.ts @@ -1,59 +1,16 @@ -import { Logger, Storage } from '@freearhey/core' -import axios, { AxiosInstance, AxiosResponse, AxiosProgressEvent } from 'axios' -import cliProgress, { MultiBar } from 'cli-progress' -import numeral from 'numeral' +import axios, { AxiosInstance, AxiosResponse, AxiosRequestConfig } from 'axios' export class ApiClient { - progressBar: MultiBar - client: AxiosInstance - storage: Storage - logger: Logger + instance: AxiosInstance - constructor({ logger }: { logger: Logger }) { - this.logger = logger - this.client = axios.create({ + constructor() { + this.instance = axios.create({ + baseURL: 'https://iptv-org.github.io/api', responseType: 'stream' }) - this.storage = new Storage() - this.progressBar = new cliProgress.MultiBar({ - stopOnComplete: true, - hideCursor: true, - forceRedraw: true, - barsize: 36, - format(options, params, payload) { - const filename = payload.filename.padEnd(18, ' ') - const barsize = options.barsize || 40 - const percent = (params.progress * 100).toFixed(2) - const speed = payload.speed ? numeral(payload.speed).format('0.0 b') + '/s' : 'N/A' - const total = numeral(params.total).format('0.0 b') - const completeSize = Math.round(params.progress * barsize) - const incompleteSize = barsize - completeSize - const bar = - options.barCompleteString && options.barIncompleteString - ? options.barCompleteString.substr(0, completeSize) + - options.barGlue + - options.barIncompleteString.substr(0, incompleteSize) - : '-'.repeat(barsize) - - return `${filename} [${bar}] ${percent}% | ETA: ${params.eta}s | ${total} | ${speed}` - } - }) } - async download(filename: string) { - const stream = await this.storage.createStream(`temp/data/${filename}`) - - const bar = this.progressBar.create(0, 0, { filename }) - - this.client - .get(`https://iptv-org.github.io/api/${filename}`, { - onDownloadProgress({ total, loaded, rate }: AxiosProgressEvent) { - if (total) bar.setTotal(total) - bar.update(loaded, { speed: rate }) - } - }) - .then((response: AxiosResponse) => { - response.data.pipe(stream) - }) + get(url: string, options: AxiosRequestConfig): Promise { + return this.instance.get(url, options) } } diff --git a/scripts/core/dataLoader.ts b/scripts/core/dataLoader.ts new file mode 100644 index 0000000000..2379edc9ee --- /dev/null +++ b/scripts/core/dataLoader.ts @@ -0,0 +1,100 @@ +import { ApiClient } from './apiClient' +import { Storage } from '@freearhey/core' +import cliProgress, { MultiBar } from 'cli-progress' +import numeral from 'numeral' +import type { DataLoaderProps, DataLoaderData } from '../types/dataLoader' + +export class DataLoader { + client: ApiClient + storage: Storage + progressBar: MultiBar + + constructor(props: DataLoaderProps) { + this.client = new ApiClient() + this.storage = props.storage + this.progressBar = new cliProgress.MultiBar({ + stopOnComplete: true, + hideCursor: true, + forceRedraw: true, + barsize: 36, + format(options, params, payload) { + const filename = payload.filename.padEnd(18, ' ') + const barsize = options.barsize || 40 + const percent = (params.progress * 100).toFixed(2) + const speed = payload.speed ? numeral(payload.speed).format('0.0 b') + '/s' : 'N/A' + const total = numeral(params.total).format('0.0 b') + const completeSize = Math.round(params.progress * barsize) + const incompleteSize = barsize - completeSize + const bar = + options.barCompleteString && options.barIncompleteString + ? options.barCompleteString.substr(0, completeSize) + + options.barGlue + + options.barIncompleteString.substr(0, incompleteSize) + : '-'.repeat(barsize) + + return `${filename} [${bar}] ${percent}% | ETA: ${params.eta}s | ${total} | ${speed}` + } + }) + } + + async load(): Promise { + const [ + countries, + regions, + subdivisions, + languages, + categories, + blocklist, + channels, + feeds, + timezones, + guides, + streams + ] = await Promise.all([ + this.storage.json('countries.json'), + this.storage.json('regions.json'), + this.storage.json('subdivisions.json'), + this.storage.json('languages.json'), + this.storage.json('categories.json'), + this.storage.json('blocklist.json'), + this.storage.json('channels.json'), + this.storage.json('feeds.json'), + this.storage.json('timezones.json'), + this.storage.json('guides.json'), + this.storage.json('streams.json') + ]) + + return { + countries, + regions, + subdivisions, + languages, + categories, + blocklist, + channels, + feeds, + timezones, + guides, + streams + } + } + + async download(filename: string) { + if (!this.storage || !this.progressBar) return + + const stream = await this.storage.createStream(filename) + const progressBar = this.progressBar.create(0, 0, { filename }) + + this.client + .get(filename, { + responseType: 'stream', + onDownloadProgress({ total, loaded, rate }) { + if (total) progressBar.setTotal(total) + progressBar.update(loaded, { speed: rate }) + } + }) + .then(response => { + response.data.pipe(stream) + }) + } +} diff --git a/scripts/core/dataProcessor.ts b/scripts/core/dataProcessor.ts new file mode 100644 index 0000000000..3290fe5b30 --- /dev/null +++ b/scripts/core/dataProcessor.ts @@ -0,0 +1,110 @@ +import { DataLoaderData } from '../types/dataLoader' +import { Collection } from '@freearhey/core' +import { + BlocklistRecord, + Subdivision, + Category, + Language, + Timezone, + Channel, + Country, + Region, + Stream, + Guide, + Feed +} from '../models' + +export class DataProcessor { + constructor() {} + + process(data: DataLoaderData) { + const categories = new Collection(data.categories).map(data => new Category(data)) + const categoriesKeyById = categories.keyBy((category: Category) => category.id) + + const subdivisions = new Collection(data.subdivisions).map(data => new Subdivision(data)) + const subdivisionsKeyByCode = subdivisions.keyBy((subdivision: Subdivision) => subdivision.code) + const subdivisionsGroupedByCountryCode = subdivisions.groupBy( + (subdivision: Subdivision) => subdivision.countryCode + ) + + let regions = new Collection(data.regions).map(data => new Region(data)) + const regionsKeyByCode = regions.keyBy((region: Region) => region.code) + + const blocklistRecords = new Collection(data.blocklist).map(data => new BlocklistRecord(data)) + const blocklistRecordsGroupedByChannelId = blocklistRecords.groupBy( + (blocklistRecord: BlocklistRecord) => blocklistRecord.channelId + ) + + const streams = new Collection(data.streams).map(data => new Stream(data)) + const streamsGroupedById = streams.groupBy((stream: Stream) => stream.getId()) + + const guides = new Collection(data.guides).map(data => new Guide(data)) + const guidesGroupedByStreamId = guides.groupBy((guide: Guide) => guide.getStreamId()) + + const languages = new Collection(data.languages).map(data => new Language(data)) + const languagesKeyByCode = languages.keyBy((language: Language) => language.code) + + const countries = new Collection(data.countries).map(data => + new Country(data) + .withRegions(regions) + .withLanguage(languagesKeyByCode) + .withSubdivisions(subdivisionsGroupedByCountryCode) + ) + const countriesKeyByCode = countries.keyBy((country: Country) => country.code) + + regions = regions.map((region: Region) => region.withCountries(countriesKeyByCode)) + + const timezones = new Collection(data.timezones).map(data => + new Timezone(data).withCountries(countriesKeyByCode) + ) + const timezonesKeyById = timezones.keyBy((timezone: Timezone) => timezone.id) + + let channels = new Collection(data.channels).map(data => + new Channel(data) + .withCategories(categoriesKeyById) + .withCountry(countriesKeyByCode) + .withSubdivision(subdivisionsKeyByCode) + .withCategories(categoriesKeyById) + ) + const channelsKeyById = channels.keyBy((channel: Channel) => channel.id) + + let feeds = new Collection(data.feeds).map(data => + new Feed(data) + .withChannel(channelsKeyById) + .withLanguages(languagesKeyByCode) + .withTimezones(timezonesKeyById) + .withBroadcastCountries(countriesKeyByCode, regionsKeyByCode, subdivisionsKeyByCode) + .withBroadcastRegions(regions) + .withBroadcastSubdivisions(subdivisionsKeyByCode) + ) + const feedsGroupedByChannelId = feeds.groupBy((feed: Feed) => feed.channelId) + + channels = channels.map((channel: Channel) => channel.withFeeds(feedsGroupedByChannelId)) + + return { + blocklistRecordsGroupedByChannelId, + subdivisionsGroupedByCountryCode, + feedsGroupedByChannelId, + guidesGroupedByStreamId, + subdivisionsKeyByCode, + countriesKeyByCode, + languagesKeyByCode, + streamsGroupedById, + categoriesKeyById, + timezonesKeyById, + regionsKeyByCode, + blocklistRecords, + channelsKeyById, + subdivisions, + categories, + countries, + languages, + timezones, + channels, + regions, + streams, + guides, + feeds + } + } +} diff --git a/scripts/core/index.ts b/scripts/core/index.ts index cdac07f58e..d322373100 100644 --- a/scripts/core/index.ts +++ b/scripts/core/index.ts @@ -1,11 +1,13 @@ -export * from './playlistParser' -export * from './numberParser' -export * from './logParser' -export * from './markdown' +export * from './apiClient' +export * from './cliTable' +export * from './dataProcessor' +export * from './dataLoader' +export * from './htmlTable' +export * from './issueData' export * from './issueLoader' export * from './issueParser' -export * from './htmlTable' -export * from './apiClient' -export * from './issueData' +export * from './logParser' +export * from './markdown' +export * from './numberParser' +export * from './playlistParser' export * from './streamTester' -export * from './cliTable' diff --git a/scripts/core/playlistParser.ts b/scripts/core/playlistParser.ts index b28876663e..7d388dd209 100644 --- a/scripts/core/playlistParser.ts +++ b/scripts/core/playlistParser.ts @@ -5,18 +5,18 @@ import { Stream } from '../models' type PlaylistPareserProps = { storage: Storage feedsGroupedByChannelId: Dictionary - channelsGroupedById: Dictionary + channelsKeyById: Dictionary } export class PlaylistParser { storage: Storage feedsGroupedByChannelId: Dictionary - channelsGroupedById: Dictionary + channelsKeyById: Dictionary - constructor({ storage, feedsGroupedByChannelId, channelsGroupedById }: PlaylistPareserProps) { + constructor({ storage, feedsGroupedByChannelId, channelsKeyById }: PlaylistPareserProps) { this.storage = storage this.feedsGroupedByChannelId = feedsGroupedByChannelId - this.channelsGroupedById = channelsGroupedById + this.channelsKeyById = channelsKeyById } async parse(files: string[]): Promise { @@ -35,9 +35,10 @@ export class PlaylistParser { const parsed: parser.Playlist = parser.parse(content) const streams = new Collection(parsed.items).map((data: parser.PlaylistItem) => { - const stream = new Stream(data) + const stream = new Stream() + .fromPlaylistItem(data) .withFeed(this.feedsGroupedByChannelId) - .withChannel(this.channelsGroupedById) + .withChannel(this.channelsKeyById) .setFilepath(filepath) return stream diff --git a/scripts/models/blocked.ts b/scripts/models/blocked.ts deleted file mode 100644 index 29041278b1..0000000000 --- a/scripts/models/blocked.ts +++ /dev/null @@ -1,17 +0,0 @@ -type BlockedProps = { - channel: string - reason: string - ref: string -} - -export class Blocked { - channelId: string - reason: string - ref: string - - constructor(data: BlockedProps) { - this.channelId = data.channel - this.reason = data.reason - this.ref = data.ref - } -} diff --git a/scripts/models/blocklistRecord.ts b/scripts/models/blocklistRecord.ts new file mode 100644 index 0000000000..632a1d4ddc --- /dev/null +++ b/scripts/models/blocklistRecord.ts @@ -0,0 +1,15 @@ +import type { BlocklistRecordData } from '../types/blocklistRecord' + +export class BlocklistRecord { + channelId: string + reason: string + ref: string + + constructor(data?: BlocklistRecordData) { + if (!data) return + + this.channelId = data.channel + this.reason = data.reason + this.ref = data.ref + } +} diff --git a/scripts/models/category.ts b/scripts/models/category.ts index 17ff9af122..5b228a86d0 100644 --- a/scripts/models/category.ts +++ b/scripts/models/category.ts @@ -1,7 +1,4 @@ -type CategoryData = { - id: string - name: string -} +import type { CategoryData, CategorySerializedData } from '../types/category' export class Category { id: string @@ -11,4 +8,11 @@ export class Category { this.id = data.id this.name = data.name } + + serialize(): CategorySerializedData { + return { + id: this.id, + name: this.name + } + } } diff --git a/scripts/models/channel.ts b/scripts/models/channel.ts index 1d4c5cf8d6..cdc09af0ad 100644 --- a/scripts/models/channel.ts +++ b/scripts/models/channel.ts @@ -1,23 +1,6 @@ import { Collection, Dictionary } from '@freearhey/core' -import { Category, Country, Subdivision } from './index' - -type ChannelData = { - id: string - name: string - alt_names: string[] - network: string - owners: Collection - country: string - subdivision: string - city: string - categories: Collection - is_nsfw: boolean - launched: string - closed: string - replaced_by: string - website: string - logo: string -} +import { Category, Country, Feed, Guide, Stream, Subdivision } from './index' +import type { ChannelData, ChannelSearchableData, ChannelSerializedData } from '../types/channel' export class Channel { id: string @@ -31,15 +14,18 @@ export class Channel { subdivision?: Subdivision cityName?: string categoryIds: Collection - categories?: Collection + categories: Collection = new Collection() isNSFW: boolean launched?: string closed?: string replacedBy?: string website?: string logo: string + feeds?: Collection + + constructor(data?: ChannelData) { + if (!data) return - constructor(data: ChannelData) { this.id = data.id this.name = data.name this.altNames = new Collection(data.alt_names) @@ -57,28 +43,34 @@ export class Channel { this.logo = data.logo } - withSubdivision(subdivisionsGroupedByCode: Dictionary): this { + withSubdivision(subdivisionsKeyByCode: Dictionary): this { if (!this.subdivisionCode) return this - this.subdivision = subdivisionsGroupedByCode.get(this.subdivisionCode) + this.subdivision = subdivisionsKeyByCode.get(this.subdivisionCode) return this } - withCountry(countriesGroupedByCode: Dictionary): this { - this.country = countriesGroupedByCode.get(this.countryCode) + withCountry(countriesKeyByCode: Dictionary): this { + this.country = countriesKeyByCode.get(this.countryCode) return this } - withCategories(groupedCategories: Dictionary): this { + withCategories(categoriesKeyById: Dictionary): this { this.categories = this.categoryIds - .map((id: string) => groupedCategories.get(id)) + .map((id: string) => categoriesKeyById.get(id)) .filter(Boolean) return this } + withFeeds(feedsGroupedByChannelId: Dictionary): this { + this.feeds = new Collection(feedsGroupedByChannelId.get(this.id)) + + return this + } + getCountry(): Country | undefined { return this.country } @@ -102,7 +94,106 @@ export class Channel { ) } + getFeeds(): Collection { + if (!this.feeds) return new Collection() + + return this.feeds + } + + getGuides(): Collection { + let guides = new Collection() + + this.getFeeds().forEach((feed: Feed) => { + guides = guides.concat(feed.getGuides()) + }) + + return guides + } + + getGuideNames(): Collection { + return this.getGuides() + .map((guide: Guide) => guide.siteName) + .uniq() + } + + getStreams(): Collection { + let streams = new Collection() + + this.getFeeds().forEach((feed: Feed) => { + streams = streams.concat(feed.getStreams()) + }) + + return streams + } + + getStreamNames(): Collection { + return this.getStreams() + .map((stream: Stream) => stream.getName()) + .uniq() + } + + getFeedFullNames(): Collection { + return this.getFeeds() + .map((feed: Feed) => feed.getFullName()) + .uniq() + } + isSFW(): boolean { return this.isNSFW === false } + + getSearchable(): ChannelSearchableData { + return { + id: this.id, + name: this.name, + altNames: this.altNames.all(), + guideNames: this.getGuideNames().all(), + streamNames: this.getStreamNames().all(), + feedFullNames: this.getFeedFullNames().all() + } + } + + serialize(): ChannelSerializedData { + return { + id: this.id, + name: this.name, + altNames: this.altNames.all(), + network: this.network, + owners: this.owners.all(), + countryCode: this.countryCode, + country: this.country ? this.country.serialize() : undefined, + subdivisionCode: this.subdivisionCode, + subdivision: this.subdivision ? this.subdivision.serialize() : undefined, + cityName: this.cityName, + categoryIds: this.categoryIds.all(), + categories: this.categories.map((category: Category) => category.serialize()).all(), + isNSFW: this.isNSFW, + launched: this.launched, + closed: this.closed, + replacedBy: this.replacedBy, + website: this.website, + logo: this.logo + } + } + + deserialize(data: ChannelSerializedData): this { + this.id = data.id + this.name = data.name + this.altNames = new Collection(data.altNames) + this.network = data.network + this.owners = new Collection(data.owners) + this.countryCode = data.countryCode + this.country = data.country ? new Country().deserialize(data.country) : undefined + this.subdivisionCode = data.subdivisionCode + this.cityName = data.cityName + this.categoryIds = new Collection(data.categoryIds) + this.isNSFW = data.isNSFW + this.launched = data.launched + this.closed = data.closed + this.replacedBy = data.replacedBy + this.website = data.website + this.logo = data.logo + + return this + } } diff --git a/scripts/models/country.ts b/scripts/models/country.ts index ac822a2350..780c4413f1 100644 --- a/scripts/models/country.ts +++ b/scripts/models/country.ts @@ -1,12 +1,8 @@ import { Collection, Dictionary } from '@freearhey/core' -import { Region, Language } from '.' - -type CountryData = { - code: string - name: string - lang: string - flag: string -} +import { Region, Language, Subdivision } from '.' +import type { CountryData, CountrySerializedData } from '../types/country' +import { SubdivisionSerializedData } from '../types/subdivision' +import { RegionSerializedData } from '../types/region' export class Country { code: string @@ -17,7 +13,9 @@ export class Country { subdivisions?: Collection regions?: Collection - constructor(data: CountryData) { + constructor(data?: CountryData) { + if (!data) return + this.code = data.code this.name = data.name this.flag = data.flag @@ -38,8 +36,8 @@ export class Country { return this } - withLanguage(languagesGroupedByCode: Dictionary): this { - this.language = languagesGroupedByCode.get(this.languageCode) + withLanguage(languagesKeyByCode: Dictionary): this { + this.language = languagesKeyByCode.get(this.languageCode) return this } @@ -55,4 +53,34 @@ export class Country { getSubdivisions(): Collection { return this.subdivisions || new Collection() } + + serialize(): CountrySerializedData { + return { + code: this.code, + name: this.name, + flag: this.flag, + languageCode: this.languageCode, + language: this.language ? this.language.serialize() : null, + subdivisions: this.subdivisions + ? this.subdivisions.map((subdivision: Subdivision) => subdivision.serialize()).all() + : [], + regions: this.regions ? this.regions.map((region: Region) => region.serialize()).all() : [] + } + } + + deserialize(data: CountrySerializedData): this { + this.code = data.code + this.name = data.name + this.flag = data.flag + this.languageCode = data.languageCode + this.language = data.language ? new Language().deserialize(data.language) : undefined + this.subdivisions = new Collection(data.subdivisions).map((data: SubdivisionSerializedData) => + new Subdivision().deserialize(data) + ) + this.regions = new Collection(data.regions).map((data: RegionSerializedData) => + new Region().deserialize(data) + ) + + return this + } } diff --git a/scripts/models/feed.ts b/scripts/models/feed.ts index 03e34762bc..03ae31184e 100644 --- a/scripts/models/feed.ts +++ b/scripts/models/feed.ts @@ -1,16 +1,6 @@ import { Collection, Dictionary } from '@freearhey/core' import { Country, Language, Region, Channel, Subdivision } from './index' - -type FeedData = { - channel: string - id: string - name: string - is_main: boolean - broadcast_area: Collection - languages: Collection - timezones: Collection - video_format: string -} +import type { FeedData } from '../types/feed' export class Feed { channelId: string @@ -30,6 +20,8 @@ export class Feed { timezoneIds: Collection timezones?: Collection videoFormat: string + guides?: Collection + streams?: Collection constructor(data: FeedData) { this.channelId = data.channel @@ -61,40 +53,58 @@ export class Feed { }) } - withChannel(channelsGroupedById: Dictionary): this { - this.channel = channelsGroupedById.get(this.channelId) + withChannel(channelsKeyById: Dictionary): this { + this.channel = channelsKeyById.get(this.channelId) return this } - withLanguages(languagesGroupedByCode: Dictionary): this { + withStreams(streamsGroupedById: Dictionary): this { + this.streams = new Collection(streamsGroupedById.get(`${this.channelId}@${this.id}`)) + + if (this.isMain) { + this.streams = this.streams.concat(new Collection(streamsGroupedById.get(this.channelId))) + } + + return this + } + + withGuides(guidesGroupedByStreamId: Dictionary): this { + this.guides = new Collection(guidesGroupedByStreamId.get(`${this.channelId}@${this.id}`)) + + if (this.isMain) { + this.guides = this.guides.concat(new Collection(guidesGroupedByStreamId.get(this.channelId))) + } + + return this + } + + withLanguages(languagesKeyByCode: Dictionary): this { this.languages = this.languageCodes - .map((code: string) => languagesGroupedByCode.get(code)) + .map((code: string) => languagesKeyByCode.get(code)) .filter(Boolean) return this } - withTimezones(timezonesGroupedById: Dictionary): this { - this.timezones = this.timezoneIds - .map((id: string) => timezonesGroupedById.get(id)) - .filter(Boolean) + withTimezones(timezonesKeyById: Dictionary): this { + this.timezones = this.timezoneIds.map((id: string) => timezonesKeyById.get(id)).filter(Boolean) return this } - withBroadcastSubdivisions(subdivisionsGroupedByCode: Dictionary): this { + withBroadcastSubdivisions(subdivisionsKeyByCode: Dictionary): this { this.broadcastSubdivisions = this.broadcastSubdivisionCodes.map((code: string) => - subdivisionsGroupedByCode.get(code) + subdivisionsKeyByCode.get(code) ) return this } withBroadcastCountries( - countriesGroupedByCode: Dictionary, - regionsGroupedByCode: Dictionary, - subdivisionsGroupedByCode: Dictionary + countriesKeyByCode: Dictionary, + regionsKeyByCode: Dictionary, + subdivisionsKeyByCode: Dictionary ): this { let broadcastCountries = new Collection() @@ -104,22 +114,22 @@ export class Feed { } this.broadcastCountryCodes.forEach((code: string) => { - broadcastCountries.add(countriesGroupedByCode.get(code)) + broadcastCountries.add(countriesKeyByCode.get(code)) }) this.broadcastRegionCodes.forEach((code: string) => { - const region: Region = regionsGroupedByCode.get(code) + const region: Region = regionsKeyByCode.get(code) if (region) { region.countryCodes.forEach((countryCode: string) => { - broadcastCountries.add(countriesGroupedByCode.get(countryCode)) + broadcastCountries.add(countriesKeyByCode.get(countryCode)) }) } }) this.broadcastSubdivisionCodes.forEach((code: string) => { - const subdivision: Subdivision = subdivisionsGroupedByCode.get(code) + const subdivision: Subdivision = subdivisionsKeyByCode.get(code) if (subdivision) { - broadcastCountries.add(countriesGroupedByCode.get(subdivision.countryCode)) + broadcastCountries.add(countriesKeyByCode.get(subdivision.countryCode)) } }) @@ -197,4 +207,22 @@ export class Feed { return this.getBroadcastRegions().includes((_region: Region) => _region.code === region.code) } + + getGuides(): Collection { + if (!this.guides) return new Collection() + + return this.guides + } + + getStreams(): Collection { + if (!this.streams) return new Collection() + + return this.streams + } + + getFullName(): string { + if (!this.channel) return '' + + return `${this.channel.name} ${this.name}` + } } diff --git a/scripts/models/guide.ts b/scripts/models/guide.ts new file mode 100644 index 0000000000..3bc849d86e --- /dev/null +++ b/scripts/models/guide.ts @@ -0,0 +1,54 @@ +import type { GuideData, GuideSerializedData } from '../types/guide' + +export class Guide { + channelId?: string + feedId?: string + siteDomain: string + siteId: string + siteName: string + languageCode: string + + constructor(data?: GuideData) { + if (!data) return + + this.channelId = data.channel + this.feedId = data.feed + this.siteDomain = data.site + this.siteId = data.site_id + this.siteName = data.site_name + this.languageCode = data.lang + } + + getUUID(): string { + return this.getStreamId() + this.siteId + } + + getStreamId(): string | undefined { + if (!this.channelId) return undefined + if (!this.feedId) return this.channelId + + return `${this.channelId}@${this.feedId}` + } + + serialize(): GuideSerializedData { + return { + channelId: this.channelId, + feedId: this.feedId, + siteDomain: this.siteDomain, + siteId: this.siteId, + siteName: this.siteName, + languageCode: this.languageCode + } + } + + deserialize(data: GuideSerializedData): this { + this.channelId = data.channelId + this.feedId = data.feedId + this.siteDomain = data.siteDomain + this.siteId = data.siteId + this.siteName = data.siteName + this.languageCode = data.languageCode + + return this + } +} diff --git a/scripts/models/index.ts b/scripts/models/index.ts index 83a9380ed8..db4d6f5fa8 100644 --- a/scripts/models/index.ts +++ b/scripts/models/index.ts @@ -1,13 +1,14 @@ -export * from './issue' -export * from './playlist' -export * from './blocked' -export * from './stream' +export * from './blocklistRecord' +export * from './broadcastArea' export * from './category' export * from './channel' -export * from './language' export * from './country' -export * from './region' -export * from './subdivision' export * from './feed' -export * from './broadcastArea' +export * from './guide' +export * from './issue' +export * from './language' +export * from './playlist' +export * from './region' +export * from './stream' +export * from './subdivision' export * from './timezone' diff --git a/scripts/models/language.ts b/scripts/models/language.ts index aeda5e6c22..1e6df829bc 100644 --- a/scripts/models/language.ts +++ b/scripts/models/language.ts @@ -1,14 +1,27 @@ -type LanguageData = { - code: string - name: string -} +import type { LanguageData, LanguageSerializedData } from '../types/language' export class Language { code: string name: string - constructor(data: LanguageData) { + constructor(data?: LanguageData) { + if (!data) return + this.code = data.code this.name = data.name } + + serialize(): LanguageSerializedData { + return { + code: this.code, + name: this.name + } + } + + deserialize(data: LanguageSerializedData): this { + this.code = data.code + this.name = data.name + + return this + } } diff --git a/scripts/models/region.ts b/scripts/models/region.ts index 928b48f06f..ace44bc52f 100644 --- a/scripts/models/region.ts +++ b/scripts/models/region.ts @@ -1,27 +1,26 @@ import { Collection, Dictionary } from '@freearhey/core' -import { Subdivision } from '.' - -type RegionData = { - code: string - name: string - countries: string[] -} +import { Country, Subdivision } from '.' +import type { RegionData, RegionSerializedData } from '../types/region' +import { CountrySerializedData } from '../types/country' +import { SubdivisionSerializedData } from '../types/subdivision' export class Region { code: string name: string countryCodes: Collection - countries?: Collection - subdivisions?: Collection + countries: Collection = new Collection() + subdivisions: Collection = new Collection() + + constructor(data?: RegionData) { + if (!data) return - constructor(data: RegionData) { this.code = data.code this.name = data.name this.countryCodes = new Collection(data.countries) } - withCountries(countriesGroupedByCode: Dictionary): this { - this.countries = this.countryCodes.map((code: string) => countriesGroupedByCode.get(code)) + withCountries(countriesKeyByCode: Dictionary): this { + this.countries = this.countryCodes.map((code: string) => countriesKeyByCode.get(code)) return this } @@ -35,11 +34,11 @@ export class Region { } getSubdivisions(): Collection { - return this.subdivisions || new Collection() + return this.subdivisions } getCountries(): Collection { - return this.countries || new Collection() + return this.countries } includesCountryCode(code: string): boolean { @@ -49,4 +48,30 @@ export class Region { isWorldwide(): boolean { return this.code === 'INT' } + + serialize(): RegionSerializedData { + return { + code: this.code, + name: this.name, + countryCodes: this.countryCodes.all(), + countries: this.countries.map((country: Country) => country.serialize()).all(), + subdivisions: this.subdivisions + .map((subdivision: Subdivision) => subdivision.serialize()) + .all() + } + } + + deserialize(data: RegionSerializedData): this { + this.code = data.code + this.name = data.name + this.countryCodes = new Collection(data.countryCodes) + this.countries = new Collection(data.countries).map((data: CountrySerializedData) => + new Country().deserialize(data) + ) + this.subdivisions = new Collection(data.subdivisions).map((data: SubdivisionSerializedData) => + new Subdivision().deserialize(data) + ) + + return this + } } diff --git a/scripts/models/stream.ts b/scripts/models/stream.ts index bd01845f63..2de399efc7 100644 --- a/scripts/models/stream.ts +++ b/scripts/models/stream.ts @@ -1,26 +1,45 @@ -import { URL, Collection, Dictionary } from '@freearhey/core' import { Feed, Channel, Category, Region, Subdivision, Country, Language } from './index' +import { URL, Collection, Dictionary } from '@freearhey/core' +import type { StreamData } from '../types/stream' import parser from 'iptv-playlist-parser' export class Stream { - name: string + name?: string url: string id?: string - groupTitle: string channelId?: string channel?: Channel feedId?: string feed?: Feed filepath?: string - line: number + line?: number label?: string verticalResolution?: number isInterlaced?: boolean - httpReferrer?: string - httpUserAgent?: string + referrer?: string + userAgent?: string + groupTitle: string = 'Undefined' removed: boolean = false - constructor(data: parser.PlaylistItem) { + constructor(data?: StreamData) { + if (!data) return + + const id = data.channel && data.feed ? [data.channel, data.feed].join('@') : data.channel + const { verticalResolution, isInterlaced } = parseQuality(data.quality) + + this.id = id || undefined + this.channelId = data.channel || undefined + this.feedId = data.feed || undefined + this.name = data.name || undefined + this.url = data.url + this.referrer = data.referrer || undefined + this.userAgent = data.user_agent || undefined + this.verticalResolution = verticalResolution || undefined + this.isInterlaced = isInterlaced || undefined + this.label = data.label || undefined + } + + fromPlaylistItem(data: parser.PlaylistItem): this { if (!data.name) throw new Error('"name" property is required') if (!data.url) throw new Error('"url" property is required') @@ -37,15 +56,16 @@ export class Stream { this.verticalResolution = verticalResolution || undefined this.isInterlaced = isInterlaced || undefined this.url = data.url - this.httpReferrer = data.http.referrer || undefined - this.httpUserAgent = data.http['user-agent'] || undefined - this.groupTitle = 'Undefined' + this.referrer = data.http.referrer || undefined + this.userAgent = data.http['user-agent'] || undefined + + return this } - withChannel(channelsGroupedById: Dictionary): this { + withChannel(channelsKeyById: Dictionary): this { if (!this.channelId) return this - this.channel = channelsGroupedById.get(this.channelId) + this.channel = channelsKeyById.get(this.channelId) return this } @@ -93,18 +113,22 @@ export class Stream { return this } - setHttpUserAgent(httpUserAgent: string): this { - this.httpUserAgent = httpUserAgent + setUserAgent(userAgent: string): this { + this.userAgent = userAgent return this } - setHttpReferrer(httpReferrer: string): this { - this.httpReferrer = httpReferrer + setReferrer(referrer: string): this { + this.referrer = referrer return this } + getLine(): number { + return this.line || -1 + } + setFilepath(filepath: string): this { this.filepath = filepath @@ -133,12 +157,12 @@ export class Stream { return this.filepath || '' } - getHttpReferrer(): string { - return this.httpReferrer || '' + getReferrer(): string { + return this.referrer || '' } - getHttpUserAgent(): string { - return this.httpUserAgent || '' + getUserAgent(): string { + return this.userAgent || '' } getQuality(): string { @@ -198,14 +222,6 @@ export class Stream { return Object.assign(Object.create(Object.getPrototypeOf(this)), this) } - hasName(): boolean { - return !!this.name - } - - noName(): boolean { - return !this.name - } - hasChannel() { return !!this.channel } @@ -281,8 +297,12 @@ export class Stream { return this?.channel?.logo || '' } + getName(): string { + return this.name || '' + } + getTitle(): string { - let title = `${this.name}` + let title = `${this.getName()}` if (this.getQuality()) { title += ` (${this.getQuality()})` @@ -303,30 +323,13 @@ export class Stream { return this.id || '' } - data() { - return { - id: this.id, - channel: this.channel, - feed: this.feed, - filepath: this.filepath, - label: this.label, - name: this.name, - verticalResolution: this.verticalResolution, - isInterlaced: this.isInterlaced, - url: this.url, - httpReferrer: this.httpReferrer, - httpUserAgent: this.httpUserAgent, - line: this.line - } - } - toJSON() { return { channel: this.channelId || null, feed: this.feedId || null, url: this.url, - referrer: this.httpReferrer || null, - user_agent: this.httpUserAgent || null, + referrer: this.referrer || null, + user_agent: this.userAgent || null, quality: this.getQuality() || null } } @@ -338,22 +341,22 @@ export class Stream { output += ` tvg-logo="${this.getLogo()}" group-title="${this.groupTitle}"` } - if (this.httpReferrer) { - output += ` http-referrer="${this.httpReferrer}"` + if (this.referrer) { + output += ` http-referrer="${this.referrer}"` } - if (this.httpUserAgent) { - output += ` http-user-agent="${this.httpUserAgent}"` + if (this.userAgent) { + output += ` http-user-agent="${this.userAgent}"` } output += `,${this.getTitle()}` - if (this.httpReferrer) { - output += `\n#EXTVLCOPT:http-referrer=${this.httpReferrer}` + if (this.referrer) { + output += `\n#EXTVLCOPT:http-referrer=${this.referrer}` } - if (this.httpUserAgent) { - output += `\n#EXTVLCOPT:http-user-agent=${this.httpUserAgent}` + if (this.userAgent) { + output += `\n#EXTVLCOPT:http-user-agent=${this.userAgent}` } output += `\n${this.url}` @@ -379,7 +382,11 @@ function escapeRegExp(text) { return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&') } -function parseQuality(quality: string): { verticalResolution: number; isInterlaced: boolean } { +function parseQuality(quality: string | null): { + verticalResolution: number | null + isInterlaced: boolean | null +} { + if (!quality) return { verticalResolution: null, isInterlaced: null } let [, verticalResolutionString] = quality.match(/^(\d+)/) || [null, undefined] const isInterlaced = /i$/i.test(quality) let verticalResolution = 0 diff --git a/scripts/models/subdivision.ts b/scripts/models/subdivision.ts index d6795fea33..b43d1c88d7 100644 --- a/scripts/models/subdivision.ts +++ b/scripts/models/subdivision.ts @@ -1,26 +1,41 @@ +import { SubdivisionData, SubdivisionSerializedData } from '../types/subdivision' import { Dictionary } from '@freearhey/core' import { Country } from '.' -type SubdivisionData = { - code: string - name: string - country: string -} - export class Subdivision { code: string name: string countryCode: string country?: Country - constructor(data: SubdivisionData) { + constructor(data?: SubdivisionData) { + if (!data) return + this.code = data.code this.name = data.name this.countryCode = data.country } - withCountry(countriesGroupedByCode: Dictionary): this { - this.country = countriesGroupedByCode.get(this.countryCode) + withCountry(countriesKeyByCode: Dictionary): this { + this.country = countriesKeyByCode.get(this.countryCode) + + return this + } + + serialize(): SubdivisionSerializedData { + return { + code: this.code, + name: this.name, + countryCode: this.code, + country: this.country ? this.country.serialize() : undefined + } + } + + deserialize(data: SubdivisionSerializedData): this { + this.code = data.code + this.name = data.name + this.countryCode = data.countryCode + this.country = data.country ? new Country().deserialize(data.country) : undefined return this } diff --git a/scripts/models/timezone.ts b/scripts/models/timezone.ts index b519f0e06b..e4071138fe 100644 --- a/scripts/models/timezone.ts +++ b/scripts/models/timezone.ts @@ -18,8 +18,8 @@ export class Timezone { this.countryCodes = new Collection(data.countries) } - withCountries(countriesGroupedByCode: Dictionary): this { - this.countries = this.countryCodes.map((code: string) => countriesGroupedByCode.get(code)) + withCountries(countriesKeyByCode: Dictionary): this { + this.countries = this.countryCodes.map((code: string) => countriesKeyByCode.get(code)) return this } diff --git a/scripts/types/blocklistRecord.d.ts b/scripts/types/blocklistRecord.d.ts new file mode 100644 index 0000000000..4b1d9e7dc8 --- /dev/null +++ b/scripts/types/blocklistRecord.d.ts @@ -0,0 +1,5 @@ +export type BlocklistRecordData = { + channel: string + reason: string + ref: string +} diff --git a/scripts/types/category.d.ts b/scripts/types/category.d.ts new file mode 100644 index 0000000000..e78d6c62ed --- /dev/null +++ b/scripts/types/category.d.ts @@ -0,0 +1,9 @@ +export type CategorySerializedData = { + id: string + name: string +} + +export type CategoryData = { + id: string + name: string +} diff --git a/scripts/types/channel.d.ts b/scripts/types/channel.d.ts new file mode 100644 index 0000000000..1f9d031cb1 --- /dev/null +++ b/scripts/types/channel.d.ts @@ -0,0 +1,52 @@ +import { Collection } from '@freearhey/core' +import type { CountrySerializedData } from './country' +import type { SubdivisionSerializedData } from './subdivision' +import type { CategorySerializedData } from './category' + +export type ChannelSerializedData = { + id: string + name: string + altNames: string[] + network?: string + owners: string[] + countryCode: string + country?: CountrySerializedData + subdivisionCode?: string + subdivision?: SubdivisionSerializedData + cityName?: string + categoryIds: string[] + categories?: CategorySerializedData[] + isNSFW: boolean + launched?: string + closed?: string + replacedBy?: string + website?: string + logo: string +} + +export type ChannelData = { + id: string + name: string + alt_names: string[] + network: string + owners: Collection + country: string + subdivision: string + city: string + categories: Collection + is_nsfw: boolean + launched: string + closed: string + replaced_by: string + website: string + logo: string +} + +export type ChannelSearchableData = { + id: string + name: string + altNames: string[] + guideNames: string[] + streamNames: string[] + feedFullNames: string[] +} diff --git a/scripts/types/country.d.ts b/scripts/types/country.d.ts new file mode 100644 index 0000000000..9554d4c68c --- /dev/null +++ b/scripts/types/country.d.ts @@ -0,0 +1,20 @@ +import type { LanguageSerializedData } from './language' +import type { SubdivisionSerializedData } from './subdivision' +import type { RegionSerializedData } from './region' + +export type CountrySerializedData = { + code: string + name: string + flag: string + languageCode: string + language: LanguageSerializedData | null + subdivisions: SubdivisionSerializedData[] + regions: RegionSerializedData[] +} + +export type CountryData = { + code: string + name: string + lang: string + flag: string +} diff --git a/scripts/types/dataLoader.d.ts b/scripts/types/dataLoader.d.ts new file mode 100644 index 0000000000..05742ff9d1 --- /dev/null +++ b/scripts/types/dataLoader.d.ts @@ -0,0 +1,19 @@ +import { Storage } from '@freearhey/core' + +export type DataLoaderProps = { + storage: Storage +} + +export type DataLoaderData = { + countries: object | object[] + regions: object | object[] + subdivisions: object | object[] + languages: object | object[] + categories: object | object[] + blocklist: object | object[] + channels: object | object[] + feeds: object | object[] + timezones: object | object[] + guides: object | object[] + streams: object | object[] +} diff --git a/scripts/types/dataProcessor.d.ts b/scripts/types/dataProcessor.d.ts new file mode 100644 index 0000000000..1005ff5b23 --- /dev/null +++ b/scripts/types/dataProcessor.d.ts @@ -0,0 +1,27 @@ +import { Collection, Dictionary } from '@freearhey/core' + +export type DataProcessorData = { + blocklistRecordsGroupedByChannelId: Dictionary + subdivisionsGroupedByCountryCode: Dictionary + feedsGroupedByChannelId: Dictionary + guidesGroupedByStreamId: Dictionary + subdivisionsKeyByCode: Dictionary + countriesKeyByCode: Dictionary + languagesKeyByCode: Dictionary + streamsGroupedById: Dictionary + categoriesKeyById: Dictionary + timezonesKeyById: Dictionary + regionsKeyByCode: Dictionary + blocklistRecords: Collection + channelsKeyById: Dictionary + subdivisions: Collection + categories: Collection + countries: Collection + languages: Collection + timezones: Collection + channels: Collection + regions: Collection + streams: Collection + guides: Collection + feeds: Collection +} diff --git a/scripts/types/feed.d.ts b/scripts/types/feed.d.ts new file mode 100644 index 0000000000..5c6722dde2 --- /dev/null +++ b/scripts/types/feed.d.ts @@ -0,0 +1,12 @@ +import { Collection } from '@freearhey/core' + +export type FeedData = { + channel: string + id: string + name: string + is_main: boolean + broadcast_area: Collection + languages: Collection + timezones: Collection + video_format: string +} diff --git a/scripts/types/guide.d.ts b/scripts/types/guide.d.ts new file mode 100644 index 0000000000..63a6ecdb19 --- /dev/null +++ b/scripts/types/guide.d.ts @@ -0,0 +1,17 @@ +export type GuideSerializedData = { + channelId?: string + feedId?: string + siteDomain: string + siteId: string + siteName: string + languageCode: string +} + +export type GuideData = { + channel: string + feed: string + site: string + site_id: string + site_name: string + lang: string +} diff --git a/scripts/types/language.d.ts b/scripts/types/language.d.ts new file mode 100644 index 0000000000..2b9d4525c0 --- /dev/null +++ b/scripts/types/language.d.ts @@ -0,0 +1,9 @@ +export type LanguageSerializedData = { + code: string + name: string +} + +export type LanguageData = { + code: string + name: string +} diff --git a/scripts/types/region.d.ts b/scripts/types/region.d.ts new file mode 100644 index 0000000000..e6773429ee --- /dev/null +++ b/scripts/types/region.d.ts @@ -0,0 +1,13 @@ +export type RegionSerializedData = { + code: string + name: string + countryCodes: string[] + countries?: CountrySerializedData[] + subdivisions?: SubdivisionSerializedData[] +} + +export type RegionData = { + code: string + name: string + countries: string[] +} diff --git a/scripts/types/stream.d.ts b/scripts/types/stream.d.ts new file mode 100644 index 0000000000..667ad25861 --- /dev/null +++ b/scripts/types/stream.d.ts @@ -0,0 +1,10 @@ +export type StreamData = { + channel: string | null + feed: string | null + name: string | null + url: string + referrer: string | null + user_agent: string | null + quality: string | null + label: string | null +} diff --git a/scripts/types/subdivision.d.ts b/scripts/types/subdivision.d.ts new file mode 100644 index 0000000000..bf46831f72 --- /dev/null +++ b/scripts/types/subdivision.d.ts @@ -0,0 +1,12 @@ +export type SubdivisionSerializedData = { + code: string + name: string + countryCode: string + country?: CountrySerializedData +} + +export type SubdivisionData = { + code: string + name: string + country: string +} From 61b1b94aa8a41e979425d5c8c982ae96c703f08f Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Thu, 17 Apr 2025 03:34:38 +0300 Subject: [PATCH 14/40] Update playlists --- streams/ad.m3u | 4 +- streams/ae.m3u | 4 +- streams/am_ucom.m3u | 12 +- streams/am_vnet.m3u | 2 +- streams/ar.m3u | 16 +- streams/at.m3u | 4 +- streams/at_plutotv.m3u | 192 ++++++++--------- streams/at_samsung.m3u | 8 +- streams/au.m3u | 42 ++-- streams/au_samsung.m3u | 4 +- streams/ba.m3u | 4 +- streams/bo.m3u | 6 +- streams/br.m3u | 8 +- streams/br_pluto.m3u | 20 +- streams/br_samsung.m3u | 2 +- streams/by.m3u | 4 +- streams/bz_nexgen.m3u | 18 +- streams/ca.m3u | 12 +- streams/ca_pluto.m3u | 188 ++++++++--------- streams/ca_samsung.m3u | 4 +- streams/ch_samsung.m3u | 2 +- streams/cl.m3u | 2 +- streams/cn.m3u | 150 +++++++------- streams/cy.m3u | 8 +- streams/de.m3u | 22 +- streams/de_pluto.m3u | 194 +++++++++--------- streams/de_samsung.m3u | 2 +- streams/dk_samsung.m3u | 14 +- streams/do.m3u | 18 +- streams/ec.m3u | 4 +- streams/eg.m3u | 8 +- streams/es.m3u | 26 +-- streams/es_pluto.m3u | 66 +++--- streams/es_rakuten.m3u | 2 +- streams/es_samsung.m3u | 2 +- streams/et.m3u | 2 +- streams/fi_samsung.m3u | 2 +- streams/fr.m3u | 76 +++---- streams/fr_pluto.m3u | 152 +++++++------- streams/fr_rakuten.m3u | 18 +- streams/fr_samsung.m3u | 12 +- streams/gr.m3u | 18 +- streams/hk.m3u | 8 +- streams/in.m3u | 66 +++--- streams/in_samsung.m3u | 4 +- streams/ir.m3u | 10 +- streams/it.m3u | 38 ++-- streams/it_pluto.m3u | 86 ++++---- streams/it_samsung.m3u | 20 +- streams/jp_primehome.m3u | 2 +- streams/kh.m3u | 28 +-- streams/kr.m3u | 4 +- streams/kz.m3u | 6 +- streams/lk.m3u | 12 +- streams/ma.m3u | 6 +- streams/mc.m3u | 4 +- streams/md.m3u | 4 +- .../{mt_smash_plus.m3u => mt_smashplus.m3u} | 2 +- streams/mx.m3u | 10 +- streams/mx_pluto.m3u | 2 +- streams/my.m3u | 16 +- streams/nl_samsung.m3u | 14 +- streams/nz.m3u | 4 +- streams/nz_samsung.m3u | 4 +- streams/pe.m3u | 6 +- streams/pk.m3u | 2 +- streams/pl.m3u | 138 ++++++------- streams/ps.m3u | 4 +- streams/qa.m3u | 26 +-- streams/ru.m3u | 14 +- streams/ru_bonustv.m3u | 8 +- streams/ru_ntv.m3u | 10 +- streams/ru_rt.m3u | 6 +- ...ru_televizor-24.m3u => ru_televizor24.m3u} | 4 +- streams/ru_tvteleport.m3u | 2 +- streams/sa.m3u | 40 ++-- streams/se_samsung.m3u | 18 +- streams/sg.m3u | 4 +- streams/si_xploretv.m3u | 2 +- streams/sx.m3u | 12 +- streams/th.m3u | 6 +- streams/{th_v2h-cdn.m3u => th_v2hcdn.m3u} | 0 streams/tr.m3u | 122 +++++------ streams/ua.m3u | 2 +- streams/uk_bbc.m3u | 82 ++++---- streams/uk_pluto.m3u | 40 ++-- streams/uk_samsung.m3u | 10 +- streams/us.m3u | 70 +++---- streams/us_30a.m3u | 4 +- streams/us_cineversetv.m3u | 2 +- streams/us_firetv.m3u | 6 +- streams/us_klowdtv.m3u | 8 +- streams/us_moveonjoy.m3u | 120 +++++------ streams/us_pbs.m3u | 4 +- streams/us_pluto.m3u | 46 ++--- streams/us_samsung.m3u | 8 +- streams/us_stirr.m3u | 12 +- streams/us_thetvapp.m3u | 36 ++-- streams/us_tubi.m3u | 14 +- streams/us_tvpass.m3u | 72 +++---- streams/us_xumo.m3u | 18 +- streams/vn.m3u | 4 +- streams/za.m3u | 8 +- 103 files changed, 1347 insertions(+), 1347 deletions(-) rename streams/{mt_smash_plus.m3u => mt_smashplus.m3u} (96%) rename streams/{ru_televizor-24.m3u => ru_televizor24.m3u} (94%) rename streams/{th_v2h-cdn.m3u => th_v2hcdn.m3u} (100%) diff --git a/streams/ad.m3u b/streams/ad.m3u index 65ccf3b44e..890565403f 100644 --- a/streams/ad.m3u +++ b/streams/ad.m3u @@ -1,5 +1,5 @@ #EXTM3U -#EXTINF:-1 tvg-id="AndorraTV.ad",ATV (720p) -https://videos.rtva.ad/live/rtva/playlist.m3u8 #EXTINF:-1 tvg-id="AndorraTV.ad@Web",Andorra TV (1080p) https://live-edge-eu-1.cdn.enetres.net/56495F77FD124FECA75590A906965F2C022/live-3000/index.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad",ATV (720p) +https://videos.rtva.ad/live/rtva/playlist.m3u8 diff --git a/streams/ae.m3u b/streams/ae.m3u index c02c37de4d..e2435eabca 100644 --- a/streams/ae.m3u +++ b/streams/ae.m3u @@ -137,6 +137,8 @@ https://stream.skynewsarabia.com/ott/ott.m3u8 https://stream.skynewsarabia.com/hls/sna.m3u8 #EXTINF:-1 tvg-id="SkyNewsArabiaVertical.ae",Sky News Arabia (Portrait) (1280p) [Not 24/7] https://stream.skynewsarabia.com/vertical/vertical.m3u8 +#EXTINF:-1 tvg-id="SpacetoonArabic.ae",Spacetoon Arabic (1080p) +https://shd-gcp-live.edgenextcdn.net/live/bitmovin-spacetoon/d8382fb9ab4b2307058f12c7ea90db54/index.m3u8 #EXTINF:-1 tvg-id="Wanasah.ae",Wanasah (1080p) https://shls-wanasah-prod-dub.shahid.net/out/v1/c84ef3128e564b74a6a796e8b6287de6/index.m3u8 #EXTINF:-1 tvg-id="WatarRadio.ae",Watar Radio (1080p) @@ -155,5 +157,3 @@ https://vo-live.cdb.cdn.orange.com/Content/Channel/YASSportsChannel/HLS/index.m3 https://weyyak-live.akamaized.net/weyyak_zee_aflam/index.m3u8 #EXTINF:-1 tvg-id="ZeeAlwan.ae",Zee Alwan (720p) [Geo-blocked] https://weyyak-live.akamaized.net/weyyak_zee_alwan/index.m3u8 -#EXTINF:-1 tvg-id="SpacetoonArabic.ae",Spacetoon Arabic (1080p) -https://shd-gcp-live.edgenextcdn.net/live/bitmovin-spacetoon/d8382fb9ab4b2307058f12c7ea90db54/index.m3u8 diff --git a/streams/am_ucom.m3u b/streams/am_ucom.m3u index a8de4336f6..85ef908d44 100644 --- a/streams/am_ucom.m3u +++ b/streams/am_ucom.m3u @@ -2,7 +2,7 @@ #EXTINF:-1 tvg-id="5TV.am" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",5 ԹԻՎԻ (480p) [Not 24/7] #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148 http://ott-cdn.ucom.am/s6/index.m3u8 -#EXTINF:-1 tvg-id="" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",5 ԹԻՎԻ ՊԼՅՈՒՍ (480p) [Not 24/7] +#EXTINF:-1 tvg-id="5TV.am@SD" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",5 ԹԻՎԻ ՊԼՅՈՒՍ (480p) [Not 24/7] #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148 http://ott-cdn.ucom.am/s9/index.m3u8 #EXTINF:-1 tvg-id="AlJazeera.qa" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",Al Jazeera (480p) [Not 24/7] @@ -14,13 +14,13 @@ http://ott-cdn.ucom.am/s69/index.m3u8 #EXTINF:-1 tvg-id="AmediaPremium.ru" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",Amedia Premium (480p) [Not 24/7] #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148 http://ott-cdn.ucom.am/s64/index.m3u8 -#EXTINF:-1 tvg-id="BBCNewsEurope.uk" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",BBC World News (480p) [Not 24/7] +#EXTINF:-1 tvg-id="BBCNews.uk@Europe" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",BBC World News (480p) [Not 24/7] #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148 http://ott-cdn.ucom.am/s24/index.m3u8 #EXTINF:-1 tvg-id="BRIDGE.ru" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",BRIDGE (480p) [Not 24/7] #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148 http://ott-cdn.ucom.am/s34/index.m3u8 -#EXTINF:-1 tvg-id="DWDeutsch.de" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",Deutsche Welle (480p) [Not 24/7] +#EXTINF:-1 tvg-id="DW.de@Russian" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",Deutsche Welle (480p) [Not 24/7] #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148 http://ott-cdn.ucom.am/s26/index.m3u8 #EXTINF:-1 tvg-id="FastFunBox.nl" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",Fast&Fun Box (480p) [Not 24/7] @@ -35,7 +35,7 @@ http://ott-cdn.ucom.am/s29/index.m3u8 #EXTINF:-1 tvg-id="TiJi.ru" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",Tiji (480p) [Not 24/7] #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148 http://ott-cdn.ucom.am/s59/index.m3u8 -#EXTINF:-1 tvg-id="" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",Viju Sport (480p) [Not 24/7] +#EXTINF:-1 tvg-id="vijuPlusSport.ru@SD" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",Viju Sport (480p) [Not 24/7] #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148 http://ott-cdn.ucom.am/s38/index.m3u8 #EXTINF:-1 tvg-id="ATV.am" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",АTV ԱԹԻՎԻ (480p) [Not 24/7] @@ -119,7 +119,7 @@ http://ott-cdn.ucom.am/s20/index.m3u8 #EXTINF:-1 tvg-id="ShansonTV.ru" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",Шансон ТВ (480p) [Not 24/7] #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148 http://ott-cdn.ucom.am/s43/index.m3u8 -#EXTINF:-1 tvg-id="" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",ԱԶԱՏՈՒԹՅՈՒՆ ԹԻՎԻ (480p) [Not 24/7] +#EXTINF:-1 tvg-id="AzatutyunTV.am@SD" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",ԱԶԱՏՈՒԹՅՈՒՆ ԹԻՎԻ (480p) [Not 24/7] #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148 http://ott-cdn.ucom.am/s3/index.m3u8 #EXTINF:-1 tvg-id="Armenia1.am" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",ԱՐՄԵՆԻԱ (480p) [Not 24/7] @@ -140,7 +140,7 @@ http://ott-cdn.ucom.am/s7/index.m3u8 #EXTINF:-1 tvg-id="ATVTavaTV.am" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",ԹԱՎԱ ԹԻՎԻ (480p) [Not 24/7] #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148 http://ott-cdn.ucom.am/s53/index.m3u8 -#EXTINF:-1 tvg-id="" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",ԼԱՎՖՀԱՔ (480p) [Not 24/7] +#EXTINF:-1 tvg-id="FactorTV.am@SD" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",ԼԱՎՖՀԱՔ (480p) [Not 24/7] #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148 http://ott-cdn.ucom.am/s48/index.m3u8 #EXTINF:-1 tvg-id="ATVKhaghaliqTV.am" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML,like Gecko) Mobile/15E148",ԽԱՂԱԼԻՔ (480p) [Not 24/7] diff --git a/streams/am_vnet.m3u b/streams/am_vnet.m3u index eb314add24..c61bcbd396 100644 --- a/streams/am_vnet.m3u +++ b/streams/am_vnet.m3u @@ -23,7 +23,7 @@ https://stream01.vnet.am/DomKino/mono.m3u8 https://stream01.vnet.am/ZeeTV/mono.m3u8 #EXTINF:-1 tvg-id="CarouselInternational.ru",Карусель Int http://stream02.vnet.am/Karusel/mono.m3u8 -#EXTINF:-1 tvg-id="KinopremyeraHD.ru",Кинопремьера HD +#EXTINF:-1 tvg-id="Kinopremyera.ru@HD",Кинопремьера HD http://stream02.vnet.am/Kinopremera/mono.m3u8 #EXTINF:-1 tvg-id="KukhnyaTV.ru",Кухня ТВ HD http://stream01.vnet.am/KukhnyaTv/mono.m3u8 diff --git a/streams/ar.m3u b/streams/ar.m3u index b051df2b51..add4e13fd1 100644 --- a/streams/ar.m3u +++ b/streams/ar.m3u @@ -5,13 +5,13 @@ http://www.coninfo.net:1935/tvcinco/live1/playlist.m3u8 http://coninfo.net:1935/13maxhd/live13maxtvnuevo/playlist.m3u8 #EXTINF:-1 tvg-id="13MaxTelevision.ar",13Max Televisión (720p) http://coninfo.net:1935/13maxhd/live13maxtvnuevo_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="247CanaldeNoticias.ar" http-referrer="https://cn247.tv/",24/7 Canal de Noticias -#EXTVLCOPT:http-referrer=https://cn247.tv/ -https://panel.host-live.com:19360/cn247tv/passthru.m3u8 #EXTINF:-1 tvg-id="247CanaldeNoticias.ar",24/7 Canal de Noticias (720p) https://panel.dattalive.com/6605140/6605140/playlist.m3u8 #EXTINF:-1 tvg-id="247CanaldeNoticias.ar",24/7 Canal de Noticias (720p) https://panel.dattalive.com/6605140/smil:6605140.smil/playlist.m3u8 +#EXTINF:-1 tvg-id="247CanaldeNoticias.ar" http-referrer="https://cn247.tv/",24/7 Canal de Noticias +#EXTVLCOPT:http-referrer=https://cn247.tv/ +https://panel.host-live.com:19360/cn247tv/passthru.m3u8 #EXTINF:-1 tvg-id="A24.ar" http-user-agent="iPhone",A24 (720p) #EXTVLCOPT:http-user-agent=iPhone https://g1.vxral-hor.transport.edge-access.net/a15/ngrp:a24-100056_all/a24-100056.m3u8 @@ -181,7 +181,7 @@ https://stmv1.cnarlatam.com/cnardeportes2/cnardeportes2/playlist.m3u8 https://stmv1.cnarlatam.com/cnarnoticias/cnarnoticias/playlist.m3u8 #EXTINF:-1 tvg-id="CorrientesTV.ar",Corrientes TV (CTV) (720p) https://mediacp.hostradios.com.ar:19360/canal7/canal7.m3u8 -#EXTINF:-1 tvg-id="",Cosmos TV (720p) +#EXTINF:-1 tvg-id="CosmosTv.ar@SD",Cosmos TV (720p) https://tv.mediacp.eu:19360/cosmos/cosmos.m3u8 #EXTINF:-1 tvg-id="CPEtv.ar",CPEtv (720p) https://stream.arcast.live/cpe/ngrp:cpe_all/playlist.m3u8 @@ -189,9 +189,9 @@ https://stream.arcast.live/cpe/ngrp:cpe_all/playlist.m3u8 https://stmv1.cnarlatam.com/danncetv/danncetv/playlist.m3u8 #EXTINF:-1 tvg-id="DemosRadioVisual.ar",Demos Radio Visual (720p) https://panel.dattalive.com/8066/8066/playlist.m3u8 -#EXTINF:-1 tvg-id="DirecTVSports.ar",DirecTV Sports (480p) [Geo-blocked] +#EXTINF:-1 tvg-id="DirecTVSports.us@Panregional",DirecTV Sports (480p) [Geo-blocked] http://190.210.221.119/Processor3_9_chunklist_b1300000.m3u8 -#EXTINF:-1 tvg-id="DisneyJuniorLatinAmerica.ar",Disney Junior Latin America (480p) +#EXTINF:-1 tvg-id="DisneyJrLatinAmerica.ar@South",Disney Junior Latin America (480p) http://168.181.122.234:8000/play/a037/index.m3u8 #EXTINF:-1 tvg-id="ElHistonautaTV.ar",El Histonauta TV (360p) https://stmv1.cnarlatam.com/elhistonauta/elhistonauta/playlist.m3u8 @@ -333,11 +333,11 @@ https://stmv6.voxtvhd.com.br/cineaccion/cineaccion/playlist.m3u8 https://stmv6.voxtvhd.com.br/xtremaanimal/xtremaanimal/playlist.m3u8 #EXTINF:-1 tvg-id="XtremaAnime.ar",Xtrema Anime (360p) https://stmv1.cnarlatam.com/xtremaanime/xtremaanime/playlist.m3u8 +#EXTINF:-1 tvg-id="XtremaCartoons.ar",Xtrema Cartoons (360p) +https://stmv1.cnarlatam.com/cineinfantil/cineinfantil/playlist.m3u8 #EXTINF:-1 tvg-id="XtremaCartoons.ar" http-referrer="https://xtrematv.com/?p=1390",Xtrema Cartoons #EXTVLCOPT:http-referrer=https://xtrematv.com/?p=1390 https://stmv6.voxtvhd.com.br/xtremacartoons/xtremacartoons/playlist.m3u8 -#EXTINF:-1 tvg-id="XtremaCartoons.ar",Xtrema Cartoons (360p) -https://stmv1.cnarlatam.com/cineinfantil/cineinfantil/playlist.m3u8 #EXTINF:-1 tvg-id="XtremaAccion.ar",Xtrema Cine Acción (268p) https://stmv1.cnarlatam.com/cineaccion/cineaccion/playlist.m3u8 #EXTINF:-1 tvg-id="XtremaAsia.ar",Xtrema Cine Asia (268p) diff --git a/streams/at.m3u b/streams/at.m3u index 205a855a6b..cbacd60ff3 100644 --- a/streams/at.m3u +++ b/streams/at.m3u @@ -27,9 +27,9 @@ https://bitcdn-kronehit.bitmovin.com/v2/hls/playlist.m3u8 https://streaming13.huberwebmedia.at/LiveApp/streams/985585225397790082777809.m3u8 #EXTINF:-1 tvg-id="Okto.at",Okto TV (1080p) https://cdn3.wowza.com/1/MHFtazJReW5rOFhP/N2NWNDZ2/hls/live/playlist.m3u8 -#EXTINF:-1 tvg-id="ORF1HD.at",ORF 1 HD +#EXTINF:-1 tvg-id="ORF1.at@HD",ORF 1 HD https://s6.hopslan.com/orfx11/index.m3u8 -#EXTINF:-1 tvg-id="ORF1HD.at" http-referrer="https://livestreamde.com/",ORF 1 HD +#EXTINF:-1 tvg-id="ORF1.at@HD" http-referrer="https://livestreamde.com/",ORF 1 HD #EXTVLCOPT:http-referrer=https://livestreamde.com/ https://strm.hdtvizlecanli.com/live/orf1.m3u8 #EXTINF:-1 tvg-id="ORF2.at",ORF 2 (720p) diff --git a/streams/at_plutotv.m3u b/streams/at_plutotv.m3u index 7c4f19ef3f..aaa84de83a 100644 --- a/streams/at_plutotv.m3u +++ b/streams/at_plutotv.m3u @@ -1,83 +1,83 @@ #EXTM3U -#EXTINF:-1 tvg-id="",48 Hours +#EXTINF:-1 tvg-id="48Hours.us@SD",48 Hours http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/651432fa98020f000878b407/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1c2b30-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2882b967-2b16-4fb7-ad00-ca48535d1336 -#EXTINF:-1 tvg-id="",90210 +#EXTINF:-1 tvg-id="90210.us@SD",90210 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a67dd13af63d0008257f17/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1c5240-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6e62cae5-9404-4e52-8b20-c5fc2b453e9d -#EXTINF:-1 tvg-id="",Action Sports +#EXTINF:-1 tvg-id="ActionSports.us@Austria",Action Sports http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5be1be871843b56328bc3ef1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1c5241-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5f4b1024-61ca-4918-b727-2ee2d9fe6398 #EXTINF:-1 tvg-id="",AKIBA PASS TV Anime: Sport http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/659e598ab9adc4000843c574/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1c5242-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=77cfb04f-c3c0-44b8-b6e2-07ddce76c467 #EXTINF:-1 tvg-id="",Alle hassen Chris http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/622f6e1e2792150007e0b2ff/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1c5243-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c4da2851-e246-4700-96b3-3b691764616a -#EXTINF:-1 tvg-id="",Anger Management +#EXTINF:-1 tvg-id="AngerManagementChannel.us@SD",Anger Management http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/655ca57e4261ca00080b3a04/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1c7950-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3058913d-2c94-48ef-9802-0dd55d2f6591 #EXTINF:-1 tvg-id="",Assassination Classroom http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a7d99f4a10d800086083a9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1c7951-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=21a7b417-879a-4f02-8497-8a823880cbe4 -#EXTINF:-1 tvg-id="",Auction Hunters +#EXTINF:-1 tvg-id="PlutoTVAuctionHunters.us@SD",Auction Hunters http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ede45d077746000072be0fe/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1c7952-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=419716ea-defd-40f9-9cfe-81ca78138875 #EXTINF:-1 tvg-id="",Auf Achse http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/61fbf91afb1b10000880dd08/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1c7953-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=579b45d5-6dd7-46c5-bf99-ff4de12ce423 -#EXTINF:-1 tvg-id="",Auto Motor Sport +#EXTINF:-1 tvg-id="AutoMotorogSportTV.no@SD",Auto Motor Sport http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f760c3d41aa2d0007bfde19/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1c7954-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=419fb478-b5bb-4f2f-b6f0-d53563fbc250 -#EXTINF:-1 tvg-id="",Avatar +#EXTINF:-1 tvg-id="PlutoTVAvatar.us@SD",Avatar http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/600adbdf8c554e00072125c9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1ca060-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c480aed6-08b6-4f7d-9964-40220005ecb8 #EXTINF:-1 tvg-id="",Avatar OV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65819d3514fbe4000880ef26/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1ca061-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ea746a7f-2da6-4da9-a6b9-0e2e862c7e09 #EXTINF:-1 tvg-id="",Awkward http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bc1784120ba80007935aaa/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1ca062-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=50a5387f-9836-4d86-abe5-44dbc233ba2e -#EXTINF:-1 tvg-id="",Baywatch +#EXTINF:-1 tvg-id="Baywatch.us@Austria",Baywatch http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65819e62b228b70008570e9f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1ca063-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f0769dd4-6475-4c1e-9a06-d8d9ec69d7b7 -#EXTINF:-1 tvg-id="",BBC Travel +#EXTINF:-1 tvg-id="BBCTravel.us@Austria",BBC Travel http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60e4519e6873180007d3cddb/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1ca064-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=12cb58bd-609a-4a2f-9905-c2bb4ea0def1 -#EXTINF:-1 tvg-id="",Becker +#EXTINF:-1 tvg-id="AlanBeckerTV.us@SD",Becker http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/630348a54c48ce00077eb6c7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1ca065-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c5b43dd2-234d-4338-9a94-c40967ccbed6 -#EXTINF:-1 tvg-id="",Bellator MMA +#EXTINF:-1 tvg-id="BellatorMMA.us@SD",Bellator MMA http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63ecbedda9957100089ca486/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cc770-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6ec515b7-6205-4240-a742-81047fffc0a2 -#EXTINF:-1 tvg-id="",Beverly Hills 90210 +#EXTINF:-1 tvg-id="BeverlyHills90210.us@Austria",Beverly Hills 90210 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60afb576053df900076fa2f0/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cc771-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7827fcde-c024-4bff-bf8d-b4c1683dc7e1 #EXTINF:-1 tvg-id="",Bewegte Männer http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64105834925bd50008f5cde5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cc772-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=568665d5-d73f-4d43-9de6-aa3b46e8ea1e -#EXTINF:-1 tvg-id="",Beyblade Burst +#EXTINF:-1 tvg-id="BeybladeBurst.us@Austria",Beyblade Burst http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b551ddcd25500072c4dad/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cc773-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=05241908-fcb3-42fc-9830-f854ff77aaee -#EXTINF:-1 tvg-id="",Big Time Rush +#EXTINF:-1 tvg-id="BigTimeRush.us@Austria",Big Time Rush http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/663385cd06839f0008e00e93/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cc774-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6d0aa27c-1d61-4798-84aa-6423e65a4423 -#EXTINF:-1 tvg-id="",Billiard TV +#EXTINF:-1 tvg-id="BilliardTV.us@SD",Billiard TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65df0cff66eec8000897b3a4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cc775-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=36e4c683-680e-486f-91f0-ce1f0f88c4b6 #EXTINF:-1 tvg-id="",Blaze und die Monstermaschinen http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b60419becf60008c841fd/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cc776-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6481e761-19c2-4479-848a-03b08cd2ee8e #EXTINF:-1 tvg-id="",Bloch Erklärt http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/654a2c1ff9cc82000867dada/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cc777-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=40dc222a-086b-4d8c-8483-24bd5b977178 -#EXTINF:-1 tvg-id="",Blue's Clues +#EXTINF:-1 tvg-id="BluesClues.us@Austria",Blue's Clues http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b564ff59d130007363823/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cee80-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d0bfaa97-78e4-4f29-a3cc-b77be2e970b1 -#EXTINF:-1 tvg-id="",Bubble Guppies +#EXTINF:-1 tvg-id="BubbleGuppies.us@Austria",Bubble Guppies http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b5a4bb7da5c0007e5c9e9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cee81-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=463074db-dca9-4056-97f7-eda9fddb9e5f #EXTINF:-1 tvg-id="",Car Chase http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a93a9d3af63d00082c4850/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cee82-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=851800ef-7ea9-4860-b74b-c1fdff346372 #EXTINF:-1 tvg-id="CBSNews247.us",CBS News 24/7 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62441d6ded1827000763dcda/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cee83-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4bddfb08-ac57-4769-a092-8bfc7ce71e23 -#EXTINF:-1 tvg-id="",CC Made in Germany +#EXTINF:-1 tvg-id="CCMadeinGermany.us@Austria",CC Made in Germany http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d4948418101147596fd6c5a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cee84-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b7523d3b-53d5-4c5c-a4fe-a4665e244aaa -#EXTINF:-1 tvg-id="",CC Pluto TV +#EXTINF:-1 tvg-id="CCPlutoTV.us@Austria",CC Pluto TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d4947590ba40f75dc29c26b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cee85-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d4f2b464-b492-46cb-a04f-1d92f4f0632a -#EXTINF:-1 tvg-id="",Chaos City +#EXTINF:-1 tvg-id="ChaosCity.us@Austria",Chaos City http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60afbad343e3840007164348/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cee86-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ca3136b0-37bd-40d7-b812-6644e5be773f -#EXTINF:-1 tvg-id="",Cheers +#EXTINF:-1 tvg-id="Cheers.us@Austria",Cheers http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/611e7f224676bf00076a4d8d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cee87-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=24ad2bd4-299f-4716-aef9-02a85807bad5 #EXTINF:-1 tvg-id="",Çilek Kokusu – Strawberry Smell http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/66338e3e23e24f000847f4ae/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cee88-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=318d5058-0a29-4217-9da2-b641ed31ba84 #EXTINF:-1 tvg-id="",Clarissa http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bc1957e4da730007195dc3/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1d1590-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=67b4ae5a-ee93-4db5-8ab7-942fde0da3c5 -#EXTINF:-1 tvg-id="",Clubbing TV +#EXTINF:-1 tvg-id="ClubbingTV.us@Austria",Clubbing TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f984784ccb4de0007dfad74/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1d1591-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f172947b-b59e-48be-9382-85fe6446e954 #EXTINF:-1 tvg-id="",Coast Guard http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64eddd96abcba80008d03b74/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1d1592-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3be8d0f6-8bc2-4821-8e4e-430339ab67d7 #EXTINF:-1 tvg-id="",Cold Blood http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/656064752c46f300087e9c99/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1d1593-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4e98d1a8-bfb1-4e2c-a957-60357c97ba15 -#EXTINF:-1 tvg-id="",Comedy Central South Park +#EXTINF:-1 tvg-id="ComedyCentralSouthPark.us@Austria",Comedy Central South Park http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60c716084d842c00085f6e64/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1d1594-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=fbd5d12a-3038-48f9-8f7c-5231014bff13 #EXTINF:-1 tvg-id="",Community http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6523ca21a70bf000081fe675/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1d1595-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=488f5c6e-5fba-4e0d-8b3b-85a58132944e -#EXTINF:-1 tvg-id="",Dark Matter +#EXTINF:-1 tvg-id="DarkMatterTV.us@SD",Dark Matter http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e843d849109b700075d5ada/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1d3ca0-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6893d11a-d794-409e-a9f2-0afb2b6100aa #EXTINF:-1 tvg-id="",Das Geheimnis der Hunters http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63d9107e60bc8f0008a1d9ed/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1d3ca1-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0e0f67f8-eeeb-4333-8628-2a462b668bd3 @@ -105,19 +105,19 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6447df8cd3fdde0008f1f627/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1d63b6-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=61fd0bc7-a796-4f7e-b012-6bced3a297ed #EXTINF:-1 tvg-id="",Dittsche http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/61fbfa1a9e38ec0007a395b7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1d8ac0-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=50fd83c9-2e3e-48ce-b2b1-1d1e71349c96 -#EXTINF:-1 tvg-id="",Dora TV +#EXTINF:-1 tvg-id="DoraTV.us@Austria",Dora TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e43c344b54fe800093552f4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1d8ac1-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e1016659-7172-477d-af6b-c71407ba2a5a #EXTINF:-1 tvg-id="",Drake & Josh http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a67c494a10d800085cab06/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1d8ac2-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=21f677bd-eae9-4c92-b0c5-ad664796ccf0 #EXTINF:-1 tvg-id="",Ein Engel auf Erden http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/622f487722d9d400075f74dd/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1d8ac3-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=afbd6aab-03f2-4c6e-8850-7a0f7f4a3a60 -#EXTINF:-1 tvg-id="",Emma einfach magisch! +#EXTINF:-1 tvg-id="EmmaeinfachmagischNick.us@Austria",Emma einfach magisch! http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f4796368174910007756454/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1d8ac4-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a05d126a-1903-4adf-85c8-55259cc392f6 -#EXTINF:-1 tvg-id="",Euronews +#EXTINF:-1 tvg-id="EuronewsGerman.fr@SD",Euronews http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6639d7d4b18d700008da5316/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1d8ac5-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c0d21e0b-3cc9-4c67-81b6-e33e50a7d888 #EXTINF:-1 tvg-id="",F.B.I. Files http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64eddce19001910008df22b8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1db1d0-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c68735b3-0d52-4773-a642-eee6dbdabda0 -#EXTINF:-1 tvg-id="",FailArmy +#EXTINF:-1 tvg-id="FailArmy.us@Austria",FailArmy http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ad9b7ffe738977e2c312133/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1db1d1-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=bc69234c-f1b7-4cf1-9e56-55b23f754867 #EXTINF:-1 tvg-id="",Familie Dr. Kleist http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65819f14b9adc4000813ee39/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1db1d2-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=10416fc7-977b-4991-89e7-52d2e7695c82 @@ -127,7 +127,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6305ca798bd95300072d2f93/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1db1d4-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4a90c28a-e616-4ce8-bd9d-18ee8820eede #EXTINF:-1 tvg-id="",Fluss-Monster http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62a0b2aff4cf470007e47e29/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1dd8e0-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b3b152b8-edcd-4f53-9fdd-0fec17368488 -#EXTINF:-1 tvg-id="",Frasier +#EXTINF:-1 tvg-id="Frasier.us@Austria",Frasier http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62cebf042ffc6d0007c4e59a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1dd8e1-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=93a1fd73-2968-4d81-b6fb-bcaca3db87db #EXTINF:-1 tvg-id="",Freitag Nacht News http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64be64070e086a0009d7b028/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1dd8e2-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=bed1f18d-fc72-4448-ac3d-a21b6f9f8603 @@ -139,23 +139,23 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/654a2bfeab05240008a12881/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1dd8e5-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5428c2f0-95ae-4119-99a3-e0051405de6c #EXTINF:-1 tvg-id="",Germany Shore http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6447dea7e94c380008dba94c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1dd8e6-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5f9f4951-a4da-4d64-b310-30e3d35efdca -#EXTINF:-1 tvg-id="",Goldstar TV +#EXTINF:-1 tvg-id="GoldstarTVGermany.us@Austria",Goldstar TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6192396135f3910007fc5fc7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1dfff0-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=95d4ef6d-a51e-4ee2-b6d2-bff9e219717f #EXTINF:-1 tvg-id="",Hausmeister Krause http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/622f6faf65be650007f57aab/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1dfff1-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b60059bd-5a20-4ba8-a7e8-cc258991073c #EXTINF:-1 tvg-id="",Hawaii Fünf-Null http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6349259d1d90320007fcb1d9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1dfff2-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=24e33583-0ad8-4b52-8d6c-5ebb6db17710 -#EXTINF:-1 tvg-id="",Hell's Kitchen +#EXTINF:-1 tvg-id="HellsKitchen.us@Austria",Hell's Kitchen http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/644257fe7cb4b100081ed874/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1dfff3-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7b7e432f-2d49-4cd8-8764-94e38b421dbb #EXTINF:-1 tvg-id="",Hot Ones http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/655ca3839d5ac400080d14ec/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1dfff4-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f4026554-ef22-4c86-818d-18371f9458ea #EXTINF:-1 tvg-id="",Hours to Kill – Zeitachse des Todes http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/656064e74261ca00081812a9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1dfff5-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a3ceee80-9777-46f1-8004-ade52d4f7837 -#EXTINF:-1 tvg-id="",iCarly +#EXTINF:-1 tvg-id="iCarly.us@Austria",iCarly http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b580a233dc90007f0cb9d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e2700-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=75f70a10-5059-4484-8b19-d938b9bca695 -#EXTINF:-1 tvg-id="",Ice Pilots +#EXTINF:-1 tvg-id="IcePilots.us@Austria",Ice Pilots http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ce40f42ba7f7f5ea9518fe1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e2701-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=222c4206-ad06-4ed1-92c8-8b5ca13adcdb -#EXTINF:-1 tvg-id="",Inspector Gadget +#EXTINF:-1 tvg-id="InspectorGadget.us@Austria",Inspector Gadget http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5dbc2d1ce10f0b0009e6cf9e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e2702-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=59ae8de3-09bd-422d-9912-76f3fb1aa47e #EXTINF:-1 tvg-id="",Instant Mom http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63905b9e799ff100077037a8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e2703-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6ec0fb93-30d5-400c-a147-18cbcd18cc80 @@ -169,77 +169,77 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65dde626ec9fda0008b3dc89/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e4e11-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=727569e6-65e5-4a22-95f4-4a49ad873452 #EXTINF:-1 tvg-id="",Kultkrimi: Derrick http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65dde5848145cb00083277f6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e4e12-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=861dbd89-f556-4111-ac1b-8aacc40bf6fb -#EXTINF:-1 tvg-id="",Love Boat +#EXTINF:-1 tvg-id="TheLoveBoat.us@SD",Love Boat http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/655ca3d1fbc15b00081f1186/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e4e13-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=157cb33e-83b4-4ce8-ab8f-4d9585e6e0dd -#EXTINF:-1 tvg-id="",Marco Polo TV +#EXTINF:-1 tvg-id="MarcoPoloTV.de@SD",Marco Polo TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65004cf398020f00084ca8bc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e4e14-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=86370235-72a6-4e96-963e-db24b49333fb -#EXTINF:-1 tvg-id="",Melrose Place +#EXTINF:-1 tvg-id="PlutoTVMelrosePlace.us@Austria",Melrose Place http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64be745340962900080b55e7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e4e15-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c700e9f8-bef8-4b22-a754-0920b9ce8f86 -#EXTINF:-1 tvg-id="",Mission Impossible +#EXTINF:-1 tvg-id="MissionImpossible.us@SD",Mission Impossible http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/634fe5afece2e60007c9d8b8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e7520-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=14cc27cc-2010-480a-b8ad-36e2575adbf7 -#EXTINF:-1 tvg-id="",Monster Jam +#EXTINF:-1 tvg-id="MonsterJam.pl@SD",Monster Jam http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65c33f833ef47d00084f47ad/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e7521-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8a8e6e9e-1da8-4436-9538-aa678b671447 #EXTINF:-1 tvg-id="",Mork vom Ork http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/642ad2127ef83900085f8910/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e7522-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c358ee19-09a9-48f7-87b3-c1f1cab9bcc0 -#EXTINF:-1 tvg-id="",Motorvision +#EXTINF:-1 tvg-id="Motorvision.de@SD",Motorvision http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6093f2ae4dd5ab0007d1ff9d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e7523-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3105f589-5bf9-41ef-8229-51bdf3abb1d2 -#EXTINF:-1 tvg-id="",MOVIEDOME +#EXTINF:-1 tvg-id="Moviedome.us@Austria",MOVIEDOME http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/615c1e5ce3039400070a0547/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e7524-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9855fa27-eb7c-4e5a-852e-4c439515c25d #EXTINF:-1 tvg-id="",Moviepilot TV mit Pluto TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a67d572fac9c000835eb3a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e9c30-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=78e36af2-8f00-409e-9fb6-605436ac888c -#EXTINF:-1 tvg-id="",MTV Catfish TV Show +#EXTINF:-1 tvg-id="MTVCatfishTVShow.us@Austria",MTV Catfish TV Show http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5db6a697d5f34a000934cd13/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1e9c32-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0e455fb2-5933-41b1-9dd6-9e67c05a465a -#EXTINF:-1 tvg-id="",MTV Music +#EXTINF:-1 tvg-id="MTVMusic.uk",MTV Music http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6245d15062cd1f00070a2338/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1ec342-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a56dace8-66e4-4b9a-a55f-d5348160dae2 -#EXTINF:-1 tvg-id="",MTV Pluto TV +#EXTINF:-1 tvg-id="MTVPlutoTV.us@Austria",MTV Pluto TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5caf325764025859afdd6c4d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1eea50-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d91aa96f-4975-4e0e-ae56-4a7f2e2383b7 -#EXTINF:-1 tvg-id="",MTV Ridiculousness +#EXTINF:-1 tvg-id="MTVRidiculousness.us@Austria",MTV Ridiculousness http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f9847fd513250000728a9a5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1eea52-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f7637460-bb95-4ce8-9c82-0af6b2f51601 -#EXTINF:-1 tvg-id="",MTV Serie +#EXTINF:-1 tvg-id="MTVSerie.us@Austria",MTV Serie http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/609536871db47700075a04bf/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1eea54-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8664f23e-3827-4ec7-8de0-6cd69b03e9a7 -#EXTINF:-1 tvg-id="",MTV Teen Mom +#EXTINF:-1 tvg-id="MTVTeenMom.us@Austria",MTV Teen Mom http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5cffcf5686dfe15595fb3f56/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1eea55-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7d2ddc91-5fb2-44c2-aeed-f44a38cfe217 -#EXTINF:-1 tvg-id="",MTV The Hills +#EXTINF:-1 tvg-id="MTVTheHills.us@Austria",MTV The Hills http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d00e86bf0bac55fe7f75736/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1eea56-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=09cf5ffd-9ee2-4173-a0c0-7fcbc8a58514 -#EXTINF:-1 tvg-id="",MTV The Shores +#EXTINF:-1 tvg-id="MTVTheShores.us@Austria",MTV The Shores http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5caf32c2a5068259a32320fc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f1160-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=fedd9a53-46f2-4eed-8ea9-ef20093e1a28 -#EXTINF:-1 tvg-id="",MTV Unplugged +#EXTINF:-1 tvg-id="MTVUnplugged.us@Austria",MTV Unplugged http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f98471110cca20007d39f76/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f1161-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4fc5aaef-19de-4b24-baea-08b5218c6735 #EXTINF:-1 tvg-id="",Myth Hunters http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63d90f828795f300086745b2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f1162-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1404d1db-ddc8-439e-bf14-97073a46e5b0 -#EXTINF:-1 tvg-id="",N24 Doku +#EXTINF:-1 tvg-id="N24DokuAustria.at@SD",N24 Doku http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60080e8a4bf36000076a81b1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f1163-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3c70bac9-b6d8-44d7-bde9-a992a6bfd7ab -#EXTINF:-1 tvg-id="",Naruto +#EXTINF:-1 tvg-id="Naruto.us@Austria",Naruto http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65d5fc39a25d5e00082895c4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f1164-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=91b30c33-90e6-47e3-95e6-a297bd00e5df #EXTINF:-1 tvg-id="",Nick Danger http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f51e6c34d6f40007f992a6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f1165-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7bb1fc8f-79c8-4723-a254-ea8861a1e55c -#EXTINF:-1 tvg-id="",Nick Pluto TV +#EXTINF:-1 tvg-id="NickPlutoTV.us@Austria",Nick Pluto TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ede448d3d50590007a4419e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f1166-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=13c43849-7db8-4ef1-bfef-74e513441e1a -#EXTINF:-1 tvg-id="",Nick Space +#EXTINF:-1 tvg-id="NickSpace.us@Austria",Nick Space http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/619b82cc70a9ba00074429e2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f3870-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=049a72e8-4188-4f01-bc67-f697b36df6c5 -#EXTINF:-1 tvg-id="",Nick Ukraine +#EXTINF:-1 tvg-id="NickelodeonUkrainePlutoTV.ua@SD",Nick Ukraine http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/622882350f6aad0008c76e77/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f3871-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=27a14e4a-a17d-41ca-bcdb-02eba6ccff9a #EXTINF:-1 tvg-id="",Nurse Jackie http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a67c7a07e03a00088de834/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f3872-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c6b94fdc-baed-40a3-bf48-79f151084f30 -#EXTINF:-1 tvg-id="",Pacific Blue +#EXTINF:-1 tvg-id="PacificBlue.us@Austria",Pacific Blue http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/642ad5bd283aa40008064568/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f3873-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=76852c45-b60e-4391-be78-4ff8ba5ee0ba #EXTINF:-1 tvg-id="",Parker Lewis – Der Coole von der Schule http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/650adbe0473a54000846ca0c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f3874-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=00d3c8c3-69fd-4245-a925-f82b3b8c0e03 #EXTINF:-1 tvg-id="",Pensacola – Flügel aus Stahl http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/655ca4b94261ca00080b38d2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f3875-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7ff305c6-7021-481f-90e3-c8c05fde5a04 -#EXTINF:-1 tvg-id="",Perry Mason +#EXTINF:-1 tvg-id="PerryMason.us@SD",Perry Mason http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64eddc3485efec00085b0369/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f3876-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=09f836b5-3c59-462d-95a2-726c229b62d4 #EXTINF:-1 tvg-id="",Pluto TV #1 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/640f4f4083f589000828a544/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f5f80-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=209bc9a8-6a89-4df5-8505-6fdda8f8ab81 -#EXTINF:-1 tvg-id="",Pluto TV Animals +#EXTINF:-1 tvg-id="PlutoTVAnimals.us@Austria",Pluto TV Animals http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d767ae7b456c8cf265ce922/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f5f81-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3c749ba3-753d-4787-aa99-051f1037b6b3 -#EXTINF:-1 tvg-id="",Pluto TV Anime +#EXTINF:-1 tvg-id="PlutoTVAnime.us@Austria",Pluto TV Anime http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/608181d420fc8500075f612a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f5f82-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=95e1f29c-bf6d-41bb-9fce-486049aaae5d -#EXTINF:-1 tvg-id="",Pluto TV Biografie +#EXTINF:-1 tvg-id="PlutoTVBiografie.us@Austria",Pluto TV Biografie http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/61409b5108ae6e0007f9b189/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f5f83-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f7ab62ef-4c23-4d96-b377-28d2ed0a7fc6 #EXTINF:-1 tvg-id="",Pluto TV Camp http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/661801e871e8c30008a73f7b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f5f84-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d25e56fe-f75b-4794-9fb0-aaa77b92c3b1 -#EXTINF:-1 tvg-id="",Pluto TV Crime +#EXTINF:-1 tvg-id="PlutoTVCrime.us@Austria",Pluto TV Crime http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e7b6c60fd20c50007910bf5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f5f85-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=60109df1-c88c-4c39-8421-b4c57f3078c4 #EXTINF:-1 tvg-id="",Pluto TV Crime on the beach http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/666c2b8761a39900088f0c89/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f5f86-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8089d8b1-cb6b-487e-a704-743aeedab3bb @@ -247,71 +247,71 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/66 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/630e00c065cfc10007c6e06b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f8690-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f5cb1d4b-78b7-49ae-9323-87ef9ddac228 #EXTINF:-1 tvg-id="",Pluto TV Dizikolik http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/650b064ad1f20c000856a5a4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f8691-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=077bb2b8-6d10-47d4-8daa-28e77c432aad -#EXTINF:-1 tvg-id="",Pluto TV Documentaries +#EXTINF:-1 tvg-id="PlutoTVDocumentaries.us@Austria",Pluto TV Documentaries http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5db048f9447d6c0009b8f29d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f8692-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f06a3246-35e9-4b16-85ba-af89649179db -#EXTINF:-1 tvg-id="",Pluto TV Explore +#EXTINF:-1 tvg-id="PlutoTVExplore.us@Austria",Pluto TV Explore http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ad9b8551b95267e225e59c1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f8693-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=bf2169a4-2ef0-4804-81ed-f3c18de5f07c -#EXTINF:-1 tvg-id="",Pluto TV Food +#EXTINF:-1 tvg-id="PlutoTVFood.us@Austria",Pluto TV Food http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5dc280c9aa218c0009724b4b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f8694-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=84eca92a-b9f7-4788-9295-f3ac89ca3948 #EXTINF:-1 tvg-id="",Pluto TV heiße Nächte http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64526a145a0cd50008632bfa/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f8695-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2a24ebf3-f97e-463b-8588-59963d9183fe -#EXTINF:-1 tvg-id="",Pluto TV History +#EXTINF:-1 tvg-id="PlutoTVHistory.us@Austria",Pluto TV History http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d767b1c126c65d0a307355f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1f8696-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=48a854a2-55e8-45ea-9da1-dc34e62691ed -#EXTINF:-1 tvg-id="",Pluto TV Home +#EXTINF:-1 tvg-id="PlutoTVHome.us@Austria",Pluto TV Home http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5eb96303f5bb020008e7e44f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1fada0-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ede1cd55-a9ba-4c6b-b9b8-13f955d178da -#EXTINF:-1 tvg-id="",Pluto TV Horror +#EXTINF:-1 tvg-id="PlutoTVHorror.us@Austria",Pluto TV Horror http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f4f4b88157cf00075c22db/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1fada1-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=98b1a14f-8335-48c9-a8f3-2e1926d24a7e -#EXTINF:-1 tvg-id="",Pluto TV Indies +#EXTINF:-1 tvg-id="PlutoTVIndies.us@Austria",Pluto TV Indies http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ce40e59246a395e9758923e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1fada2-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b34deef6-b94f-4078-bba5-a4956162fff7 -#EXTINF:-1 tvg-id="",Pluto TV Kids +#EXTINF:-1 tvg-id="PlutoTVKids.us@Austria",Pluto TV Kids http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ad9b648e738977e2c312131/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1fada3-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f7c2181e-b38a-44dc-b46f-bce29df214e8 #EXTINF:-1 tvg-id="",Pluto TV Kino Filme http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63c9430af13a9b000786422a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1fada4-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=df22680c-4463-447d-96d2-2963eae5cc1b #EXTINF:-1 tvg-id="",Pluto TV Knallhart http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65004605110545000842035d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1fada5-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=cba5d6e1-43a7-4ec8-9d78-67dbcdf7c324 -#EXTINF:-1 tvg-id="",Pluto TV Kultfilme +#EXTINF:-1 tvg-id="PlutoTVKultfilme.us@Austria",Pluto TV Kultfilme http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5dde47b63585b500099f74ec/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1fd4b0-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=03130bd3-7919-4831-bc2e-4f5c3b202f88 #EXTINF:-1 tvg-id="",Pluto TV liebt John Wayne http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65ef0f9d2873090008be19df/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1fd4b1-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e8ba2b60-be98-43fa-888b-819568fed937 -#EXTINF:-1 tvg-id="",Pluto TV Lives +#EXTINF:-1 tvg-id="PlutoTVLives.us@Austria",Pluto TV Lives http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5db04b360fa2560009deb3de/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1fd4b2-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b593fd23-3248-4f50-a183-67fb2ea074d7 #EXTINF:-1 tvg-id="",Pluto TV Maschinen http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/655ca662fbc15b00081f18fc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1fd4b3-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=be332bdc-17a6-43dd-a2b3-d0b0027370d2 -#EXTINF:-1 tvg-id="",Pluto TV Movies +#EXTINF:-1 tvg-id="PlutoTVMovies.us@Austria",Pluto TV Movies http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5c5c3b948002db3c3e0b262e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1fd4b4-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c0b9dcc7-8579-47a9-a718-88e7ec066b8a -#EXTINF:-1 tvg-id="",Pluto TV Mystery +#EXTINF:-1 tvg-id="PlutoTVMystery.us@Austria",Pluto TV Mystery http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/617aad99b68ef100072608cd/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1ffbc0-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=19b60fec-0997-451e-bdc1-b8a92cd099cf -#EXTINF:-1 tvg-id="",Pluto TV Nature +#EXTINF:-1 tvg-id="PlutoTVNature.us@Austria",Pluto TV Nature http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5be1c3f9851dd5632e2c91b2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1ffbc1-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e79c49d9-6474-4184-9d9d-a3633162a2cc -#EXTINF:-1 tvg-id="",Pluto TV Paranormal +#EXTINF:-1 tvg-id="PlutoTVParanormal.us@Austria",Pluto TV Paranormal http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f98487036af340008da1e37/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1ffbc2-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4f60ee0b-b8ee-4fd5-b67b-d928a7e37591 #EXTINF:-1 tvg-id="",Pluto TV Polizeiserien http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64be64445dc166000899ce75/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1ffbc3-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=52239dde-3e69-4840-8825-c224d9ed739a #EXTINF:-1 tvg-id="",Pluto TV Power Frauen http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/625423185e237b0007f6764e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1ffbc4-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1492fdd4-7af0-4237-b80b-620bca3a3744 -#EXTINF:-1 tvg-id="",Pluto TV Retro Toons +#EXTINF:-1 tvg-id="PlutoTVRetroToons.us@Austria",Pluto TV Retro Toons http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e1c669094e0e80009b22ab8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1ffbc5-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8efd4907-a904-41c6-9f0d-2a48b4c8f716 -#EXTINF:-1 tvg-id="",Pluto TV Romance +#EXTINF:-1 tvg-id="PlutoTVRomance.us@Austria",Pluto TV Romance http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5dc287ce3086a20009f5024c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1ffbc6-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=fb4888c5-7223-4af0-9aec-f74be7f97304 -#EXTINF:-1 tvg-id="",Pluto TV Sci-Fi +#EXTINF:-1 tvg-id="PlutoTVSciFi.us@Austria",Pluto TV Sci-Fi http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60ed498c4248a400077c0b9d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b2022d0-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7622190c-0c5d-4225-bfd1-46b7e034e788 -#EXTINF:-1 tvg-id="",Pluto TV Science +#EXTINF:-1 tvg-id="PlutoTVScience.us@Austria",Pluto TV Science http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d767b4889bca2ce7b73ef2e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b2022d1-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d9359c6b-8339-43a0-b9ee-5200b879ac5f -#EXTINF:-1 tvg-id="",Pluto TV Serie +#EXTINF:-1 tvg-id="PlutoTVSerie.us@Austria",Pluto TV Serie http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5dc190f7bfed110009d934c3/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b2022d2-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e7d734a7-ff35-48a1-bfca-2a48e9148931 -#EXTINF:-1 tvg-id="",Pluto TV Serie+ +#EXTINF:-1 tvg-id="PlutoTVSeriePlus.us@Austria",Pluto TV Serie+ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ddbf866b1862a0009a0648e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b2022d3-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3c45133a-b485-4c8a-a556-fac780df716a -#EXTINF:-1 tvg-id="",Pluto TV Sitcoms +#EXTINF:-1 tvg-id="PlutoTVSitcoms.us@Austria",Pluto TV Sitcoms http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d767ab2b456c8cf265ce921/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b2022d4-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f2671c6a-031c-4fa0-bb07-e94c2b5d08db #EXTINF:-1 tvg-id="",Pluto TV Sitcoms+ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5cd149f021cb6c55e258bbe8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b2022d5-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8eb7e943-84dc-455f-837c-5a289cb58234 -#EXTINF:-1 tvg-id="",Pluto TV Space +#EXTINF:-1 tvg-id="PlutoTVSpace.us@Austria",Pluto TV Space http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/61409f8d6feb30000766b675/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b2022d6-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=23eefcec-8774-42a3-8e77-66e6e59575a3 -#EXTINF:-1 tvg-id="",Pluto TV Star Trek +#EXTINF:-1 tvg-id="PlutoTVStarTrek.us@Austria",Pluto TV Star Trek http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6152ee71bf99590007893a11/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b2049e0-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a5c84cd3-495f-49d7-8e48-a79af0d219fc -#EXTINF:-1 tvg-id="",Pluto TV True Crime +#EXTINF:-1 tvg-id="PlutoTVTrueCrime.us@Austria",Pluto TV True Crime http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/615333098185f00008715a56/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b2049e1-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=03c264ad-dc34-4e0b-b96f-6cfb4c0f6b37 -#EXTINF:-1 tvg-id="",Pluto TV Western +#EXTINF:-1 tvg-id="PlutoTVWesterns.us@Austria",Pluto TV Western http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/630dd3b2605f140007e002f5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b2049e2-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=59d31236-c94c-43d9-a034-2227dea980c8 #EXTINF:-1 tvg-id="",Pluto TV: Mehr Star Trek http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6500464a3a0d700008b3ce19/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b2049e3-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0339ad23-688e-46c8-84bd-aa793675ab2a @@ -337,7 +337,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/66 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64be635a40962900080aaca5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b209802-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=dd3f1fc3-4840-421b-aa93-6670bb219b9a #EXTINF:-1 tvg-id="",Sabrina Total verhext! http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/622f40c901d4b70007ad7609/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b209803-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=65054aae-377a-4ff9-a879-77d94991662b -#EXTINF:-1 tvg-id="",Sam & Cat +#EXTINF:-1 tvg-id="SamCat.us@Austria",Sam & Cat http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b5ba20af628000707cee3/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b209804-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9b8168f5-39de-4bfb-b7c6-79d7d063f516 #EXTINF:-1 tvg-id="",Schitt's Creek: David & Patrick! http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/665f01b8a3865300086a233c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b209805-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=201f4491-8b23-42b0-b090-7850461f7489 @@ -347,7 +347,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/660e97bce8fba8000853d43f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b20bf11-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2bea8df6-8889-4d5b-92d5-8efb963516a7 #EXTINF:-1 tvg-id="",See Dad Run http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63905bcb0f41d200073e05ff/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b20bf12-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=27c86e06-12dd-4459-9fb4-45674d793f3b -#EXTINF:-1 tvg-id="",Simsalabim Sabrina +#EXTINF:-1 tvg-id="SimsalabimSabrina.us@Austria",Simsalabim Sabrina http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5dbc327d0451770009ed7577/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b20bf13-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=157adeb4-870e-458e-ad89-97961b17a971 #EXTINF:-1 tvg-id="",South Park: Butters Collection http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/646b14a0e94c3800082a8d3a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b20bf14-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8115cdeb-f9c4-4c3e-905a-9b4869b09b43 @@ -371,17 +371,17 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/66794444efa2a10008ca1b16/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b210d31-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d36c9d60-208a-4d82-be2d-12e67e99658d #EXTINF:-1 tvg-id="",SpongeBob OV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/667944cb63a5f20008df6ad4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b210d32-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=69c604ea-558a-45f0-9056-c41927d4a24f -#EXTINF:-1 tvg-id="",SpongeBob Schwammkopf +#EXTINF:-1 tvg-id="SpongeBobSchwammkopf.us@Austria",SpongeBob Schwammkopf http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d00e8adaab96b5635b2a005/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b210d33-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d0e90d58-c732-45e6-912f-8699db8e3f73 #EXTINF:-1 tvg-id="",Star Trek: Deep Space Nine http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a67d200c7ff50008cb131a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b210d34-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=35795be0-a9bf-4b10-b542-2134b369c86c #EXTINF:-1 tvg-id="",Storage Wars: Canada http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ede464e7be0030007c58b73/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b210d35-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9e6c7cd6-f0e1-4eec-af2e-bc8a057fa543 -#EXTINF:-1 tvg-id="",Strongman +#EXTINF:-1 tvg-id="Strongman.us@Austria",Strongman http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e1452156c07b50009d0230e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b210d36-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a45c300a-b53b-4594-bf5f-64b95aceeedf #EXTINF:-1 tvg-id="",Sünger Bob Kare Pantolon http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/667943a322acab00089fbd58/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b213440-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5fcc16f3-da14-4c8f-b61b-b54d852d1b90 -#EXTINF:-1 tvg-id="",Takeshi's Castle +#EXTINF:-1 tvg-id="TakeshisCastle.us@Austria",Takeshi's Castle http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6054a9f4bc8a5f000771504c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b213441-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=621a6d64-aa90-4bb5-9cb4-9d6dd56346f0 #EXTINF:-1 tvg-id="",Täterjagd http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/642abea1283aa4000805bb5b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b213442-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1a665728-c91b-4a5c-84e7-f3f2da5c60cc @@ -395,9 +395,9 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/651e94c930876e000840eb50/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b213446-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=39046ae0-026d-4be3-b95c-b618c6adfd56 #EXTINF:-1 tvg-id="",The Twilight Zone http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64c8dd94e4391c0008eb4742/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b215b50-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ce626662-10d9-4ee9-b61c-1b0dc991c421 -#EXTINF:-1 tvg-id="",Top Gear +#EXTINF:-1 tvg-id="TopGear.uk@SD",Top Gear http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64c109735dc1660008a4a2dc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b215b51-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=55fb26fd-5dba-40cd-a0b1-8de7d0f78acb -#EXTINF:-1 tvg-id="",Totally Turtles +#EXTINF:-1 tvg-id="TotallyTurtles.us@Austria",Totally Turtles http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d6792bd6be2998ad0ccce30/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b215b52-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5daca1df-3fee-4d6a-bb51-db90cf28ee93 #EXTINF:-1 tvg-id="",Totally Turtles (OV) http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ea816a44457070007ffabc7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b215b53-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8980aa41-76aa-4ed3-a9a5-b5277d21bd7f @@ -413,7 +413,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/650adb92a1217e00091a3eff/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b218260-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=bdb2ca65-615b-4a1e-a8ec-be86523999bd #EXTINF:-1 tvg-id="",V.I.P. – Die Bodyguards http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/650adc0ba1217e00091a3f4e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b218261-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2eda722d-72e0-4a7f-acd2-56c1091039c3 -#EXTINF:-1 tvg-id="",Victorious +#EXTINF:-1 tvg-id="Victorious.us@Austria",Victorious http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b5e43f294f8000793c3d7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b218262-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=42b72c59-dd76-43ab-b435-b2cd12dd6ed1 #EXTINF:-1 tvg-id="",Viper http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/642ad6a5aa2d690008ea6d96/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b218263-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0162be0e-f4f2-43a7-b854-e6dce2dd1d3d @@ -429,11 +429,11 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65b38e310d9ab400082bdec2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b21a972-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c1cbb732-a288-42c2-880c-f5720ef18b87 #EXTINF:-1 tvg-id="",Wipeout (OV) http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5eb963c98ec06d00077d63cb/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b21a973-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=640d13de-006c-40b6-b432-f8a940e9fe4e -#EXTINF:-1 tvg-id="",World Poker Tour +#EXTINF:-1 tvg-id="WorldPokerTour.us@Austria",World Poker Tour http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ad9b7aae738977e2c312132/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b21a974-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=97bdb4b6-f530-4173-966d-19421ac303a0 #EXTINF:-1 tvg-id="",X-Factor: Das Unfassbare http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/642d7e029189ce0008958af5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b21d080-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=41684c81-e96d-4d50-865f-cb932d6c290f -#EXTINF:-1 tvg-id="",Yu-Gi-Oh! +#EXTINF:-1 tvg-id="YuGiOh.us@SD",Yu-Gi-Oh! http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/642d4493aa2d690008f0a03f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b21d081-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1ca5a27f-794c-41ee-b51a-6fbe1b093d0b #EXTINF:-1 tvg-id="",Yüksek Sosyete – High Society http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/66338ce79e68c20008b7e00f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b21d082-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1c94eec0-745e-46a0-91dc-c92ebe00cd91 diff --git a/streams/at_samsung.m3u b/streams/at_samsung.m3u index 2de621953d..3a8e3a1e93 100644 --- a/streams/at_samsung.m3u +++ b/streams/at_samsung.m3u @@ -1,9 +1,9 @@ #EXTM3U -#EXTINF:-1 tvg-id="RakutenTVActionMovies.at",Rakuten TV Action Movies Austria (720p) +#EXTINF:-1 tvg-id="RakutenTVActionMovies.es@Austria",Rakuten TV Action Movies Austria (720p) https://0f846627524f4dd2995e93581379db82.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Samsung-at_RakutenActionMovies-1/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVComedyMovies.at",Rakuten TV Comedy Movies Austria (720p) +#EXTINF:-1 tvg-id="RakutenTVComedyMovies.es@Austria",Rakuten TV Comedy Movies Austria (720p) https://7ed752b220a441b7b22bdf697c6c4df8.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Samsung-at_RakutenComedyMovies-1/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVDramaMovies.at",Rakuten TV Drama Movies Austria (720p) +#EXTINF:-1 tvg-id="RakutenTVDramaMovies.es@Austria",Rakuten TV Drama Movies Austria (720p) https://df1aa472ff5b4780a8d91fe319778b4d.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Samsung-at_RakutenTVShows-1/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVFamilyMovies.at",Rakuten TV Family Movies Austria (720p) +#EXTINF:-1 tvg-id="RakutenTVFamilyMovies.es@Austria",Rakuten TV Family Movies Austria (720p) https://9fa8baba055e4a52b0a8d1ae7d78bed8.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Samsung-at_RakutenFamily-1/playlist.m3u8 diff --git a/streams/au.m3u b/streams/au.m3u index e2f2671013..5c041d0ef1 100644 --- a/streams/au.m3u +++ b/streams/au.m3u @@ -5,53 +5,53 @@ https://2gblive.akamaized.net/hls/live/2033805/2GB/index.m3u8 https://3awlive.akamaized.net/hls/live/2032295/3AW/index.m3u8 #EXTINF:-1 tvg-id="6PR.au",6PR Perth (1080p) https://6prlive.akamaized.net/hls/live/2033806/6PR/index.m3u8 -#EXTINF:-1 tvg-id="9GemSydney.au",9Gem (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="9Gem.au@Sydney",9Gem (720p) [Geo-blocked] https://9now-livestreams.akamaized.net/hls/live/2008311/gem-syd/master.m3u8 -#EXTINF:-1 tvg-id="9GoSydney.au",9Go! (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="9Go.au@Sydney",9Go! (720p) [Geo-blocked] https://9now-livestreams.akamaized.net/hls/live/2008312/go-syd/master.m3u8 -#EXTINF:-1 tvg-id="9LifeSydney.au",9Life (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="9Life.au@Sydney",9Life (720p) [Geo-blocked] https://9now-livestreams.akamaized.net/hls/live/2008313/life-syd/master.m3u8 -#EXTINF:-1 tvg-id="10BoldAdelaide.au",10 Bold Adelaide (1080p) +#EXTINF:-1 tvg-id="10Bold.au@Sydney",10 Bold Adelaide (1080p) https://dce3793146fef017.mediapackage.us-west-2.amazonaws.com/out/v1/55cdf73af7894775ba6de8f57482b66a/CMAF_HLS/index.m3u8 #EXTINF:-1 tvg-id="ABCAustralia.au",ABC Australia https://abc-news-dmd-streams-1.akamaized.net/out/v1/701126012d044971b3fa89406a440133/index.m3u8 -#EXTINF:-1 tvg-id="ABCMESydney.au",ABC Me (720p) +#EXTINF:-1 tvg-id="ABCME.au@Sydney",ABC Me (720p) https://c.mjh.nz/abc-me.m3u8 -#EXTINF:-1 tvg-id="ABCTVSA.au",ABC TV Adelaide (720p) +#EXTINF:-1 tvg-id="ABCTV.au@Adelaide",ABC TV Adelaide (720p) https://c.mjh.nz/abc-sa.m3u8 -#EXTINF:-1 tvg-id="ABCTVQLD.au",ABC TV Brisbane (720p) +#EXTINF:-1 tvg-id="ABCTV.au@Brisbane",ABC TV Brisbane (720p) https://c.mjh.nz/abc-qld.m3u8 -#EXTINF:-1 tvg-id="ABCTVACT.au",ABC TV Canberra (720p) +#EXTINF:-1 tvg-id="ABCTV.au",ABC TV Canberra (720p) https://c.mjh.nz/abc-act.m3u8 -#EXTINF:-1 tvg-id="ABCTVNT.au",ABC TV Darwin (720p) +#EXTINF:-1 tvg-id="ABCTV.au",ABC TV Darwin (720p) https://c.mjh.nz/abc-nt.m3u8 -#EXTINF:-1 tvg-id="ABCTVTAS.au",ABC TV Hobart (720p) +#EXTINF:-1 tvg-id="ABCTV.au@Hobart",ABC TV Hobart (720p) https://c.mjh.nz/abc-tas.m3u8 -#EXTINF:-1 tvg-id="ABCTVVIC.au",ABC TV Melbourne (720p) +#EXTINF:-1 tvg-id="ABCTV.au@Melbourne",ABC TV Melbourne (720p) https://c.mjh.nz/abc-vic.m3u8 -#EXTINF:-1 tvg-id="ABCTVWA.au",ABC TV Perth (720p) +#EXTINF:-1 tvg-id="ABCTV.au@Perth",ABC TV Perth (720p) https://c.mjh.nz/abc-wa.m3u8 -#EXTINF:-1 tvg-id="ABCTVPlusSydney.au",ABC TV Plus (720p) +#EXTINF:-1 tvg-id="ABCTVPlus.au@Sydney",ABC TV Plus (720p) https://c.mjh.nz/abc-tv-plus.m3u8 -#EXTINF:-1 tvg-id="ABCTVNSW.au",ABC TV Sydney (720p) +#EXTINF:-1 tvg-id="ABCTV.au@Sydney",ABC TV Sydney (720p) https://c.mjh.nz/abc-nsw.m3u8 #EXTINF:-1 tvg-id="AusbizTV.au",ausbiz TV (720p) [Not 24/7] https://d9quh89lh7dtw.cloudfront.net/public-output/index.m3u8 -#EXTINF:-1 tvg-id="BloombergTVAustralia.au",Bloomberg TV Australia (270p) +#EXTINF:-1 tvg-id="BloombergTV.us@Australia",Bloomberg TV Australia (270p) https://bloomberg.com/media-manifest/streams/aus.m3u8 #EXTINF:-1 tvg-id="C31Melbourne.au",C31 Melbourne (240p) https://d1k6kax80wecy5.cloudfront.net/RLnAKY/index.m3u8 -#EXTINF:-1 tvg-id="Channel7Sydney.au",Channel 7 (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="Channel7.au@Sydney",Channel 7 (720p) [Geo-blocked] https://npc.cdn.7livecloud.io/hls/live/SYD1/master.m3u8 -#EXTINF:-1 tvg-id="Channel9Adelaide.au",Channel 9 Adelaide (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="Channel9.au@Adelaide",Channel 9 Adelaide (720p) [Geo-blocked] https://9now-livestreams-fhd-t.akamaized.net/u/prod/simulcast/adl/ch9/hls/r1/index.m3u8 -#EXTINF:-1 tvg-id="Channel9Brisbane.au",Channel 9 Brisbane (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="Channel9.au@Brisbane",Channel 9 Brisbane (720p) [Geo-blocked] https://9now-livestreams-fhd-t.akamaized.net/u/prod/simulcast/bne/ch9/hls/r1/index.m3u8 -#EXTINF:-1 tvg-id="Channel9Melbourne.au",Channel 9 Melbourne (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="Channel9.au@Melbourne",Channel 9 Melbourne (720p) [Geo-blocked] https://9now-livestreams-fhd-t.akamaized.net/u/prod/simulcast/mel/ch9/hls/r1/index.m3u8 -#EXTINF:-1 tvg-id="Channel9Perth.au",Channel 9 Perth (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="Channel9.au@Perth",Channel 9 Perth (720p) [Geo-blocked] https://9now-livestreams-fhd-t.akamaized.net/u/prod/simulcast/per/ch9/hls/r1/index.m3u8 -#EXTINF:-1 tvg-id="Channel9Sydney.au",Channel 9 Sydney (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="Channel9.au@Sydney",Channel 9 Sydney (720p) [Geo-blocked] https://9now-livestreams-fhd-t.akamaized.net/u/prod/simulcast/syd/ch9/hls/r1/index.m3u8 #EXTINF:-1 tvg-id="Channel44.au",Channel 44 (480p) https://d1k6kax80wecy5.cloudfront.net/WFqZJc/index.m3u8 diff --git a/streams/au_samsung.m3u b/streams/au_samsung.m3u index f9c3a9ad16..f3bffe5272 100644 --- a/streams/au_samsung.m3u +++ b/streams/au_samsung.m3u @@ -5,7 +5,7 @@ https://hncfree-samsungau.amagi.tv/playlist.m3u8 https://insighttv-samsungau.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="InTrouble.nl",InTrouble (1080p) https://introuble-samsungau.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",InWild (720p) +#EXTINF:-1 tvg-id="InWild.it@SD",InWild (720p) https://inwild-samsungau.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="InWonder.nl",InWonder (720p) https://inwonder-samsungau.amagi.tv/playlist.m3u8 @@ -13,7 +13,7 @@ https://inwonder-samsungau.amagi.tv/playlist.m3u8 https://rialto-rialto-samsungaustralia.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="RyanandFriends.us",Ryan and Friends (1080p) https://ryanandfriends-samsungau.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="Tastemade.au",Tastemade Australia (1080p) +#EXTINF:-1 tvg-id="Tastemade.us@Australia",Tastemade Australia (1080p) https://tmint-aus-samsungau.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="TraceSportStars.fr",Trace Sport Stars (Australia) (1080p) https://lightning-tracesport-samsungau.amagi.tv/playlist.m3u8 diff --git a/streams/ba.m3u b/streams/ba.m3u index dfcc434edb..847add6c6f 100644 --- a/streams/ba.m3u +++ b/streams/ba.m3u @@ -13,6 +13,8 @@ https://restreamer1.tnt.ba/hls/kanal6.m3u8 https://webtvstream.bhtelecom.ba/malta.m3u8 #EXTINF:-1 tvg-id="MariaPlusVisionMedjugorje.ba",María+Visión Medjugorje (720p) https://1601580044.rsc.cdn77.org/live/_jcn_/amlst:Italiasette/playlist.m3u8 +#EXTINF:-1 tvg-id="NTVICKakanj.ba",NTV IC Kakanj (720p) +https://lon.rtsp.me/dEqnY-myGj84bKrieCIPfA/1743271667/hls/3dH3YAD6.m3u8 #EXTINF:-1 tvg-id="RTRSplus.ba",RTRS Plus (576p) [Not 24/7] https://pluslive.rtrs.tv/plus/plus/playlist.m3u8 #EXTINF:-1 tvg-id="RTRSTV.ba",RTRS TV (576p) [Not 24/7] @@ -33,5 +35,3 @@ https://live.tv-m.net/hls/stream.m3u8 https://restreamer1.tnt.ba/hls/tntkids.m3u8 #EXTINF:-1 tvg-id="TVSlonExtra.ba",TV Slon Extra (1080p) [Not 24/7] http://31.47.0.130:8082 -#EXTINF:-1 tvg-id="NTVICKakanj.ba",NTV IC Kakanj (720p) -https://lon.rtsp.me/dEqnY-myGj84bKrieCIPfA/1743271667/hls/3dH3YAD6.m3u8 diff --git a/streams/bo.m3u b/streams/bo.m3u index eba10f6797..06a5384ad8 100644 --- a/streams/bo.m3u +++ b/streams/bo.m3u @@ -15,6 +15,8 @@ https://video2.getstreamhosting.com:19360/8038/8038.m3u8 https://stmvideo3.livecastv.com/aynitv/aynitv/playlist.m3u8 #EXTINF:-1 tvg-id="BoliviaRadioTV.bo",Bolivia Radio TV (720p) [Not 24/7] https://glb.bozztv.com/glb/ssh101/boliviaradiotv/playlist.m3u8 +#EXTINF:-1 tvg-id="BoliviaTV.bo",Bolivia TV (720p) +https://5fe2654d6127d.streamlock.net/boliviatv/videoboliviatv/playlist.m3u8 #EXTINF:-1 tvg-id="BoliviaTV.bo",Bolivia TV (720p) [Not 24/7] http://boliviatv1.srfms.com:5735/live/livestream/playlist.m3u8 #EXTINF:-1 tvg-id="BoliviaTV72.bo",Bolivia TV 7.2 (720p) @@ -55,7 +57,7 @@ https://glb.bozztv.com/glb/ssh101/fortalezacueto/index.m3u8 https://master.tucableip.com/ftv/index.m3u8 #EXTINF:-1 tvg-id="Gigavision.bo",Gigavisión (1080p) [Not 24/7] https://master.tucableip.com/gigavision/playlist.m3u8 -#EXTINF:-1 tvg-id="",Gogo Play TV (720p) +#EXTINF:-1 tvg-id="GoGoPlayTV.bo@SD",Gogo Play TV (720p) https://glb.bozztv.com/glb/ssh101/gogoplay/index.m3u8 #EXTINF:-1 tvg-id="GTV.bo",Guadalupe TV (720p) [Not 24/7] https://solo.disfrutaenlared.com:1936/guadalupetv/guadalupetv/playlist.m3u8 @@ -153,5 +155,3 @@ https://fl1004.bozztv.com/ssh101/zoytvsports4/index.m3u8 https://fl1004.bozztv.com/ssh101/zoytvsports5/index.m3u8 #EXTINF:-1 tvg-id="ZoyTVTurcas.bo",Zoy TV Turcas https://fl1004.bozztv.com/ssh101/zoytvturcas/index.m3u8 -#EXTINF:-1 tvg-id="BoliviaTV.bo",Bolivia TV (720p) -https://5fe2654d6127d.streamlock.net:443/boliviatv/videoboliviatv/playlist.m3u8 diff --git a/streams/br.m3u b/streams/br.m3u index a56c355993..3292b5d8f4 100644 --- a/streams/br.m3u +++ b/streams/br.m3u @@ -83,7 +83,7 @@ https://5b33b873179a2.streamlock.net:1443/catve2/catve2/playlist.m3u8 https://5b33b873179a2.streamlock.net:1443/radiocamera/livestream/playlist.m3u8 #EXTINF:-1 tvg-id="CatveMasterTV.br",Catve Master TV (720p) [Not 24/7] https://5b33b873179a2.streamlock.net:1443/mastertv/livestream/playlist.m3u8 -#EXTINF:-1 tvg-id="",CBTV Internacional (1080p) +#EXTINF:-1 tvg-id="CBTVInternacional.us@SD",CBTV Internacional (1080p) https://oj7lng29dg82-hls-live.5centscdn.com/lives/f7b44cfafd5c52223d5498196c8a2e7b.sdp/index.m3u8 #EXTINF:-1 tvg-id="CentralTV.br",Central TV (720p) https://tv02.zas.media:1936/centraltv/centraltv/playlist.m3u8 @@ -185,12 +185,12 @@ https://5cf4a2c2512a2.streamlock.net/rbatv/rbatv/playlist.m3u8 https://5cf4a2c2512a2.streamlock.net/rbtv/rbtv/playlist.m3u8 #EXTINF:-1 tvg-id="RDCTV.br",RDC TV (720p) https://br5093.streamingdevideo.com.br/datavideo01/datavideo01/playlist.m3u8 -#EXTINF:-1 tvg-id="RecordNews.br",Record News -https://stream.ads.ottera.tv/playlist.m3u8?network_id=2116 #EXTINF:-1 tvg-id="RecordNews.br",Record News (720p) https://rnw-rn.otteravision.com/rnw/rn/rnw_rn.m3u8 #EXTINF:-1 tvg-id="RecordNews.br",Record News (720p) [Geo-blocked] https://playplusnews-lh.akamaihd.net/i/pp_nws@377849/master.m3u8 +#EXTINF:-1 tvg-id="RecordNews.br",Record News +https://stream.ads.ottera.tv/playlist.m3u8?network_id=2116 #EXTINF:-1 tvg-id="RecordTVBelem.br",Record TV Belem (720p) [Geo-blocked] https://playpluspa-lh.akamaihd.net/i/pp_pa@377468/index_720_av-p.m3u8 #EXTINF:-1 tvg-id="RecordTVBrasilia.br",Record TV Brasilia (720p) [Geo-blocked] @@ -373,7 +373,7 @@ https://serv2.videovox.pw/cnagitos/cnagitos/playlist.m3u8 https://srv1.zcast.com.br/tvcomsantos/tvcomsantos/playlist.m3u8 #EXTINF:-1 tvg-id="TVCordeiro.br",TV Cordeiro (360p) https://stmv2.voxtvhd.com.br/tvcordeiro/tvcordeiro/playlist.m3u8 -#EXTINF:-1 tvg-id="",TV Cultura Nacional +#EXTINF:-1 tvg-id="TVCultura.br@SD",TV Cultura Nacional https://d28367vmhj4ljz.cloudfront.net/out/v1/f26e176ce67244de862cd9b21d823934/index.m3u8 #EXTINF:-1 tvg-id="TVCuruca.br",TV Curuça (360p) https://stmv1.srvif.com/tvcurucasp/tvcurucasp/playlist.m3u8 diff --git a/streams/br_pluto.m3u b/streams/br_pluto.m3u index c87d7e13c1..f95a8fe670 100644 --- a/streams/br_pluto.m3u +++ b/streams/br_pluto.m3u @@ -1,27 +1,27 @@ #EXTM3U #EXTINF:-1 tvg-id="PlutoTVAsPistasdeBlue.us",Pluto TV As Pistas de Blue (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f99aad4e82db50007fac4b2/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVCineDrama.br",Pluto TV Cine Drama (720p) +#EXTINF:-1 tvg-id="PlutoTVCineDrama.us@Brazil",Pluto TV Cine Drama (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1210d14ae1f80007bafb1d/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVCineFamilia.br",Pluto TV Cine Família (720p) [Not 24/7] +#EXTINF:-1 tvg-id="PlutoTVCineFamilia.us@Brazil",Pluto TV Cine Família (720p) [Not 24/7] https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f171f032cd22e0007f17f3d/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="NickClassico.br",Pluto TV Classic Nick (Brazil) (240p) +#EXTINF:-1 tvg-id="",Pluto TV Classic Nick (Brazil) (240p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f12151794c1800007a8ae63/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f12151794c1800007a8ae63&deviceLat=-23.5475&deviceLon=-46.6361&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=BR&serverSideAds=false&sid=730&terminate=false&userId= -#EXTINF:-1 tvg-id="FilmesSuspense.br",Pluto TV Filmes Suspense (720p) +#EXTINF:-1 tvg-id="",Pluto TV Filmes Suspense (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f171d3442a0500007362f22/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVInvestigacao.br",Pluto TV Investigação (720p) +#EXTINF:-1 tvg-id="PlutoTVInvestigacao.us@Brazil",Pluto TV Investigação (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f32cf37c9ff2b00082adbc8/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS #EXTINF:-1 tvg-id="MTV.br",Pluto TV MTV (Brazil) (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1212fb81e85c00077ae9ef/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVNatureza.br",Pluto TV Natureza (720p) +#EXTINF:-1 tvg-id="PlutoTVNatureza.us@Brazil",Pluto TV Natureza (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1213ba0ecebc00070e170f/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="NickJrClub.br",Pluto TV Nick Jr. Club (720p) +#EXTINF:-1 tvg-id="",Pluto TV Nick Jr. Club (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ddd7cb2cbb9010009b4fe32/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId= -#EXTINF:-1 tvg-id="NickJrClub.br",Pluto TV Nick Jr. Club (720p) +#EXTINF:-1 tvg-id="",Pluto TV Nick Jr. Club (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f121460b73ac6000719fbaf/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS #EXTINF:-1 tvg-id="PlutoTVPortadosFundos.us",Pluto TV Porta dos Fundos (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f36f2346ede750007332d11/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVRetro.br",Pluto TV Retrô (684p) +#EXTINF:-1 tvg-id="PlutoTVRetro.us@Brazil",Pluto TV Retrô (684p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1212ad1728050007a523b8/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVVidaReal.br",Pluto TV Vida Real (720p) +#EXTINF:-1 tvg-id="PlutoTVVidaReal.us@Brazil",Pluto TV Vida Real (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f32d4d9ec194100070c7449/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS diff --git a/streams/br_samsung.m3u b/streams/br_samsung.m3u index eb1d0f8428..d4bb84c98c 100644 --- a/streams/br_samsung.m3u +++ b/streams/br_samsung.m3u @@ -3,5 +3,5 @@ https://bloomberg-bloomberg-3-br.samsung.wurl.tv/manifest/playlist.m3u8 #EXTINF:-1 tvg-id="MyTimeMovieNetwork.br",MyTime Movie Network Brazil (720p) https://appletree-mytime-samsungbrazil.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="TastemadeBrasil.br",Tastemade Brasil (1080p) +#EXTINF:-1 tvg-id="TastemadeBrasil.us@Brazil",Tastemade Brasil (1080p) https://tastemade-pt16intl-samsungbrazil.amagi.tv/playlist.m3u8 diff --git a/streams/by.m3u b/streams/by.m3u index db419bbb01..a32f201614 100644 --- a/streams/by.m3u +++ b/streams/by.m3u @@ -15,9 +15,9 @@ https://edge60.dc.beltelecom.by/ngtrk/smil:belarus3.smil/playlist.m3u8 https://ngtrk.dc.beltelecom.by/ngtrk/smil:belarus3.smil/playlist.m3u8 #EXTINF:-1 tvg-id="Belarus5.by",Беларусь 5 (1080p) [Not 24/7] https://ngtrk.dc.beltelecom.by/ngtrk/smil:belarus5.smil/playlist.m3u8 -#EXTINF:-1 tvg-id="Belarus5Internet.by",Беларусь 5 Интернет (1080p) [Not 24/7] +#EXTINF:-1 tvg-id="Belarus5.by@Internet",Беларусь 5 Интернет (1080p) [Not 24/7] https://edge59.dc.beltelecom.by/ngtrk/smil:belarus5int.smil/playlist.m3u8 -#EXTINF:-1 tvg-id="Belarus5Internet.by",Беларусь 5 Интернет (1080p) [Not 24/7] +#EXTINF:-1 tvg-id="Belarus5.by@Internet",Беларусь 5 Интернет (1080p) [Not 24/7] https://ngtrk.dc.beltelecom.by/ngtrk/smil:belarus5int.smil/playlist.m3u8 #EXTINF:-1 tvg-id="Belarus24.by",Беларусь 24 (1080p) https://ngtrk.dc.beltelecom.by/ngtrk/smil:belarus24.smil/playlist.m3u8 diff --git a/streams/bz_nexgen.m3u b/streams/bz_nexgen.m3u index 82ab9bcd80..c63c426bd9 100644 --- a/streams/bz_nexgen.m3u +++ b/streams/bz_nexgen.m3u @@ -1,19 +1,19 @@ #EXTM3U -#EXTINF:-1 tvg-id="AXNCentralAmerica.us",AXN +#EXTINF:-1 tvg-id="AXNLatinAmerica.us@CentralAmerica",AXN https://streamer1.nexgen.bz/AXN/index.m3u8 -#EXTINF:-1 tvg-id="BETEast.us",BET +#EXTINF:-1 tvg-id="BETLatinAmerica.us@SD",BET https://streamer1.nexgen.bz/BET/index.m3u8 -#EXTINF:-1 tvg-id="BravoEast.us",Bravo +#EXTINF:-1 tvg-id="Bravo.us@East",Bravo https://streamer1.nexgen.bz/BRAVO/index.m3u8 -#EXTINF:-1 tvg-id="",FX +#EXTINF:-1 tvg-id="FXLatinAmerica.us@Panregional",FX https://streamer1.nexgen.bz/FX/index.m3u8 -#EXTINF:-1 tvg-id="",History +#EXTINF:-1 tvg-id="HistoryLatinAmerica.us@Panregional",History https://streamer1.nexgen.bz/HISTORY/index.m3u8 -#EXTINF:-1 tvg-id="",Lifetime +#EXTINF:-1 tvg-id="LifetimeLatinAmerica.us@Panregional",Lifetime https://streamer1.nexgen.bz/LIFETIME/index.m3u8 -#EXTINF:-1 tvg-id="MTVEast.us",MTV +#EXTINF:-1 tvg-id="MTVLatinAmerica.us@Panregional",MTV https://streamer1.nexgen.bz/MTV/index.m3u8 -#EXTINF:-1 tvg-id="StarChannelCentralAmerica.us",Star Channel Central America +#EXTINF:-1 tvg-id="StarChannelLatinAmerica.us@CentralAmerica",Star Channel Central America https://streamer1.nexgen.bz/STAR/index.m3u8 -#EXTINF:-1 tvg-id="VH1East.us",VH1 +#EXTINF:-1 tvg-id="VH1LatinAmerica.us@SD",VH1 https://streamer1.nexgen.bz/VH1/index.m3u8 diff --git a/streams/ca.m3u b/streams/ca.m3u index 6ffc5f6dff..61420bbee2 100644 --- a/streams/ca.m3u +++ b/streams/ca.m3u @@ -99,7 +99,7 @@ https://streamer12.vdn.dstreamone.net/saazoawaz/saazoawaz/playlist.m3u8 https://eu.streamjo.com/eetlive/eettv.m3u8 #EXTINF:-1 tvg-id="ErfanHalghehTV.ca",Erfan Halgheh TV (720p) https://hls.erfanhalgheh.live/hls/stream.m3u8 -#EXTINF:-1 tvg-id="EWTNCanada.ca",EWTN Canada (720p) [Not 24/7] +#EXTINF:-1 tvg-id="EWTN.us@Canada",EWTN Canada (720p) [Not 24/7] https://cdn3.wowza.com/1/YW5wSWZiRGd2eFlU/bGV0aVBq/hls/live/playlist.m3u8 #EXTINF:-1 tvg-id="FightNetwork.ca",Fight Network (1080p) https://d12a2vxqkkh1bo.cloudfront.net/hls/main.m3u8 @@ -171,7 +171,7 @@ https://temp3.isilive.ca/live/_definst_/ontla/rm151-en/playlist.m3u8 http://temp2.isilive.ca/live/nunavut/live-eng/index.m3u8 #EXTINF:-1 tvg-id="LivingSpringsTV.ca",Living Springs TV (1080p) https://hls-cdn.tvstartup17.net/tvstartup17-channel/live/mp4:livingspringstvedge/playlist.m3u8 -#EXTINF:-1 tvg-id="LoveNature4K.ca",Love Nature 4K (2160p) +#EXTINF:-1 tvg-id="LoveNature.ca@4K",Love Nature 4K (2160p) https://d18dyiwu97wm6q.cloudfront.net/playlist.m3u8 #EXTINF:-1 tvg-id="CJILDT.ca" http-referrer="https://www.miraclechannel.ca/",Miracle Channel #EXTVLCOPT:http-referrer=https://www.miraclechannel.ca/ @@ -200,12 +200,12 @@ https://videostream.jpbgdigital.com/NOWTV.m3u8 https://us170.jagobd.com:447/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/nrb-eu.stream/playlist.m3u8 #EXTINF:-1 tvg-id="NTVPlus.ca",NTV+ https://2-fss-1.streamhoster.com/pl_122/201748-1431018-1/chunklist.m3u8 -#EXTINF:-1 tvg-id="",Olympic Channel [Geo-blocked] +#EXTINF:-1 tvg-id="OlympicChannel.es@SD",Olympic Channel [Geo-blocked] https://ocshls-2-olympicchannel.akamaized.net/ocshls/OCTV_32.m3u8 -#EXTINF:-1 tvg-id="OntarioParliamentaryNetwork.ca",Ontario Parliamentary Network -https://origin-http-delivery.isilive.ca/live/_definst_/ontla/house-fr/playlist.m3u8 #EXTINF:-1 tvg-id="OntarioParliamentaryNetwork.ca",Ontario Parliamentary Network (720p) https://origin-http-delivery.isilive.ca/live/_definst_/ontla/house-en/playlist.m3u8 +#EXTINF:-1 tvg-id="OntarioParliamentaryNetwork.ca",Ontario Parliamentary Network +https://origin-http-delivery.isilive.ca/live/_definst_/ontla/house-fr/playlist.m3u8 #EXTINF:-1 tvg-id="PamirTV.ca",Pamir TV (1080p) [Not 24/7] http://live.stream.cdn.pamirtv.com/ptv/d0dbe915091d400bd8ee7f27f0791303.sdp/index.m3u8 #EXTINF:-1 tvg-id="PardesiTV.ca",Pardesi TV (720p) @@ -251,7 +251,7 @@ https://raw.githubusercontent.com/azgaresncf/strm2hls/main/streams/tvctklive.m3u https://tscamd.akamaized.net/hls/live/503340/TSCLive/master.m3u8 #EXTINF:-1 tvg-id="Toronto360TV.ca",Toronto 360 TV (720p) [Not 24/7] http://cdn3.toronto360.tv:8081/toronto360/hd/playlist.m3u8 -#EXTINF:-1 tvg-id="",TSN The Ocho +#EXTINF:-1 tvg-id="TSNTheOcho.ca@SD",TSN The Ocho https://d3pnbvng3bx2nj.cloudfront.net/v1/master/3722c60a815c199d9c0ef36c5b73da68a62b09d1/cc-rds8g35qfqrnv/TSN_The_Ocho.m3u8 #EXTINF:-1 tvg-id="TV16Toronto.ca",TV 16 Toronto (720p) [Not 24/7] http://rtmp.smartstream.video:1935/capco/tv29/playlist.m3u8 diff --git a/streams/ca_pluto.m3u b/streams/ca_pluto.m3u index 5cea8d8cfd..e605d238cb 100644 --- a/streams/ca_pluto.m3u +++ b/streams/ca_pluto.m3u @@ -1,35 +1,35 @@ #EXTM3U -#EXTINF:-1 tvg-id="",48 Hours +#EXTINF:-1 tvg-id="48Hours.us@SD",48 Hours http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e925bc68d18a00077bb990/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c78ce00-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d510e704-124c-497f-89cb-732e27dd295a #EXTINF:-1 tvg-id="",A Million Little Things http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62ea4a07c07f2a00070e8d9a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c78f510-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=246c806d-de05-41c2-a26a-2a30c78f7bc5 -#EXTINF:-1 tvg-id="",Adventure Sports TV +#EXTINF:-1 tvg-id="AdventureSportsTV.us@SD",Adventure Sports TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63c9550df13a9b00078677a7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c78f511-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4bd268c5-ffe8-41b9-87eb-00b21764a8c4 #EXTINF:-1 tvg-id="",Aftershock http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63e36b374e83e70008987c58/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c791c20-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8a330bc3-1def-4752-9f03-564abe79388b -#EXTINF:-1 tvg-id="",Alerte à Malibu +#EXTINF:-1 tvg-id="AlerteaMalibu.us@Canada",Alerte à Malibu http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e90db65e8e770007382a50/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c791c21-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c070d939-44e0-419b-b958-d26935b903d0 #EXTINF:-1 tvg-id="",American Pickers http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6408ae8f9b39550008caf94f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c791c22-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3b9fb3b4-161b-4a0e-a380-58f96557a8b2 -#EXTINF:-1 tvg-id="",Anger Management +#EXTINF:-1 tvg-id="AngerManagementChannel.us@SD",Anger Management http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65cf8bdaa25d5e00081e1e5d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c791c23-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ecb53ccf-2d45-4edb-949e-540d922e0d69 -#EXTINF:-1 tvg-id="",Antiques Road Show UK +#EXTINF:-1 tvg-id="AntiquesRoadshowUK.us@SD",Antiques Road Show UK http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/638e10de75c3a30007092693/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c791c24-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7a3d3806-9232-4410-9c3f-7b163aeadd84 -#EXTINF:-1 tvg-id="",Are We There Yet? +#EXTINF:-1 tvg-id="AreWeThereYet.us@SD",Are We There Yet? http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65cf8b9328730900087c5324/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c791c25-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=fd1975a1-4578-4dba-893b-1a552eb054bc #EXTINF:-1 tvg-id="",Arthur http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6482f27c17f5e10008c10ff0/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c794330-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=708b1b6d-b68b-435b-a9fc-551cbc3b51ea #EXTINF:-1 tvg-id="",Ax Men http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6540fe4bbdf3cf0008aa2cdd/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c794331-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=334b8ad2-5361-4ae2-a1fd-41fb46bc4c2d -#EXTINF:-1 tvg-id="",Bar Rescue +#EXTINF:-1 tvg-id="BarRescue.us@SD",Bar Rescue http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/655f2ee6c0fc88000877d26c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c794332-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0960644d-9f55-4a3e-8c16-71ab199dc6b4 -#EXTINF:-1 tvg-id="",Baywatch +#EXTINF:-1 tvg-id="Baywatch.us@Canada",Baywatch http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bdae69a47b6c00076af298/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c794333-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=cf6b9a6c-d0a8-4354-b1e0-ffb5af44b853 -#EXTINF:-1 tvg-id="",beIN SPORTS XTRA +#EXTINF:-1 tvg-id="beINSPORTSXTRA.us@SD",beIN SPORTS XTRA http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62b97ef310e33f0007eea65f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c794334-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=01b4faa7-f3ac-4f6d-9967-3f409d4c6863 -#EXTINF:-1 tvg-id="",Best of The Drew Barrymore Show +#EXTINF:-1 tvg-id="BestofTheDrewBarrymoreShow.us@SD",Best of The Drew Barrymore Show http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6310cbee5a8ad300070fdb7c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c796a40-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=223866bd-0f1f-4f33-9986-65de6978421c -#EXTINF:-1 tvg-id="",Beverly Hills 90210 +#EXTINF:-1 tvg-id="BeverlyHills90210.us@Canada",Beverly Hills 90210 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63565bdbb0d80d00078d3450/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c796a41-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b972b605-b580-49aa-8079-19ae91d34013 #EXTINF:-1 tvg-id="",Beyond History http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fb9844db5a4a0007ebc2a3/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c796a42-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d3e7f565-b65d-418f-9f3a-1da5e2c255f3 @@ -45,25 +45,25 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6391bdf41d4c24000780b234/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c799150-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=88bef66e-4156-47b4-a0db-16d60ae70741 #EXTINF:-1 tvg-id="",Car Chase http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65b384020cb1a1000880dee9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c799151-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=51514d9d-db13-4653-aa11-b64c6d4665cc -#EXTINF:-1 tvg-id="",Catfish +#EXTINF:-1 tvg-id="PlutoTVCatfish.us@SD",Catfish http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64f8a2a23a0d700008a6ed7b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c799152-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d33cda72-eef1-4ec7-8127-8301aff1d921 #EXTINF:-1 tvg-id="CBSNews247.us",CBS News 24/7 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6350fdd266e9ea0007bedec5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c799153-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=15376bcb-2b34-4530-a2f7-c528a8eb2aa3 #EXTINF:-1 tvg-id="",Cheaters http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6582f7d612d5ee00089a663d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c799154-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b0c16eba-1daa-4dd1-9854-b271c81bb5e8 -#EXTINF:-1 tvg-id="",Cheers +#EXTINF:-1 tvg-id="Cheers.us@Canada",Cheers http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bdb7f0db2eb30007376d4d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c799155-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=794ad915-7321-49a1-8f52-1d90f588cfd9 #EXTINF:-1 tvg-id="",Christmas 365 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fb6d4308f5ec0007453c09/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c799156-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=94bacb18-2918-4d85-875c-f5554357f3d7 -#EXTINF:-1 tvg-id="",Classica +#EXTINF:-1 tvg-id="Classica.us@SD",Classica http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64240c3f9189ce00087dd17e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c799157-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b0939c7d-0d09-49b1-a6ca-f5d30195d075 -#EXTINF:-1 tvg-id="",CMusic +#EXTINF:-1 tvg-id="StingrayCMusic.ca@SD",CMusic http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64240d00dbdaaa00085bc5e2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c799158-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=591a5510-6f0c-4769-9f52-fb2ec0e8a3ea #EXTINF:-1 tvg-id="",Come Dine with Me http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65367e724f123d000877cfe5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c79b860-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d8469ee3-a58f-4fb6-931e-e25e07a067a7 -#EXTINF:-1 tvg-id="",Comedy Central +#EXTINF:-1 tvg-id="ComedyCentralPlutoTV.us@Canada",Comedy Central http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64f8a408bd341e000818fcda/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c79b861-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=bc03faa5-401f-4a68-9972-153b1f336cac -#EXTINF:-1 tvg-id="",Comedy Central Animation +#EXTINF:-1 tvg-id="ComedyCentralAnimation.us@SD",Comedy Central Animation http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64f8a949f5b5e4000862467c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c79b862-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=954a470a-ef46-4375-9079-27408bd93898 #EXTINF:-1 tvg-id="",Comedy Central Stand-Up http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64f8a9ccd661bb00081bd93a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c79b863-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7fed5fcc-0dbc-42e9-8b2f-d5eb610c5074 @@ -73,7 +73,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/655f2ce5954b020008c8352d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c79b865-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3595184b-cb04-4d88-b8b6-18f5809ccdac #EXTINF:-1 tvg-id="",CrimeTime http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e93b8eb8e02600071f8b1d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c79b866-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f6712973-8faa-4699-8910-6209c1b7a19d -#EXTINF:-1 tvg-id="",CSI +#EXTINF:-1 tvg-id="CSI.us@SD",CSI http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e9224f41d5e100076db2b6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c79df70-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=dec120d8-b140-4915-a068-07986f2860d1 #EXTINF:-1 tvg-id="",CSI: Miami http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63f4e0e63fde020007835cbe/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c79df71-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a93e1bf0-0e0f-4cc0-a79d-1cb026b180ed @@ -83,7 +83,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6540fec1770cf1000866b65b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c79df73-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=64043e4b-3a3a-42a9-bce9-67430c31c9f5 #EXTINF:-1 tvg-id="",DAZN TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/647f07e74cfc2c0008a2e557/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c79df74-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c15ea93c-2750-4bfe-89b2-661f859342f1 -#EXTINF:-1 tvg-id="",Deal or no Deal +#EXTINF:-1 tvg-id="DealorNoDeal.us@SD",Deal or no Deal http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e92951c2db99000787c00d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c79df75-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=99d1f141-b1af-4c62-9b90-538de8ee3cc4 #EXTINF:-1 tvg-id="",Declassified http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bdaf9cf1bdc500073a8bcb/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c79df76-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=77b58119-8b6e-403d-b5dd-1096e48e0c09 @@ -91,43 +91,43 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63c7c122808b7400075c070f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a0680-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b39071e5-3029-4bb5-90be-39bd80bbc6a6 #EXTINF:-1 tvg-id="",Diagnosis Murder http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65fd548f29adfd00089c662c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a0681-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=aed07097-3592-47e8-bac5-f9f578b23c54 -#EXTINF:-1 tvg-id="",Djazz +#EXTINF:-1 tvg-id="StingrayDJAZZ.ca@SD",Djazz http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64240ccfaa2d690008dc4406/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a0682-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=959d0b22-4af5-4741-8264-1da92550e8c1 #EXTINF:-1 tvg-id="",Doc Martin http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e922f6675f71000736db3b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a0683-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=999d1690-f7fb-40a5-b944-462166e9515a -#EXTINF:-1 tvg-id="",Doctor Who +#EXTINF:-1 tvg-id="DoctorWho.us@Canada",Doctor Who http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e92d2e9bc0ab00072e10a3/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a0684-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=37ea7b78-1453-4bf3-b9ff-3fe34d4fc035 -#EXTINF:-1 tvg-id="",Doctor Who Classic +#EXTINF:-1 tvg-id="DoctorWhoClassic.us@Canada",Doctor Who Classic http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bdad934d73d50007a82472/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a0685-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=fb357bb3-ec69-4aa3-aa8c-7ad6b7bb3424 -#EXTINF:-1 tvg-id="",Dog The Bounty Hunter +#EXTINF:-1 tvg-id="DogtheBountyHunter.us@Canada",Dog The Bounty Hunter http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6540fee72cf13100085d5a18/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a0686-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a785777c-53e9-4fa5-bf8d-22125f05159a -#EXTINF:-1 tvg-id="",Dora TV +#EXTINF:-1 tvg-id="DoraTV.us@Canada",Dora TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e951258a26d40007b3034c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a0687-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=697806d6-afc8-4125-a899-6ef54b8526fc #EXTINF:-1 tvg-id="",Dora TV en Français http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bdb9baa9dddb0007f39e41/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a0688-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d825e077-4dd8-47f8-bea3-c535753493bf -#EXTINF:-1 tvg-id="",Duck Dynasty +#EXTINF:-1 tvg-id="DuckDynasty.us@UK",Duck Dynasty http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6540fe6fbfbaec0008a583ae/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a2d90-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b2414064-7363-4d88-b917-86f379a71ce9 #EXTINF:-1 tvg-id="",Dynasty http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e919ca865c590007ecd0bd/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a2d91-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a106f440-441b-42eb-86b4-d732ef6f814e -#EXTINF:-1 tvg-id="",FailArmy +#EXTINF:-1 tvg-id="FailArmy.us@Canada",FailArmy http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bdb5500c21270007218ce1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a2d92-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ecaff509-d568-42e3-8ce7-0595119efeac #EXTINF:-1 tvg-id="",Family Feud Classic http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64c2222fb0cf5c0008288c4f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a2d93-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5513d020-7e3c-4428-8383-36d51d71d616 -#EXTINF:-1 tvg-id="",Family Ties +#EXTINF:-1 tvg-id="FamilyTies.us@SD",Family Ties http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e920403bd6940007fb68b8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a2d94-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d53010fa-6841-4947-a218-d0d4d4f52c95 -#EXTINF:-1 tvg-id="",FBI Files +#EXTINF:-1 tvg-id="FBIFiles.us@UK",FBI Files http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bdaa32a1b2fd00076693e8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a2d95-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=53708f79-4a2b-4285-8fa6-e950fc36fb48 -#EXTINF:-1 tvg-id="",Fear Factor +#EXTINF:-1 tvg-id="FearFactor.us@Canada",Fear Factor http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63482674df87730007656044/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a2d96-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4f3a5677-9ed1-44d1-9702-c2039e7bf0d1 #EXTINF:-1 tvg-id="",Fixers and Flippers http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fb62081afad500077e915e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a2d97-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8ea54251-dad6-45d5-9afb-2162c78ab93d -#EXTINF:-1 tvg-id="",Forensic Files +#EXTINF:-1 tvg-id="ForensicFiles.us@SD",Forensic Files http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e92392a3e6270007f562e8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a54a0-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=053b9371-9f0f-4936-9aa9-ae27ee69ae5f -#EXTINF:-1 tvg-id="Frasier.ca",Frasier +#EXTINF:-1 tvg-id="Frasier.us@Canada",Frasier http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f4f90e39183b000769f12b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a54a1-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=385f93fc-8e79-4ac3-9478-5758ce4a3181 -#EXTINF:-1 tvg-id="",Game Show Central +#EXTINF:-1 tvg-id="GameShowCentral.us@SD",Game Show Central http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e90e8cb05d2b0007f10a61/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a54a2-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=06d7c73f-91e9-44c5-868e-5336253a1d67 -#EXTINF:-1 tvg-id="",Ghost Hunters +#EXTINF:-1 tvg-id="GhostHunters.us@UK",Ghost Hunters http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65cf8ace332fec00081e7ea2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a54a3-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=733471ce-0ac1-447e-9326-012361ee2487 #EXTINF:-1 tvg-id="",Global News BC http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62cbf063257170000724590c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a54a4-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=dbc1416e-8c70-4097-a89c-835beacc1b11 @@ -157,11 +157,11 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62cc00b3b821cf00070f82c3/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a7bb7-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c77ab85b-1b15-4a76-bcb6-d0e12396d41a #EXTINF:-1 tvg-id="",Global News Winnipeg http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62cc0120880c890007191016/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7aa2c0-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9bcdaa8b-3df2-47ca-abf7-ba093e2e6ca0 -#EXTINF:-1 tvg-id="",Gordon Ramsay's Hell's Kitchen +#EXTINF:-1 tvg-id="GordonRamsaysHellsKitchen.us@SD",Gordon Ramsay's Hell's Kitchen http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62ea45010d0611000839868c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7aa2c1-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e3a17d6f-f38c-4a08-9e69-00d8a53906ec -#EXTINF:-1 tvg-id="",Gunsmoke +#EXTINF:-1 tvg-id="Gunsmoke.us@SD",Gunsmoke http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e916affb29c60007211c8a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7aa2c2-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1595266f-ecb0-4af0-bab6-40b7d0586999 -#EXTINF:-1 tvg-id="",Happy Days +#EXTINF:-1 tvg-id="HappyDays.us@SD",Happy Days http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e917b5e354cf0007b97a67/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7aa2c3-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b9cae61e-6671-48b9-8e36-973e2921034d #EXTINF:-1 tvg-id="",HauntTV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63934c218ef524000757b122/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7aa2c4-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=25722e97-3227-46ed-84fd-718e848f28de @@ -179,11 +179,11 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fb60d2d835e10007e44a26/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7ac9d0-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=54b056b4-154e-4113-8ba7-8ed2587af6ce #EXTINF:-1 tvg-id="",Income Property http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e926429cb58900088f951f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7ac9d1-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9a63c15a-155d-463a-93ab-a89574f82e5c -#EXTINF:-1 tvg-id="",Ink Master +#EXTINF:-1 tvg-id="InkMaster.us@SD",Ink Master http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/655f2d713944b60008bc7e90/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7ac9d2-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e7b1d981-a145-4f0e-b936-2e3b59397aee -#EXTINF:-1 tvg-id="",Iron Chef +#EXTINF:-1 tvg-id="IronChef.us@Canada",Iron Chef http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6582f8dadfed030008e5a93d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7ac9d3-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=06f4488f-c700-49ec-8b6e-d27460d8c3ed -#EXTINF:-1 tvg-id="",Johnny Carson TV +#EXTINF:-1 tvg-id="JohnnyCarsonTV.us@SD",Johnny Carson TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64ddcf8e9c1e390008349fc8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7ac9d4-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ff0b5333-a2df-4153-b8dd-a021884c8085 #EXTINF:-1 tvg-id="",Kid Quest http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fb6aede6ff56000707085b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7ac9d5-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=03b2428e-2903-46ce-9192-ce454749a025 @@ -205,65 +205,65 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/655230a4f8259d000800579e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7af0e4-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=625d2258-9add-4573-9cac-75472f1e1140 #EXTINF:-1 tvg-id="",Love Pets http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65265dada6c3830008942a0a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7af0e5-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8de1032a-71e8-4216-8110-72f35187d9fa -#EXTINF:-1 tvg-id="",Lupin the 3rd +#EXTINF:-1 tvg-id="Lupinthe3rd.us@SD",Lupin the 3rd http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63b5964d1bdba1000712521f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7af0e6-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ceff1aa0-cebb-4159-99d2-7b38b17807a8 #EXTINF:-1 tvg-id="",Mad About You http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64b52e907d9341000802f886/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7af0e7-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=91689c00-42f5-4fdc-9694-8952120c6319 -#EXTINF:-1 tvg-id="",Matlock +#EXTINF:-1 tvg-id="Matlock.us@SD",Matlock http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63da365f60bc8f0008a50f44/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7af0e8-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4f26df9e-4f5e-4183-a843-1996b0eaf551 #EXTINF:-1 tvg-id="",Max & Ruby http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fb6a4feb32e8000708f4d0/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b17f0-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ef7abed0-920d-4c83-92ed-2a600f6fc6d8 -#EXTINF:-1 tvg-id="",Midsomer Murders +#EXTINF:-1 tvg-id="MidsomerMurders.us@SD",Midsomer Murders http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e92447ea1e2a000735ed33/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b17f1-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8d95013f-2fa7-4fc2-a78f-993e5252da47 -#EXTINF:-1 tvg-id="",Mission Impossible +#EXTINF:-1 tvg-id="MissionImpossible.us@SD",Mission Impossible http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62ea43aa0c43540007f2db96/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b17f2-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0878db09-3913-46f0-b42a-c9951a6f9f69 #EXTINF:-1 tvg-id="",Modern Marvels http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6540ff2d770cf1000866b90a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b17f3-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1b3230b6-e0bb-4431-bee9-87f6c6f5b2d2 -#EXTINF:-1 tvg-id="",Monster Jam +#EXTINF:-1 tvg-id="MonsterJam.pl@SD",Monster Jam http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65bcc9c8d77d450008b34c6b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b17f4-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4ef65ab7-424b-4423-93e5-e94da98d875f #EXTINF:-1 tvg-id="",More NCIS http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e949f0cec1e60007f03314/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b17f5-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f1b5eec9-2caa-42db-be84-da456a1d44db #EXTINF:-1 tvg-id="",MovieSphere by Lionsgate http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64a3d96f060e830008af6745/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b17f6-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=41f0c8e5-55e6-4740-a854-15ac608b8c65 -#EXTINF:-1 tvg-id="",MTV Biggest Pop +#EXTINF:-1 tvg-id="MTVBiggestPop.us@Canada",MTV Biggest Pop http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65410176770cf1000866bf31/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b17f7-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=bcf56774-6379-4d92-a0d3-c5c517f6e994 -#EXTINF:-1 tvg-id="",MTV Classic +#EXTINF:-1 tvg-id="MTVClassic.us@Canada",MTV Classic http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/654100b4bdf3cf0008aa49c7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b17f8-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0f6e1478-21f2-4086-89a2-f5bf724e1c45 -#EXTINF:-1 tvg-id="",MTV Dating +#EXTINF:-1 tvg-id="MTVDating.us@Canada",MTV Dating http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64f8a0c230ab3300084369b8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b17f9-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=70f03476-c602-474c-9bec-e1c4bbf13a02 #EXTINF:-1 tvg-id="",MTV Reality http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64f89fcfd661bb00081ba45c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b3f00-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=be8b1337-550f-4b0e-bf9b-d3dec2e64384 -#EXTINF:-1 tvg-id="",MTV Ridiculousness +#EXTINF:-1 tvg-id="MTVRidiculousness.us@Canada",MTV Ridiculousness http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64f9cccf110545000837912e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b3f01-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b283a70f-16b8-4034-abe0-9c8171462c83 #EXTINF:-1 tvg-id="",MTV Spankin’ New http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6541010f770cf1000866be98/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b3f02-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7c3402af-f54f-4488-b74f-62b1998013e4 -#EXTINF:-1 tvg-id="",Naruto +#EXTINF:-1 tvg-id="Naruto.us@Canada",Naruto http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/642be2939189ce0008916c21/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b3f03-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0f83fe69-e624-47e7-9e5e-670cb73840f2 -#EXTINF:-1 tvg-id="",Nashville +#EXTINF:-1 tvg-id="PlutoTVNashville.us@SD",Nashville http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65cf8d7428730900087c5907/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b3f04-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=755f7df4-39e5-40b0-b9c3-628ab31d2612 -#EXTINF:-1 tvg-id="",Naturescape +#EXTINF:-1 tvg-id="StingrayNaturescape.ca@SD",Naturescape http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64240b7e283aa40008f79f84/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b3f05-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a5760903-3730-493d-a240-f38538ed67ca #EXTINF:-1 tvg-id="",NCIS http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f4f5de1c100100075665ef/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b3f06-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=cf46f3b0-cd26-4b98-92b0-312be52250e0 -#EXTINF:-1 tvg-id="",Nick Jr. Pluto TV +#EXTINF:-1 tvg-id="NickJrPlutoTV.us@Canada",Nick Jr. Pluto TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bdb75c3afd1200079146a6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b3f07-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=08e1ba5b-febb-444b-927d-f017f608e57e -#EXTINF:-1 tvg-id="",Nick Pluto TV +#EXTINF:-1 tvg-id="NickPlutoTV.us@Canada",Nick Pluto TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bdb6a83c6e37000726823b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b3f08-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c15d1002-05a1-4c9d-82b6-2c554bbbf97f -#EXTINF:-1 tvg-id="",NickToons +#EXTINF:-1 tvg-id="Nicktoons.us",NickToons http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/654ca7f92c1d3300086b608c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b6610-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=359ee837-a829-4fe0-9d99-8dc36018ced2 #EXTINF:-1 tvg-id="",Nonstop Chop http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fb675fc9f6da0007b36888/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b6611-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3ad76d8d-fab5-4b2c-9047-f70c1212f7c1 #EXTINF:-1 tvg-id="",Nonstop Drama http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fb9ade112ca70007d8441d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b6612-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f86ca519-ca18-4239-ab5b-089b2094739d -#EXTINF:-1 tvg-id="",Nosey +#EXTINF:-1 tvg-id="Nosey.us@Canada",Nosey http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e93d0a80d8d10008a0181e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b6613-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1fbd0fc2-487d-4b2e-8f46-ca423dcfe679 #EXTINF:-1 tvg-id="",Out TV Proud http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6368e15a51e9560007c592ed/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b6614-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=48221a4e-19a7-43c2-952b-2a59f488a79d #EXTINF:-1 tvg-id="",Paw Patrol http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62ea3ec626dc1900078e9f26/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b6615-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=036f3618-f9a5-4a4b-ba27-2cb712a7f255 -#EXTINF:-1 tvg-id="",Perry Mason +#EXTINF:-1 tvg-id="PerryMason.us@SD",Perry Mason http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63e20bd160bc8f0008b4c949/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b6616-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f4c893d1-40a3-46c4-813b-fefaf471db3f -#EXTINF:-1 tvg-id="",Pet Collective +#EXTINF:-1 tvg-id="ThePetCollective.us@Canada",Pet Collective http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e92b5fca869f00078f0162/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b6617-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4b4fceb2-10ba-4e0e-b055-2002afd89dc2 #EXTINF:-1 tvg-id="",Pluto TV Action Movies http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62ea3c2e4823db00072788ed/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b8d20-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c110a2fa-daa4-4051-944a-5705842fcc96 @@ -271,39 +271,39 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/653bdb0fbdf3cf00089cc395/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b8d21-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=272950eb-6667-4241-84ba-48c0968ea09d #EXTINF:-1 tvg-id="",Pluto TV Classic TV Families http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e91af00c43540007f2bb43/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b8d22-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=bf7dadef-9dd1-485f-8155-fd19e0afaf5c -#EXTINF:-1 tvg-id="",Pluto TV Comedy +#EXTINF:-1 tvg-id="PlutoTVComedy.us@Canada",Pluto TV Comedy http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e92178946c8000079a3160/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b8d23-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7bb58dcf-41b0-4375-8a36-1b947b81616b #EXTINF:-1 tvg-id="",Pluto TV Comedy Movies http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62ea3d24b8e02600071fa296/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b8d24-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=eac25957-ab7a-4358-b0cd-9e596b2f1a6f -#EXTINF:-1 tvg-id="",Pluto TV Courtroom +#EXTINF:-1 tvg-id="PlutoTVCourtroom.us@SD",Pluto TV Courtroom http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e927ebc2db99000787c00a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b8d25-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3681bac2-c906-4f96-a6ce-650e92a5ab2d -#EXTINF:-1 tvg-id="",Pluto TV Crime Drama +#EXTINF:-1 tvg-id="PlutoTVCrimeDrama.us@SD",Pluto TV Crime Drama http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e92708a7ce600007b2676a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b8d26-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=59a15527-cb90-4bf4-90ab-ec456c5d2df2 -#EXTINF:-1 tvg-id="",Pluto TV Documentaries +#EXTINF:-1 tvg-id="PlutoTVDocumentaries.us@Canada",Pluto TV Documentaries http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63f87df87533d80008ab9b4c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b8d27-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ff7033e4-b330-4a43-8d11-664c727998ff #EXTINF:-1 tvg-id="",Pluto TV Drama Movies http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bdb0bcd707b9000739d2e5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b8d28-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ac9b4aeb-508c-4396-8b31-dc70fc73c3ce -#EXTINF:-1 tvg-id="",Pluto TV Horror +#EXTINF:-1 tvg-id="PlutoTVHorror.us@Canada",Pluto TV Horror http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62ea3f8a38acc80007072d26/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7b8d29-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=198d34d5-3dfc-40a4-8f5e-7aecb91ced74 -#EXTINF:-1 tvg-id="",Pluto TV Paranormal +#EXTINF:-1 tvg-id="PlutoTVParanormal.us@Canada",Pluto TV Paranormal http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e92a58f3e4290007290c96/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7bb430-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=cce671df-9b66-46f4-ab1a-3c0b1cb8a74d #EXTINF:-1 tvg-id="",Pluto TV Retro Crime Drama http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/630f1e6073bd1800082107f0/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7bb431-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8e4df61b-f0fe-477e-8bdf-c892174573c4 #EXTINF:-1 tvg-id="",Pluto TV Retro Kid http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6408b41b83f58900081d91ad/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7bb432-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e8b87cf6-60af-4f60-8a75-456452a82753 -#EXTINF:-1 tvg-id="",Pluto TV True Crime +#EXTINF:-1 tvg-id="PlutoTVTrueCrime.us@Canada",Pluto TV True Crime http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e9289f8d467f0007fbc701/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7bb433-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4f060b33-63f0-4db8-92fd-ac93ae48bcb1 #EXTINF:-1 tvg-id="",Pluto TV Truly Canadian http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6479c171536e0c0008942590/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7bb434-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5ad8a7d6-7a26-4a76-9aa3-84f10fac264d -#EXTINF:-1 tvg-id="",Pluto TV Westerns +#EXTINF:-1 tvg-id="PlutoTVWesterns.us@Canada",Pluto TV Westerns http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bdacc96a3751000811842d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7bb435-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8d87a47e-6b0e-40e2-88e1-8631bfba1316 -#EXTINF:-1 tvg-id="",Pocket.watch +#EXTINF:-1 tvg-id="pocketwatch.us@SD",Pocket.watch http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/635656ed26e11400077add0f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7bb436-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4bbef974-a7b4-4128-b8bb-80945ad9a81c #EXTINF:-1 tvg-id="",Preschool Pals http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fb67cbb3af68000702db15/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7bb437-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=fff0d013-4b9f-4262-bd8b-8f09a990dd45 #EXTINF:-1 tvg-id="",Preschool Play http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fb68a5a6a2670007b7c5b8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7bb438-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=bf06571a-1d0c-43e6-909a-8e1745098004 -#EXTINF:-1 tvg-id="",Qello Concerts +#EXTINF:-1 tvg-id="QelloConcertsbyStingray.ca@SD",Qello Concerts http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64240d3d466225000827412b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7bb439-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6ba3de05-22ef-4ab2-8d11-c4a6c21d39ba #EXTINF:-1 tvg-id="",Rawhide http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65660223635c3c00086c2578/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7bdb40-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=85823e0a-69bc-4cfd-9626-cb87aab91a02 @@ -323,15 +323,15 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65367e914f123d000877d021/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7bdb47-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e137c165-f05c-4ec7-8b23-8d14d8c59871 #EXTINF:-1 tvg-id="",Romance 365 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fb6cd97b90e60007bc318a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7bdb48-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=dc1c4c08-8f65-4478-b529-e20763cbfc28 -#EXTINF:-1 tvg-id="",Ryan and Friends +#EXTINF:-1 tvg-id="RyanandFriends.us@SD",Ryan and Friends http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6356584de76adf0007dcec3c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7bdb49-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e644ef3c-52cb-4f38-8424-d7a60f849f9c #EXTINF:-1 tvg-id="",Sailor Moon http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/642be30baa2d690008ed2935/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c0250-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=90602a89-140d-4b4a-b8d0-c360c511b227 -#EXTINF:-1 tvg-id="",Shades of Black +#EXTINF:-1 tvg-id="ShadesofBlack.pl@SD",Shades of Black http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63920159db0dea0007dd9932/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c0251-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=93b44734-079b-4fec-a58c-6406103089cd #EXTINF:-1 tvg-id="",Snackable Adventures http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fb65373297460007ec5aa7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c0252-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0fc5a1ae-359c-4d5f-94c7-764e2885f877 -#EXTINF:-1 tvg-id="",South Park +#EXTINF:-1 tvg-id="SouthPark.us@Canada",South Park http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bdb1c5e25122000798ac79/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c0253-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=67f014c4-f66e-4860-a7d5-9e9de1cab501 #EXTINF:-1 tvg-id="",South Park En Français http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bdb919d36cbd0007e6ab8a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c0254-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3779233e-781d-466c-a70d-0dbdb22e3f67 @@ -347,7 +347,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/66447eebcb3ea10008022ea4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c2960-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=93d129c0-c017-402f-adf1-4435ff396a73 #EXTINF:-1 tvg-id="",South Park: Welcome to Canada! http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/663115d923e24f000843b49c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c2961-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3ab119fa-05a9-4969-b1d0-3284a871f460 -#EXTINF:-1 tvg-id="",Star Trek +#EXTINF:-1 tvg-id="StarTrek.us@SD",Star Trek http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/643ea768e0789d0008548886/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c2962-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d491b1b5-034d-44e2-b45a-989c3dcd68d8 #EXTINF:-1 tvg-id="",Summer of Movies http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6654adb1f99922000854388c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c2963-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=60bd3196-5e87-4845-bb5b-baeade7af6c1 @@ -357,17 +357,17 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e9186f8b685d000773cf58/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c2965-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7ddc6540-3409-4ff3-9e7e-06eb3030f1ea #EXTINF:-1 tvg-id="",Teenage Mutant Ninja Turtles http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a669ab2fac9c000835c443/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c2966-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=279ce019-bd92-4f14-b227-6869b4b8a835 -#EXTINF:-1 tvg-id="",The Andy Griffith Show +#EXTINF:-1 tvg-id="TheAndyGriffithShow.us@SD",The Andy Griffith Show http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e9145ec07f2a00070e68dc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c2967-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=fbed224a-3b63-4abd-b7a5-8676931b8711 -#EXTINF:-1 tvg-id="",The Asylum +#EXTINF:-1 tvg-id="TheAsylum.us@Canada",The Asylum http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bdb1c958cb95000782088c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c2968-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0c1ba6db-5a9c-4043-b539-12d9380dc54b #EXTINF:-1 tvg-id="",The Beverly Hillbillies http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6565fefdc917a50008485cc6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c5070-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2dd9b7af-9b24-486e-8bae-af60ffceb2a1 -#EXTINF:-1 tvg-id="",The Bob Ross Channel +#EXTINF:-1 tvg-id="TheBobRossChannel.us@SD",The Bob Ross Channel http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64b82075e4391c0008c3c1fe/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c5071-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7b163328-7998-4aee-803b-e7321d13cbf9 -#EXTINF:-1 tvg-id="",The Carol Burnett Show +#EXTINF:-1 tvg-id="TheCarolBurnettShow.us@SD",The Carol Burnett Show http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e91c8933682c000754fc45/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c5072-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7d85b7eb-3d33-422e-9445-9473e1d0d141 -#EXTINF:-1 tvg-id="",The Challenge +#EXTINF:-1 tvg-id="TheChallenge.us@SD",The Challenge http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64f8a22a3efb510008245df0/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c5073-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=63985417-98be-4524-83cc-9a7c05387193 #EXTINF:-1 tvg-id="",The Dick Van Dyke Show http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e91384210bec0007ba714c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c5074-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5dad2390-9fed-4365-9781-2efdca8de405 @@ -375,15 +375,15 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e91da1f07afa0007ffccfc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c5075-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1b64e7f1-151a-45ae-b9ec-c80bbbacf798 #EXTINF:-1 tvg-id="",The Facts of Life http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64b52df0bc3ab40008488f5c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c5076-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=07b54a32-d5da-4df1-9bbb-283909a8c139 -#EXTINF:-1 tvg-id="",The Judge Judy Channel +#EXTINF:-1 tvg-id="TheJudgeJudyChannel.us@SD",The Judge Judy Channel http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e92e536f28870007fa9b3a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c5077-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d7542660-a0a4-415c-a70a-fae3199e0e29 -#EXTINF:-1 tvg-id="",The Love Boat +#EXTINF:-1 tvg-id="TheLoveBoat.us@SD",The Love Boat http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e91563ce7ce300076f917e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c5078-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2db14410-4921-497d-a226-bc4d2e0c53bc -#EXTINF:-1 tvg-id="",The New Detectives +#EXTINF:-1 tvg-id="TheNewDetectives.us@Canada",The New Detectives http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bdabbc5611f2000761ca30/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c5079-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=003b518d-cd6c-4b4b-80ab-ec5ad32c1a1c -#EXTINF:-1 tvg-id="",The Price is Right +#EXTINF:-1 tvg-id="PlutoTVThePriceisRight.us@SD",The Price is Right http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64c2214c2a7f2200089a0c4b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c507a-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c93e6330-dc43-4864-ad74-9144287f8bbd -#EXTINF:-1 tvg-id="",The Price is Right: The Barker Era +#EXTINF:-1 tvg-id="ThePriceIsRightTheBarkerEra.us@SD",The Price is Right: The Barker Era http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64c220e15dc1660008a79c96/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c7780-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c8557389-071b-4c1a-ad15-977e50610abe #EXTINF:-1 tvg-id="",The Red Green Channel http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63565a6de3d057000783bb1c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c7781-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=92089ca4-c375-4a2a-a1ff-148a1935ce73 @@ -391,35 +391,35 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63da370e2e477400081cf8b6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c7782-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6b5c5f52-01b7-44d8-a06c-1f05f3169a75 #EXTINF:-1 tvg-id="",The Wiggles Classic http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/66422cf294d5580008c41bf5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c7783-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=edce0849-5729-49a3-a50b-87cb0ae3f908 -#EXTINF:-1 tvg-id="",This Old House +#EXTINF:-1 tvg-id="ThisOldHouse.us@SD",This Old House http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a8054907e03a0008926323/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c7784-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b009a45e-cfd3-41fc-ba90-2b4d44bcb950 -#EXTINF:-1 tvg-id="",Three's Company +#EXTINF:-1 tvg-id="ThreesCompany.us@SD",Three's Company http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64ca723a2bc49300081a8966/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c7785-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3b997b20-1713-4925-97ac-2a8fe6c85814 #EXTINF:-1 tvg-id="",Thrillers 365 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fb6da41afad500077e9178/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c7786-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=26fc9e3f-7675-48b8-bf64-46d20af3ec80 -#EXTINF:-1 tvg-id="",Tiny House Nation +#EXTINF:-1 tvg-id="TinyHouseNation.us@SD",Tiny House Nation http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6540ff4f7312a40008297b59/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c7787-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b64828a6-e38b-42b5-a91a-566c504d921c -#EXTINF:-1 tvg-id="",TNA Wrestling +#EXTINF:-1 tvg-id="TNAWrestlingChannel.pl@SD",TNA Wrestling http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62ea4dadce395f0007086df2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c7788-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=649aa9eb-97bb-42d6-85e0-d0595821c87a -#EXTINF:-1 tvg-id="",Top Gear +#EXTINF:-1 tvg-id="TopGear.uk@SD",Top Gear http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/638e10220aa6a6000726979f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c7789-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=62911cb3-82ce-40f0-807f-7cc1bb78bd05 -#EXTINF:-1 tvg-id="",Tortues Ninja TV +#EXTINF:-1 tvg-id="TortuesNinjaTV.us@Canada",Tortues Ninja TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e9566e27ce19000732ec85/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c9e90-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3c72045b-f8eb-40e8-a6f7-4ee617849626 -#EXTINF:-1 tvg-id="",Totally Turtles +#EXTINF:-1 tvg-id="TotallyTurtles.us@Canada",Totally Turtles http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e95265c9fd030007268fb9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c9e91-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=46f7cece-d4f5-4869-a9e4-bba83d8e7e96 #EXTINF:-1 tvg-id="",Transformers http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63da36dea995710008727d4d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c9e92-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=49f70fab-e28d-40ce-be99-2d619c18477b -#EXTINF:-1 tvg-id="",Unsolved Mysteries +#EXTINF:-1 tvg-id="UnsolvedMysteries.us@Canada",Unsolved Mysteries http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e924f2be69bc0007b7d53d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c9e93-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6362993f-fcc4-4e58-9056-bca26f635dcb -#EXTINF:-1 tvg-id="",Walker Texas Ranger +#EXTINF:-1 tvg-id="WalkerTexasRanger.us@Canada",Walker Texas Ranger http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/635659445b4c4700076d2ad1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c9e94-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=36e2f6bf-cd8e-44d2-ad1e-a5747a670d91 #EXTINF:-1 tvg-id="",Who's the Boss http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64b52ec24ea4800008370651/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c9e95-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a1316847-5815-401d-b687-cbaa9c6ff900 -#EXTINF:-1 tvg-id="",Wipeout +#EXTINF:-1 tvg-id="Wipeout.us@Canada",Wipeout http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e92a6f087606000767eae2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c9e96-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b45ce7a5-d6f7-4e7a-b14e-762d2646c053 -#EXTINF:-1 tvg-id="",World Poker Tour +#EXTINF:-1 tvg-id="WorldPokerTour.us@Canada",World Poker Tour http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62ea4b755e8e770007387b79/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c9e97-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=14cdb377-9292-4d37-85af-4d89aff56e90 -#EXTINF:-1 tvg-id="",Yo! MTV +#EXTINF:-1 tvg-id="YoMTV.us@SD",Yo! MTV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/654102ed770cf1000866c307/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7c9e98-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4c7b00a0-d803-41b5-95bb-c20d39e69ce2 -#EXTINF:-1 tvg-id="",Yu-Gi-Oh! +#EXTINF:-1 tvg-id="YuGiOh.us@SD",Yu-Gi-Oh! http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63f87c73085b8c0008fc8e95/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7cc5a0-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5865c45c-42a3-4279-b47e-87d38f6e0cb4 diff --git a/streams/ca_samsung.m3u b/streams/ca_samsung.m3u index cddd0cf2e1..2c7c876e81 100644 --- a/streams/ca_samsung.m3u +++ b/streams/ca_samsung.m3u @@ -1,7 +1,7 @@ #EXTM3U #EXTINF:-1 tvg-id="Baywatch.us",Baywatch https://d22ljxpuae2sin.cloudfront.net/playlist.m3u8 -#EXTINF:-1 tvg-id="DegrassiTheNextGeneration.ca",Degrassi The Next Generation (Canada) (720p) +#EXTINF:-1 tvg-id="",Degrassi The Next Generation (Canada) (720p) https://dhx-degrassi-2-ca.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",DryBar Comedy https://drybar-drybarcomedy-1-ca.samsung.wurl.tv/playlist.m3u8 @@ -9,7 +9,7 @@ https://drybar-drybarcomedy-1-ca.samsung.wurl.tv/playlist.m3u8 https://failarmy-international-ca.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="HauntTV.us",Haunt TV https://blueantmediacanada-haunttv-samsungca.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="HeartlandWebFeed.us",Heartland +#EXTINF:-1 tvg-id="Heartland.us@Web",Heartland https://d76toswjmqqzm.cloudfront.net/playlist.m3u8 #EXTINF:-1 tvg-id="InsightTV.nl",Insight TV (720p) https://insighttv-samsung-canada.amagi.tv/playlist.m3u8 diff --git a/streams/ch_samsung.m3u b/streams/ch_samsung.m3u index 0386526989..34673f266b 100644 --- a/streams/ch_samsung.m3u +++ b/streams/ch_samsung.m3u @@ -1,3 +1,3 @@ #EXTM3U -#EXTINF:-1 tvg-id="RakutenTVFamilyMovies.ch",Rakuten TV Family Switzerland (720p) +#EXTINF:-1 tvg-id="RakutenTVFamilyMovies.es@Switzerland",Rakuten TV Family Switzerland (720p) https://a24daf1125344b9cab66eed2fcff8821.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Samsung-ch_RakutenFamily-1/playlist.m3u8 diff --git a/streams/cl.m3u b/streams/cl.m3u index 625bfc27c8..030ff8b40b 100644 --- a/streams/cl.m3u +++ b/streams/cl.m3u @@ -37,7 +37,7 @@ https://v2.tustreaming.cl/atacamatv/index.m3u8 https://6362ca6f1fc28.streamlock.net/8028/8028/playlist.m3u8 #EXTINF:-1 tvg-id="AutonomaTV.cl",Autónoma TV (480p) https://stream.wifispeed.cl:3033/hybrid/play.m3u8 -#EXTINF:-1 tvg-id="AXN.cl",AXN (1080p) +#EXTINF:-1 tvg-id="AXNLatinAmerica.us@Chile",AXN (1080p) https://cvi.cdn.rcs.net.ar/mnp/axn_hls/playlist.m3u8 #EXTINF:-1 tvg-id="AysenTV.cl",Aysen TV (720p) https://v1.tustreaming.cl/aysentv/index.m3u8 diff --git a/streams/cn.m3u b/streams/cn.m3u index 8be3fced06..d0a4e976f3 100644 --- a/streams/cn.m3u +++ b/streams/cn.m3u @@ -1,8 +1,8 @@ #EXTM3U -#EXTINF:-1 tvg-id="AndoTV.cn",Ando TV -http://stream.qhbtv.com/adws/sd/live.m3u8 #EXTINF:-1 tvg-id="AndoTV.cn",Ando TV (576p) http://119.1.122.186:4022/rtp/238.255.2.189:5999 +#EXTINF:-1 tvg-id="AndoTV.cn",Ando TV +http://stream.qhbtv.com/adws/sd/live.m3u8 #EXTINF:-1 tvg-id="AnimationShowChannel.cn",Animation Show Channel http://180.213.174.225:9901/tsfile/live/1034_1.m3u8?authid=0&key=txiptv&playlive=1 #EXTINF:-1 tvg-id="",Beijing Traffic Radio TV [Geo-blocked] @@ -29,7 +29,7 @@ http://117.161.133.51:81/gitv_live/G_CCTV-1/G_CCTV-1.m3u8 http://117.161.133.51:81/gitv_live/G_CCTV-2/G_CCTV-2.m3u8 #EXTINF:-1 tvg-id="CCTV15.cn",CCTV15音乐 http://hwrr.jx.chinamobile.com:8080/PLTV/88888888/224/3221225641/index.m3u8 -#EXTINF:-1 tvg-id="",CCTV TV Guide (576p) +#EXTINF:-1 tvg-id="CCTVTVGuide.cn@SD",CCTV TV Guide (576p) http://117.161.133.51:81/gitv_live/G_DIANSHIZN-CQ/G_DIANSHIZN-CQ.m3u8?p=GITV #EXTINF:-1 tvg-id="CCTVWorldGeography.cn",CCTV 世界地理 http://117.161.133.51:81/gitv_live/G_SHIJIEDL-CQ/G_SHIJIEDL-CQ.m3u8?p=GITV @@ -41,7 +41,7 @@ http://117.161.133.51:81/gitv_live/G_TAIQIU-CQ/G_TAIQIU-CQ.m3u8?p=GITV http://117.161.133.51:81/gitv_live/G_CCTV-WENHUA-CQ/G_CCTV-WENHUA-CQ.m3u8?p=GITV #EXTINF:-1 tvg-id="CCTVWomensFashion.cn",CCTV 女性时尚 http://117.161.133.51:81/gitv_live/G_NVXINGSS-CQ/G_NVXINGSS-CQ.m3u8?p=GITV -#EXTINF:-1 tvg-id="",CCTV 第一剧场 +#EXTINF:-1 tvg-id="CCTVTheFirstTheater.cn@SD",CCTV 第一剧场 http://117.161.133.51:81/gitv_live/G_DIYIJC-CQ/G_DIYIJC-CQ.m3u8?p=GITV #EXTINF:-1 tvg-id="CCTVStormTheater.cn",CCTV 风云剧场 http://117.161.133.51:81/gitv_live/G_FENGYUNJC-CQ/G_FENGYUNJC-CQ.m3u8?p=GITV @@ -55,7 +55,7 @@ http://117.161.133.51:81/gitv_live/G_CCTV-GOLF-CQ/G_CCTV-GOLF-CQ.m3u8?p=GITV http://117.161.133.51:81/gitv_live/G_CETV-1/G_CETV-1.m3u8?p=GITV #EXTINF:-1 tvg-id="CETV2.cn",CETV2 (576p) http://117.161.133.51:81/gitv_live/G_CETV-2/G_CETV-2.m3u8?p=GITV -#EXTINF:-1 tvg-id="",CETV-1 +#EXTINF:-1 tvg-id="CETV1.cn@SD",CETV-1 http://121.19.134.246:808/hls/62/index.m3u8 #EXTINF:-1 tvg-id="CETV4.cn",CETV-4 http://49.113.179.174:4022/udp/238.125.3.92:5140 @@ -229,11 +229,11 @@ https://l.cztvcloud.com/channels/lantian/SXshangyu1/720p.m3u8 https://l.cztvcloud.com/channels/lantian/SXshangyu3/720p.m3u8 #EXTINF:-1 tvg-id="",上虞經濟文化 (720p) [Not 24/7] https://l.cztvcloud.com/channels/lantian/SXshangyu2/720p.m3u8 -#EXTINF:-1 tvg-id="",中国气象 (576p) [Not 24/7] +#EXTINF:-1 tvg-id="ChinaWeatherChannel.cn@SD",中国气象 (576p) [Not 24/7] http://hls.weathertv.cn/tslslive/qCFIfHB/hls/live_sd.m3u8 -#EXTINF:-1 tvg-id="",中天新聞 (1080p) [Not 24/7] +#EXTINF:-1 tvg-id="CTiNews.tw@SD",中天新聞 (1080p) [Not 24/7] http://seb.sason.top/sc/ztxw_fhd.m3u8 -#EXTINF:-1 tvg-id="",中視新聞 (1080p) [Geo-blocked] +#EXTINF:-1 tvg-id="CTVNewsChannel.tw@SD",中視新聞 (1080p) [Geo-blocked] http://seb.sason.top/sc/zsxw_fhd.m3u8 #EXTINF:-1 tvg-id="",丰宁综合 https://jwliveqxzb.hebyun.com.cn/fengningzonghe/fengningzonghe.m3u8 @@ -249,21 +249,21 @@ http://tvdrs.wsrtv.com.cn:8100/channellive/ch2.flv http://tvdrs.wsrtv.com.cn:8100/channellive/ch1.flv #EXTINF:-1 tvg-id="",云南 Ⅰ 红河综合台 (1080p) https://file.hhtv.cc/cms/videos/nmip-media/channellive/channel1/playlist.m3u8 -#EXTINF:-1 tvg-id="",云南卫视 (1080p) +#EXTINF:-1 tvg-id="YunnanSatelliteTV.cn@SD",云南卫视 (1080p) https://hwapi.yunshicloud.com/8xughf/e0bx15.m3u8 -#EXTINF:-1 tvg-id="",云南卫视 (576p) +#EXTINF:-1 tvg-id="YunnanSatelliteTV.cn@SD",云南卫视 (576p) http://39.134.115.163:8080/PLTV/88888910/224/3221225664/index.m3u8 -#EXTINF:-1 tvg-id="",云南卫视 (576p) +#EXTINF:-1 tvg-id="YunnanSatelliteTV.cn@SD",云南卫视 (576p) http://183.207.248.71/gitv/live1/G_YUNNAN/G_YUNNAN -#EXTINF:-1 tvg-id="",云南卫视 (576p) +#EXTINF:-1 tvg-id="YunnanSatelliteTV.cn@SD",云南卫视 (576p) http://223.110.245.157/ott.js.chinamobile.com/PLTV/3/224/3221225591/index.m3u8 -#EXTINF:-1 tvg-id="",云南卫视 (576p) +#EXTINF:-1 tvg-id="YunnanSatelliteTV.cn@SD",云南卫视 (576p) http://223.110.245.159/ott.js.chinamobile.com/PLTV/3/224/3221225838/index.m3u8 -#EXTINF:-1 tvg-id="",云南卫视 (576p) +#EXTINF:-1 tvg-id="YunnanSatelliteTV.cn@SD",云南卫视 (576p) http://223.110.245.173/PLTV/4/224/3221225838/index.m3u8 -#EXTINF:-1 tvg-id="",云南卫视 (576p) [Not 24/7] +#EXTINF:-1 tvg-id="YunnanSatelliteTV.cn@SD",云南卫视 (576p) [Not 24/7] http://183.207.248.71/cntv/live1/yunnanstv/yunnanstv -#EXTINF:-1 tvg-id="",云南卫视 (540p) +#EXTINF:-1 tvg-id="YunnanSatelliteTV.cn@SD",云南卫视 (540p) http://112.25.48.68/live/program/live/ynws/1300000/mnf.m3u8 #EXTINF:-1 tvg-id="",云南都市 (1080p) http://39.130.202.81:6610/gitv_live/G_YNTV-2-HD/G_YNTV-2-HD.m3u8 @@ -301,7 +301,7 @@ https://l.cztvcloud.com/channels/lantian/SXyuyao1/720p.m3u8 http://stream.jinjiang.tv/1/sd/live.m3u8 #EXTINF:-1 tvg-id="",兴隆综合 https://jwcdnqx.hebyun.com.cn/live/xlzh/1500k/tzwj_video.m3u8 -#EXTINF:-1 tvg-id="",兵团卫视 (540p) [Not 24/7] +#EXTINF:-1 tvg-id="BingtuanSatelliteTV.cn@SD",兵团卫视 (540p) [Not 24/7] http://112.25.48.68/live/program/live/btws/1300000/mnf.m3u8 #EXTINF:-1 tvg-id="",内江公共 (720p) http://njzb.scnj.tv:90/live/gggy_gggy800.m3u8 @@ -309,7 +309,7 @@ http://njzb.scnj.tv:90/live/gggy_gggy800.m3u8 http://njzb.scnj.tv:90/live/kjpd_kjpd800.m3u8 #EXTINF:-1 tvg-id="",内江综合 (720p) http://njzb.scnj.tv:90/live/xwzh_xwzh800.m3u8 -#EXTINF:-1 tvg-id="",内蒙古 (576p) +#EXTINF:-1 tvg-id="NeiMonggolTV.cn@SD",内蒙古 (576p) http://223.110.245.161/ott.js.chinamobile.com/PLTV/3/224/3221225836/index.m3u8 #EXTINF:-1 tvg-id="",内蒙古卫视 (576p) http://39.134.115.163:8080/PLTV/88888910/224/3221225667/index.m3u8 @@ -321,17 +321,17 @@ http://183.207.248.71/gitv/live1/G_NEIMENGGU/G_NEIMENGGU http://223.110.245.173/PLTV/4/224/3221225836/index.m3u8 #EXTINF:-1 tvg-id="",农安新闻综合 [Geo-blocked] https://stream2.jlntv.cn/naxw/sd/live.m3u8 -#EXTINF:-1 tvg-id="",凤凰中文 (720p) +#EXTINF:-1 tvg-id="PhoenixChineseChannel.hk@SD",凤凰中文 (720p) http://223.110.245.139/ott.js.chinamobile.com/PLTV/3/224/3221226922/index.m3u8 -#EXTINF:-1 tvg-id="",凤凰中文 (720p) +#EXTINF:-1 tvg-id="PhoenixChineseChannel.hk@SD",凤凰中文 (720p) http://223.110.245.139/PLTV/3/224/3221226922/index.m3u8 -#EXTINF:-1 tvg-id="",凤凰中文 (720p) +#EXTINF:-1 tvg-id="PhoenixChineseChannel.hk@SD",凤凰中文 (720p) http://223.110.245.167/ott.js.chinamobile.com/PLTV/3/224/3221226922/index.m3u8 -#EXTINF:-1 tvg-id="",凤凰中文 (576p) +#EXTINF:-1 tvg-id="PhoenixChineseChannel.hk@SD",凤凰中文 (576p) http://125.210.152.18:9090/live/FHZW_1200.m3u8 -#EXTINF:-1 tvg-id="",凤凰资讯 (720p) +#EXTINF:-1 tvg-id="PhoenixInfoNewsChannel.hk@SD",凤凰资讯 (720p) http://223.110.245.167/ott.js.chinamobile.com/PLTV/3/224/3221226923/index.m3u8 -#EXTINF:-1 tvg-id="",凤凰资讯 (576p) +#EXTINF:-1 tvg-id="PhoenixInfoNewsChannel.hk@SD",凤凰资讯 (576p) http://125.210.152.18:9090/live/FHZX_1200.m3u8 #EXTINF:-1 tvg-id="",凤凰香港 (720p) http://223.110.245.136/PLTV/3/224/3221226975/index.m3u8 @@ -343,12 +343,10 @@ http://uni6rtmp.tulix.tv:1935/vbstv/vbsabr.smil/chunklist_w1847269952_b204800.m3 http://uni6rtmp.tulix.tv:1935/vbstv/vbsabr.smil/chunklist_w439903609_b1228800.m3u8 #EXTINF:-1 tvg-id="",前郭综合 [Geo-blocked] https://stream2.jlntv.cn/qg/sd/live.m3u8 -#EXTINF:-1 tvg-id="",动作电影 (1080p) +#EXTINF:-1 tvg-id="CHCAction.cn@SD",动作电影 (1080p) http://39.134.19.68/dbiptv.sn.chinamobile.com/PLTV/88888888/224/3221226465/index.m3u8 #EXTINF:-1 tvg-id="",动画王国 (1080p) http://183.207.248.71/cntv/live1/donghuawg/donghuawg -#EXTINF:-1 tvg-id="BeijingSatelliteTV.cn",北京卫视 [Not 24/7] -http://ivi.bupt.edu.cn/hls/btv1.m3u8 #EXTINF:-1 tvg-id="BeijingSatelliteTV.cn",北京卫视 (1080p) http://39.134.115.163:8080/PLTV/88888910/224/3221225673/index.m3u8 #EXTINF:-1 tvg-id="BeijingSatelliteTV.cn",北京卫视 (1080p) @@ -371,12 +369,14 @@ http://223.110.245.163/ott.js.chinamobile.com/PLTV/3/224/3221227436/index.m3u8 http://223.110.245.173/PLTV/4/224/3221227390/index.m3u8 #EXTINF:-1 tvg-id="BeijingSatelliteTV.cn",北京卫视 (1080p) http://ott.js.chinamobile.com/PLTV/3/224/3221225574/index.m3u8 -#EXTINF:-1 tvg-id="",北京卫视 (1080p) [Not 24/7] +#EXTINF:-1 tvg-id="BeijingSatelliteTV.cn@SD",北京卫视 (1080p) [Not 24/7] http://112.25.48.68/live/program/live/bjwshd/4000000/mnf.m3u8 #EXTINF:-1 tvg-id="BeijingSatelliteTV.cn",北京卫视 (1080p) [Not 24/7] http://183.207.248.71/cntv/live1/beijingstv/beijingstv #EXTINF:-1 tvg-id="BeijingSatelliteTV.cn",北京卫视 (576p) http://183.207.248.71/gitv/live1/G_BEIJING/G_BEIJING +#EXTINF:-1 tvg-id="BeijingSatelliteTV.cn",北京卫视 [Not 24/7] +http://ivi.bupt.edu.cn/hls/btv1.m3u8 #EXTINF:-1 tvg-id="",北京紀實 (1080p) http://39.134.115.163:8080/PLTV/88888910/224/3221225675/index.m3u8 #EXTINF:-1 tvg-id="",北京紀實 (1080p) @@ -439,7 +439,7 @@ http://223.110.245.159/ott.js.chinamobile.com/PLTV/3/224/3221226996/index.m3u8 http://112.25.48.68/live/program/live/xmws/1300000/mnf.m3u8 #EXTINF:-1 tvg-id="",双峰电视一套 (360p) http://hnsf.chinashadt.com:2036/zhuanma/tv1.stream_360p/playlist.m3u8 -#EXTINF:-1 tvg-id="",发现之旅 (576p) +#EXTINF:-1 tvg-id="CNDFilmDiscoveryChannel.cn@SD",发现之旅 (576p) http://125.210.152.18:9090/live/FXZL_750.m3u8 #EXTINF:-1 tvg-id="",台視新聞 (1080p) [Not 24/7] http://seb.sason.top/sc/tsxw_fhd.m3u8 @@ -447,19 +447,19 @@ http://seb.sason.top/sc/tsxw_fhd.m3u8 http://218.204.153.158/10.m3u8 #EXTINF:-1 tvg-id="",吉林7 (900p) [Not 24/7] https://stream1.jlntv.cn/fzpd/sd/live.m3u8 -#EXTINF:-1 tvg-id="",吉林卫视 (576p) +#EXTINF:-1 tvg-id="JilinSatelliteTV.cn@SD",吉林卫视 (576p) http://39.134.115.163:8080/PLTV/88888910/224/3221225680/index.m3u8 -#EXTINF:-1 tvg-id="",吉林卫视 (576p) +#EXTINF:-1 tvg-id="JilinSatelliteTV.cn@SD",吉林卫视 (576p) http://117.169.120.140:8080/live/jilinstv/.m3u8 -#EXTINF:-1 tvg-id="",吉林卫视 (576p) +#EXTINF:-1 tvg-id="JilinSatelliteTV.cn@SD",吉林卫视 (576p) http://183.207.249.7/PLTV/4/224/3221225883/index.m3u8 -#EXTINF:-1 tvg-id="",吉林卫视 (576p) +#EXTINF:-1 tvg-id="JilinSatelliteTV.cn@SD",吉林卫视 (576p) http://223.110.245.153/ott.js.chinamobile.com/PLTV/3/224/3221225883/index.m3u8 -#EXTINF:-1 tvg-id="",吉林卫视 (540p) +#EXTINF:-1 tvg-id="JilinSatelliteTV.cn@SD",吉林卫视 (540p) http://112.25.48.68/live/program/live/jlws/1300000/mnf.m3u8 -#EXTINF:-1 tvg-id="",吉林卫视 (360p) +#EXTINF:-1 tvg-id="JilinSatelliteTV.cn@SD",吉林卫视 (360p) http://125.210.152.18:9090/live/JLWSHD_H265.m3u8 -#EXTINF:-1 tvg-id="",吉林卫视 (240p) [Not 24/7] +#EXTINF:-1 tvg-id="JilinSatelliteTV.cn@SD",吉林卫视 (240p) [Not 24/7] https://stream4.jlntv.cn/test2/sd/live.m3u8 #EXTINF:-1 tvg-id="",吉林市新闻综合 [Geo-blocked] https://stream2.jlntv.cn/jilin1/sd/live.m3u8 @@ -535,7 +535,7 @@ http://183.207.249.12/PLTV/4/224/3221225808/index.m3u8 http://223.110.245.151/ott.js.chinamobile.com/PLTV/3/224/3221225808/index.m3u8 #EXTINF:-1 tvg-id="",奇妙電視 (720p) http://media.fantv.hk/m3u8/archive/channel2_stream1.m3u8 -#EXTINF:-1 tvg-id="",女性时尚 (576p) +#EXTINF:-1 tvg-id="CCTVWomensFashion.cn@SD",女性时尚 (576p) http://223.110.245.169/PLTV/4/224/3221227026/index.m3u8 #EXTINF:-1 tvg-id="",如东新闻综合 (480p) [Not 24/7] http://live.rdxmt.com/channels/rudong/news/flv:sd/live @@ -543,17 +543,17 @@ http://live.rdxmt.com/channels/rudong/news/flv:sd/live http://live.dxhmt.cn:9081/tv/10883-1.m3u8 #EXTINF:-1 tvg-id="",孤注一掷清晰版 https://hd.ijycnd.com/play/zbqmMMkb/index.m3u8 -#EXTINF:-1 tvg-id="",宁夏卫视 (576p) +#EXTINF:-1 tvg-id="NingxiaSatelliteChannel.cn@SD",宁夏卫视 (576p) http://39.134.115.163:8080/PLTV/88888910/224/3221225726/index.m3u8 -#EXTINF:-1 tvg-id="",宁夏卫视 (576p) +#EXTINF:-1 tvg-id="NingxiaSatelliteChannel.cn@SD",宁夏卫视 (576p) http://117.169.120.140:8080/live/ningxiastv/.m3u8 -#EXTINF:-1 tvg-id="",宁夏卫视 (576p) +#EXTINF:-1 tvg-id="NingxiaSatelliteChannel.cn@SD",宁夏卫视 (576p) http://183.207.248.11/PLTV/4/224/3221225842/index.m3u8 -#EXTINF:-1 tvg-id="",宁夏卫视 (576p) +#EXTINF:-1 tvg-id="NingxiaSatelliteChannel.cn@SD",宁夏卫视 (576p) http://223.110.245.151/ott.js.chinamobile.com/PLTV/3/224/3221225842/index.m3u8 -#EXTINF:-1 tvg-id="",宁夏卫视 (576p) [Not 24/7] +#EXTINF:-1 tvg-id="NingxiaSatelliteChannel.cn@SD",宁夏卫视 (576p) [Not 24/7] http://183.207.248.71/gitv/live1/G_NINGXIA/G_NINGXIA -#EXTINF:-1 tvg-id="",宁夏卫视 (540p) +#EXTINF:-1 tvg-id="NingxiaSatelliteChannel.cn@SD",宁夏卫视 (540p) http://112.25.48.68/live/program/live/nxws/1300000/mnf.m3u8 #EXTINF:-1 tvg-id="",安徽 Ⅰ 淮北公共 (720p) http://live.0561rtv.cn/ggpd/hd/live.m3u8 @@ -599,7 +599,7 @@ http://stream2.ahrtv.cn/lygb/sd/live.m3u8 http://183.207.248.71/cntv/live1/wmyx/wmyx #EXTINF:-1 tvg-id="",宜章新闻综合 (576p) http://hnyz.chinashadt.com:2036/live/stream:tv1.stream/playlist.m3u8 -#EXTINF:-1 tvg-id="",家庭影院 (1080p) +#EXTINF:-1 tvg-id="CHCHomeTheater.cn@SD",家庭影院 (1080p) http://39.134.19.153/dbiptv.sn.chinamobile.com/PLTV/88888888/224/3221226462/index.m3u8 #EXTINF:-1 tvg-id="",家庭理财 (576p) http://223.110.245.139/PLTV/4/224/3221227011/index.m3u8 @@ -635,7 +635,7 @@ http://223.110.245.139/PLTV/4/224/3221227448/index.m3u8 http://223.110.254.207:6610/cntv/live1/HD-2500k-1080P-shandongstv/HD-2500k-1080P-shandongstv/1.m3u8 #EXTINF:-1 tvg-id="ShandongTV.cn",山东卫视 (1080p) http://ott.js.chinamobile.com/PLTV/3/224/3221227258/index.m3u8 -#EXTINF:-1 tvg-id="",山东卫视 (720p) +#EXTINF:-1 tvg-id="ShandongSatelliteTV.cn@SD",山东卫视 (720p) http://125.210.152.18:9090/live/SDWSHD_H265.m3u8 #EXTINF:-1 tvg-id="ShandongTV.cn",山东卫视 (576p) http://183.207.248.71/gitv/live1/SDWS/SDWS @@ -843,13 +843,13 @@ http://222.179.155.21:1935/ch0.m3u8 https://live.lyg1.com/ggpd/sd/live.m3u8 #EXTINF:-1 tvg-id="",江苏 Ⅰ 连云港综合 (480p) [Not 24/7] https://live.lyg1.com/zhpd/sd/live.m3u8 -#EXTINF:-1 tvg-id="",江苏体育 (576p) +#EXTINF:-1 tvg-id="JiangsuSportsLeisureChannel.cn@SD",江苏体育 (576p) http://183.207.248.71/gitv/live1/G_JSTY/G_JSTY -#EXTINF:-1 tvg-id="",江苏体育 (576p) +#EXTINF:-1 tvg-id="JiangsuSportsLeisureChannel.cn@SD",江苏体育 (576p) http://183.207.249.12/PLTV/4/224/3221225935/index.m3u8 -#EXTINF:-1 tvg-id="",江苏体育 (576p) +#EXTINF:-1 tvg-id="JiangsuSportsLeisureChannel.cn@SD",江苏体育 (576p) http://223.110.245.157/ott.js.chinamobile.com/PLTV/3/224/3221225935/index.m3u8 -#EXTINF:-1 tvg-id="",江苏公共 (576p) +#EXTINF:-1 tvg-id="JiangsuPublicNewsChannel.cn@SD",江苏公共 (576p) http://183.207.248.71/gitv/live1/G_JSGG/G_JSGG #EXTINF:-1 tvg-id="JiangsuSatelliteTV.cn",江苏卫视 (1080p) http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226200/index.m3u8 @@ -873,19 +873,19 @@ http://223.110.245.170/PLTV/3/224/3221227255/index.m3u8 http://183.207.248.71/cntv/live1/HD-2500k-1080P-jiangsustv/HD-2500k-1080P-jiangsustv #EXTINF:-1 tvg-id="JiangsuSatelliteTV.cn",江苏卫视 (576p) http://183.207.248.71/gitv/live1/JSWS-HD/JSWS-HD -#EXTINF:-1 tvg-id="",江苏城市 (576p) +#EXTINF:-1 tvg-id="JiangsuCityChannel.cn@SD",江苏城市 (576p) http://183.207.248.71/gitv/live1/G_JSCS/G_JSCS -#EXTINF:-1 tvg-id="",江苏城市 (576p) +#EXTINF:-1 tvg-id="JiangsuCityChannel.cn@SD",江苏城市 (576p) http://223.110.245.143/ott.js.chinamobile.com/PLTV/3/224/3221225929/index.m3u8 -#EXTINF:-1 tvg-id="",江苏影视 (576p) +#EXTINF:-1 tvg-id="JiangsuMovieChannel.cn@SD",江苏影视 (576p) http://223.110.243.134/PLTV/4/224/3221225937/index.m3u8 -#EXTINF:-1 tvg-id="",江苏影视 (576p) [Not 24/7] +#EXTINF:-1 tvg-id="JiangsuMovieChannel.cn@SD",江苏影视 (576p) [Not 24/7] http://183.207.248.71/gitv/live1/G_JSYS/G_JSYS -#EXTINF:-1 tvg-id="",江苏教育 (576p) +#EXTINF:-1 tvg-id="JiangsuEducationalChannel.cn@SD",江苏教育 (576p) http://223.110.245.151/ott.js.chinamobile.com/PLTV/3/224/3221225923/index.m3u8 -#EXTINF:-1 tvg-id="",江苏教育 (576p) [Not 24/7] +#EXTINF:-1 tvg-id="JiangsuEducationalChannel.cn@SD",江苏教育 (576p) [Not 24/7] http://183.207.248.71/gitv/live1/G_JSJY/G_JSJY -#EXTINF:-1 tvg-id="",江苏综艺 (576p) [Not 24/7] +#EXTINF:-1 tvg-id="JiangsuVarietyChannel.cn@SD",江苏综艺 (576p) [Not 24/7] http://183.207.248.71/gitv/live1/G_JSZY/G_JSZY #EXTINF:-1 tvg-id="JiangxiTV.cn",江西卫视 (1080p) http://39.134.115.163:8080/PLTV/88888910/224/3221225705/index.m3u8 @@ -915,12 +915,12 @@ http://hebcx.chinashadt.com:2036/live/10002.stream/playlist.m3u8 http://hebcx.chinashadt.com:2036/live/10001.stream/playlist.m3u8 #EXTINF:-1 tvg-id="",河北公共 http://121.19.134.246:808/hls/24/index.m3u8 -#EXTINF:-1 tvg-id="",河北农民 -http://121.19.134.246:808/hls/25/index.m3u8 #EXTINF:-1 tvg-id="",河北农民 (576p) http://hbzx.chinashadt.com:2036/zhibo/stream:hbnm.stream/playlist.m3u8 #EXTINF:-1 tvg-id="",河北农民 (360p) http://hbzx.chinashadt.com:2036/zhibo/stream:hbnm.stream_360p/playlist.m3u8 +#EXTINF:-1 tvg-id="",河北农民 +http://121.19.134.246:808/hls/25/index.m3u8 #EXTINF:-1 tvg-id="HebeiTV.cn",河北卫视 (576p) http://39.134.115.163:8080/PLTV/88888910/224/3221225732/index.m3u8 #EXTINF:-1 tvg-id="HebeiTV.cn",河北卫视 (576p) @@ -945,7 +945,7 @@ http://183.207.248.71/cntv/live1/henanstv/henanstv http://ott.js.chinamobile.com/PLTV/3/224/3221225815/index.m3u8 #EXTINF:-1 tvg-id="HenanTVSatellite.cn",河南卫视 (540p) http://112.25.48.68/live/program/live/hnws/1300000/mnf.m3u8 -#EXTINF:-1 tvg-id="",河源公共 (540p) +#EXTINF:-1 tvg-id="HeyuanPublicTV.cn@SD",河源公共 (540p) https://tmpstream.hyrtv.cn/hygg/sd/live.m3u8 #EXTINF:-1 tvg-id="",河源综合 (540p) https://tmpstream.hyrtv.cn/xwzh/sd/live.m3u8 @@ -1003,18 +1003,18 @@ http://ott.js.chinamobile.com/PLTV/3/224/3221227393/index.m3u8 https://hw-m-l.cztv.com/channels/lantian/channel01/1080p.m3u8 #EXTINF:-1 tvg-id="ZhejiangSatelliteTV.cn",浙江卫视 (576p) http://183.207.248.71/gitv/live1/G_ZHEJIANG/G_ZHEJIANG -#EXTINF:-1 tvg-id="",浙江国际 -https://ali-m-l.cztv.com/channels/lantian/channel010/1080p.m3u8 #EXTINF:-1 tvg-id="",浙江国际 (1080p) https://ct-m-l.cztv.com/channels/lantian/channel010/1080p.m3u8 #EXTINF:-1 tvg-id="",浙江国际 (1080p) https://qiniup-m-l.cztv.com/channels/lantian/channel010/1080p.m3u8 -#EXTINF:-1 tvg-id="",浙江少儿 -https://ct-m-l.cztv.com/channels/lantian/channel008/1080p.m3u8 +#EXTINF:-1 tvg-id="",浙江国际 +https://ali-m-l.cztv.com/channels/lantian/channel010/1080p.m3u8 #EXTINF:-1 tvg-id="ZhejiangChildrensChannel.cn",浙江少儿 (1080p) https://qiniup-m-l.cztv.com/channels/lantian/channel008/1080p.m3u8 #EXTINF:-1 tvg-id="ZhejiangChildrensChannel.cn",浙江少儿 (1080p) [Not 24/7] https://hw-m-l.cztv.com/channels/lantian/channel08/1080p.m3u8 +#EXTINF:-1 tvg-id="",浙江少儿 +https://ct-m-l.cztv.com/channels/lantian/channel008/1080p.m3u8 #EXTINF:-1 tvg-id="",浙江影视 (720p) https://qiniup-m-l.cztv.com/channels/lantian/channel005/1080p.m3u8 #EXTINF:-1 tvg-id="",浙江教科 @@ -1035,12 +1035,12 @@ https://hw-m-l.cztv.com/channels/lantian/channel09/1080p.m3u8 https://ali-m-l.cztv.com/channels/lantian/channel003/1080p.m3u8 #EXTINF:-1 tvg-id="ZhejiangEconomicChannel.cn",浙江经济生活 (1080p) [Not 24/7] https://hw-m-l.cztv.com/channels/lantian/channel003/1080p.m3u8 -#EXTINF:-1 tvg-id="",浙江钱江 -https://ali-m-l.cztv.com/channels/lantian/channel002/1080p.m3u8 #EXTINF:-1 tvg-id="",浙江钱江 (1080p) https://hw-m-l.cztv.com/channels/lantian/channel002/1080p.m3u8 #EXTINF:-1 tvg-id="",浙江钱江 (1080p) [Not 24/7] https://hw-m-l.cztv.com/channels/lantian/channel02/1080p.m3u8 +#EXTINF:-1 tvg-id="",浙江钱江 +https://ali-m-l.cztv.com/channels/lantian/channel002/1080p.m3u8 #EXTINF:-1 tvg-id="HainanSatelliteTV.cn",海南卫视 (720p) [Not 24/7] http://livelyws.chinamcache.com/lyws/zb01.m3u8?auth_key=1593241343-0-0-90b80e74457c94b2015f9428a1cb9b0e #EXTINF:-1 tvg-id="HainanSatelliteTV.cn",海南卫视 (576p) @@ -1131,7 +1131,7 @@ http://223.110.245.165/ott.js.chinamobile.com/PLTV/3/224/3221225854/index.m3u8 http://hbpx.chinashadt.com:2036/live/px5.stream/playlist.m3u8 #EXTINF:-1 tvg-id="HunanTV.cn",湖南卫视 (360p) http://125.210.152.18:9090/live/HNWSHD_H265.m3u8 -#EXTINF:-1 tvg-id="",湖南都市 (576p) +#EXTINF:-1 tvg-id="HunanCityChannel.cn@SD",湖南都市 (576p) http://hnsd.chinashadt.com:2036/live/stream:hunandushi.stream/playlist.m3u8 #EXTINF:-1 tvg-id="",湘潭公共 (576p) http://live.hnxttv.com:9601/live/dspd/800K/tzwj_video.m3u8 @@ -1197,7 +1197,7 @@ http://gddb.chinashadt.com:1935/live/video2.stream_360p/playlist.m3u8 http://gddb.chinashadt.com:1935/live/video1.stream/playlist.m3u8 #EXTINF:-1 tvg-id="",电白综合 (360p) [Not 24/7] http://gddb.chinashadt.com:1935/live/video1.stream_360p/playlist.m3u8 -#EXTINF:-1 tvg-id="",白城新闻综合 [Geo-blocked] +#EXTINF:-1 tvg-id="BaichengTV.cn@SD",白城新闻综合 [Geo-blocked] https://stream2.jlntv.cn/baicheng1/sd/live.m3u8 #EXTINF:-1 tvg-id="",白山新闻综合 [Geo-blocked] https://stream2.jlntv.cn/baishan1/sd/live.m3u8 @@ -1253,7 +1253,7 @@ http://119.39.242.52:1935/live/zonghe/playlist.m3u8 http://183.207.248.71/cntv/live1/jdianying/jdianying #EXTINF:-1 tvg-id="",红牛REDBULL TV (720p) https://rbmn-live.akamaized.net/hls/live/590964/BoRB-AT/master_3360.m3u8 -#EXTINF:-1 tvg-id="",纪实人文 (1080p) +#EXTINF:-1 tvg-id="DocumentaryHumanitiesChannel.cn@SD",纪实人文 (1080p) http://39.135.138.59:18890/PLTV/88888910/224/3221225655/index.m3u8 #EXTINF:-1 tvg-id="",纯享4K (2160p) http://39.134.115.163:8080/PLTV/88888910/224/3221225786/index.m3u8 @@ -1267,10 +1267,10 @@ http://223.110.245.161/ott.js.chinamobile.com/PLTV/3/224/3221227037/index.m3u8 https://jpts.sinovision.net/livestream.m3u8 #EXTINF:-1 tvg-id="",美国狗狗宠物 (1080p) https://video.blivenyc.com/broadcast/prod/2061/22/desktop-playlist.m3u8 -#EXTINF:-1 tvg-id="",耀才财经 -http://202.69.67.66/webcast/bshdlive-pc/playlist.m3u8 #EXTINF:-1 tvg-id="",耀才财经 (288p) http://202.69.67.66:443/webcast/bshdlive-mobile/playlist.m3u8 +#EXTINF:-1 tvg-id="",耀才财经 +http://202.69.67.66/webcast/bshdlive-pc/playlist.m3u8 #EXTINF:-1 tvg-id="",肃州电视台 (1080p) http://117.156.28.119/270000001111/1110000123/index.m3u8 #EXTINF:-1 tvg-id="",舟山公共生活 (720p) @@ -1425,11 +1425,11 @@ http://35908.hlsplay.aodianyun.com/guangdianyun_35908/tv_channel_327.m3u8 https://stream2.jlntv.cn/jlcc/sd/live.m3u8 #EXTINF:-1 tvg-id="",长沙地铁移动 [Geo-blocked] http://35848.hlsplay.aodianyun.com/guangdianyun_35848/tv_channel_356.m3u8 -#EXTINF:-1 tvg-id="",长沙女性 [Geo-blocked] +#EXTINF:-1 tvg-id="HunanWomensChannel.cn@SD",长沙女性 [Geo-blocked] http://35848.hlsplay.aodianyun.com/guangdianyun_35848/tv_channel_349.m3u8 -#EXTINF:-1 tvg-id="",长沙政法 [Geo-blocked] +#EXTINF:-1 tvg-id="HunanPoliticsLawChannel.cn@SD",长沙政法 [Geo-blocked] http://35848.hlsplay.aodianyun.com/guangdianyun_35848/tv_channel_348.m3u8 -#EXTINF:-1 tvg-id="",长沙新闻 [Geo-blocked] +#EXTINF:-1 tvg-id="HunanNewsChannel.cn@SD",长沙新闻 [Geo-blocked] http://35848.hlsplay.aodianyun.com/guangdianyun_35848/tv_channel_346.m3u8 #EXTINF:-1 tvg-id="",长沙经贸 [Geo-blocked] http://35848.hlsplay.aodianyun.com/guangdianyun_35848/tv_channel_350.m3u8 @@ -1481,13 +1481,13 @@ http://visit.jjbctv.com:1935/live/xwzhpc/playlist.m3u8 http://visit.jjbctv.com:1935/live/xwzhmb/playlist.m3u8 #EXTINF:-1 tvg-id="",静宁综合 (1080p) http://117.156.28.119/270000001111/1110000147/index.m3u8 -#EXTINF:-1 tvg-id="",风尚购物 (1080p) +#EXTINF:-1 tvg-id="FengshangShoppingChannel.cn@SD",风尚购物 (1080p) http://183.207.248.71/cntv/live1/fengshanggw/fengshanggw #EXTINF:-1 tvg-id="",餘姚姚江文化 (576p) [Not 24/7] https://l.cztvcloud.com/channels/lantian/SXyuyao2/720p.m3u8 #EXTINF:-1 tvg-id="HighChannelTV.cn",高台电视台 (1080p) http://117.156.28.119/270000001111/1110000146/index.m3u8 -#EXTINF:-1 tvg-id="",高清电影 (1080p) +#EXTINF:-1 tvg-id="CHCHD.cn@SD",高清电影 (1080p) http://39.134.19.76/dbiptv.sn.chinamobile.com/PLTV/88888888/224/3221226463/index.m3u8 #EXTINF:-1 tvg-id="HebiNewsChannel.cn",鹤壁新闻综合 (480p) [Not 24/7] http://pili-live-hls.hebitv.com/hebi/hebi.m3u8 diff --git a/streams/cy.m3u b/streams/cy.m3u index f2939fe87a..78b2d138ea 100644 --- a/streams/cy.m3u +++ b/streams/cy.m3u @@ -10,16 +10,16 @@ https://dev.aftermind.xyz/hls/unitrust/alfasports/index.m3u8?token=8TXWzhY3h6jrz http://l4.cloudskep.com/alphatmp/acy/playlist.m3u8 #EXTINF:-1 tvg-id="ANT1Cyprus.cy",ANT1 Cyprus (1080p) http://l2.cloudskep.com/ant1cm2/abr/playlist.m3u8 -#EXTINF:-1 tvg-id="BRT1.cy",BRT 1 -https://canlitvulusal.xyz/live/brt1/index.m3u8 #EXTINF:-1 tvg-id="BRT1.cy",BRT 1 (720p) [Not 24/7] https://sc-kuzeykibrissmarttv.ercdn.net/brt1hd/bant1/playlist.m3u8 -#EXTINF:-1 tvg-id="BRT2.cy",BRT 2 -https://canlitvulusal.xyz/live/brt2/index.m3u8 +#EXTINF:-1 tvg-id="BRT1.cy",BRT 1 +https://canlitvulusal.xyz/live/brt1/index.m3u8 #EXTINF:-1 tvg-id="BRT2.cy",BRT 2 (720p) http://bozztv.com/gin-36bay3/gt-kibrisbrt3/index.m3u8 #EXTINF:-1 tvg-id="BRT2.cy",BRT 2 (720p) [Not 24/7] https://sc-kuzeykibrissmarttv.ercdn.net/brt2hd/bant1/playlist.m3u8 +#EXTINF:-1 tvg-id="BRT2.cy",BRT 2 +https://canlitvulusal.xyz/live/brt2/index.m3u8 #EXTINF:-1 tvg-id="BRT3.cy",BRT 3 http://185.234.111.229:8000/play/a07e #EXTINF:-1 tvg-id="CityChannel.cy",City Channel (720p) [Not 24/7] diff --git a/streams/de.m3u b/streams/de.m3u index 2a5a3f560e..1ce2ef96ec 100644 --- a/streams/de.m3u +++ b/streams/de.m3u @@ -3,6 +3,8 @@ https://123tv-mx1.flex-cdn.net/index.m3u8 #EXTINF:-1 tvg-id="3sat.de",3sat (720p) [Geo-blocked] https://zdf-hls-18.akamaized.net/hls/live/2016501/dach/high/master.m3u8 +#EXTINF:-1 tvg-id="AlexBerlin.de",Alex Berlin (1080p) +https://alex-stream.rosebud-media.de/bounce/alexlivetv50.smil/index.m3u8 #EXTINF:-1 tvg-id="AllgauTV.de",Allgäu TV (1080p) https://stream01.welocal.stream/stream/fhd-allgaeutv_25679/ngrp:stream_all/playlist.m3u8 #EXTINF:-1 tvg-id="AltenburgTV.de",Altenburg TV (1080p) @@ -79,13 +81,13 @@ https://dbjwcot8t7nyd.cloudfront.net/out/v1/9d068a9428444b458324ad77b5a0a4b8/ind https://muc3.iptv-playoutcenter.de/dokusat/dokusat1/playlist.m3u8 #EXTINF:-1 tvg-id="SachsenFernsehenDresden.de",Dresden Fernsehen (1080p) [Not 24/7] https://dresden.iptv-playoutcenter.de/dresden/dresdenfernsehen.stream_1/playlist.m3u8 -#EXTINF:-1 tvg-id="DWArabic.de",DW Arabic (1080p) +#EXTINF:-1 tvg-id="DW.de@Arabic",DW Arabic (1080p) https://dwamdstream103.akamaized.net/hls/live/2015526/dwstream103/index.m3u8 -#EXTINF:-1 tvg-id="DWEnglish.de",DW English (1080p) +#EXTINF:-1 tvg-id="DW.de@English",DW English (1080p) https://dwamdstream102.akamaized.net/hls/live/2015525/dwstream102/index.m3u8 -#EXTINF:-1 tvg-id="DWEspanol.de",DW Español (1080p) +#EXTINF:-1 tvg-id="DW.de@Espanol",DW Español (1080p) https://dwamdstream104.akamaized.net/hls/live/2015530/dwstream104/index.m3u8 -#EXTINF:-1 tvg-id="DWRussian.de",DW Russian (1080p) +#EXTINF:-1 tvg-id="DW.de@Russian",DW Russian (1080p) https://dwamdstream110.akamaized.net/hls/live/2017971/dwstream110/index.m3u8 #EXTINF:-1 tvg-id="EchtJetztTV.de",EchtJetzt TV (720p) https://bibeltv03.iptv-playoutcenter.de/bibeltv03/bibeltv03.stream_all/playlist.m3u8 @@ -161,6 +163,8 @@ https://leipzig.iptv-playoutcenter.de/leipzig/leipzigfernsehen.stream_1/playlist http://streamer1.streamhost.org:1935/salive/lctvde/playlist.m3u8 #EXTINF:-1 tvg-id="MagentaMusik360.de",Magenta Musik 360 (1080p) https://streaming.magentamusik.de/csm/573870/magentamusik1/index.m3u8 +#EXTINF:-1 tvg-id="MCTV.de",MC TV (720p) +https://rrr.sz.xlcdn.com/?account=mceutv&file=mc2&output=playlist.m3u8&protocol=https&service=wowza&type=live #EXTINF:-1 tvg-id="MDF1.de",MDF.1 (1080p) http://58bd5b7a98e04.streamlock.net/medienasa-live/mdf1_high/playlist.m3u8 #EXTINF:-1 tvg-id="MDRFernsehenSachsen.de",MDR Fernsehen Sachsen (1080p) [Geo-blocked] @@ -307,7 +311,7 @@ http://85.187.13.40:18000/ProSieben https://s6.hopslan.com/pro7x1/index.m3u8 #EXTINF:-1 tvg-id="PUNKTumFernsehen.de",PUNKTum Fernsehen (1080p) [Not 24/7] http://58bd5b7a98e04.streamlock.net/medienasa-live/punktum_high/playlist.m3u8 -#EXTINF:-1 tvg-id="",QVC 2 Germany (540p) +#EXTINF:-1 tvg-id="QVCZwei.de@SD",QVC 2 Germany (540p) https://qvcde-live.akamaized.net/hls/live/2097104/qps/master.m3u8 #EXTINF:-1 tvg-id="QVC.de",QVC Germany (720p) https://qvcde-live.akamaized.net/hls/live/2097104/qvc/master.m3u8 @@ -345,6 +349,8 @@ https://regiotv-s.iptv-playoutcenter.de/regiotv-s/regiotv-s.stream_1/playlist.m3 http://wowza.telvi.de/rennsteigtv/stream_720p/playlist.m3u8 #EXTINF:-1 tvg-id="RFH.de",RFH (1080p) http://58bd5b7a98e04.streamlock.net/medienasa-live/RFH_high/playlist.m3u8 +#EXTINF:-1 tvg-id="RFH.de",RFH (1080p) +https://h056.video-stream-hosting.de/medienasa-live/_definst_/mp4:RFH_high/index.m3u8 #EXTINF:-1 tvg-id="RFO.de",RFO (1080p) https://stream01.stream.welocal.world/stream/fhd-rfo_66876/ngrp:stream_all/playlist.m3u8 #EXTINF:-1 tvg-id="RheinMainTV.de",RheinMain TV (720p) [Not 24/7] @@ -506,9 +512,3 @@ https://zdf-hls-16.akamaized.net/hls/live/2016499/de/high/master.m3u8 https://ef56ef401101403a8b06f1dec29ef1eb.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Samsung-de_ZeeOne/playlist.m3u8 #EXTINF:-1 tvg-id="ZweiMusicTelevision.de",ZWEI2 Music (1080p) https://cdne.folxplay.tv/folx-trz/streams/ch-2/master.m3u8 -#EXTINF:-1 tvg-id="MCTV.de",MC TV (720p) -https://rrr.sz.xlcdn.com/?account=mceutv&file=mc2&type=live&service=wowza&protocol=https&output=playlist.m3u8 -#EXTINF:-1 tvg-id="RFH.de",RFH (1080p) -https://h056.video-stream-hosting.de/medienasa-live/_definst_/mp4:RFH_high/index.m3u8 -#EXTINF:-1 tvg-id="AlexBerlin.de",Alex Berlin (1080p) -https://alex-stream.rosebud-media.de/bounce/alexlivetv50.smil/index.m3u8 diff --git a/streams/de_pluto.m3u b/streams/de_pluto.m3u index 0d853dad88..4cc9fa6096 100644 --- a/streams/de_pluto.m3u +++ b/streams/de_pluto.m3u @@ -1,83 +1,83 @@ #EXTM3U -#EXTINF:-1 tvg-id="",48 Hours +#EXTINF:-1 tvg-id="48Hours.us@SD",48 Hours http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/651432fa98020f000878b407/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84abba50-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6ae76c45-60ac-4cc1-baf6-65893cf0446b -#EXTINF:-1 tvg-id="",90210 +#EXTINF:-1 tvg-id="90210.us@SD",90210 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a67dd13af63d0008257f17/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84abe160-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=33a2585b-a5ca-4d3b-a8ca-bea4dff25f97 -#EXTINF:-1 tvg-id="ActionSports.de",Action Sports +#EXTINF:-1 tvg-id="ActionSports.us@Germany",Action Sports http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5be1be871843b56328bc3ef1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac0870-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a89100a8-8115-4b28-9869-072164526f31 #EXTINF:-1 tvg-id="",AKIBA PASS TV Anime: Sport http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/659e598ab9adc4000843c574/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac0871-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1aca10c2-09e3-4dba-9e0e-6d174d5eb77f #EXTINF:-1 tvg-id="",Alle hassen Chris http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/622f6e1e2792150007e0b2ff/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac0872-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7ea668b9-4d7e-42c7-b818-8ea4b444d1c9 -#EXTINF:-1 tvg-id="",Anger Management +#EXTINF:-1 tvg-id="AngerManagementChannel.us@SD",Anger Management http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/655ca57e4261ca00080b3a04/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac0873-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ba8090e5-75c3-49e1-b27f-57399848d7ed #EXTINF:-1 tvg-id="",Assassination Classroom http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a7d99f4a10d800086083a9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac0874-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8cf3451c-2f6e-495e-93bc-62d48d70c6bc -#EXTINF:-1 tvg-id="",Auction Hunters +#EXTINF:-1 tvg-id="PlutoTVAuctionHunters.us@SD",Auction Hunters http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ede45d077746000072be0fe/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac2f80-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b4e4d851-50d8-4e9c-9824-31d78816509e #EXTINF:-1 tvg-id="",Auf Achse http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/61fbf91afb1b10000880dd08/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac2f81-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=601f4d3b-4861-4283-9b4f-d09024aaa219 -#EXTINF:-1 tvg-id="",Auto Motor Sport +#EXTINF:-1 tvg-id="AutoMotorogSportTV.no@SD",Auto Motor Sport http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f760c3d41aa2d0007bfde19/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac2f82-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=bd6f9149-f825-44a8-988e-28acbcdc798e -#EXTINF:-1 tvg-id="Avatar.de",Avatar +#EXTINF:-1 tvg-id="Avatar.us@Germany",Avatar http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/600adbdf8c554e00072125c9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac5690-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f0f2f9f0-a766-421f-b28e-f13232bf4b9f #EXTINF:-1 tvg-id="",Avatar OV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65819d3514fbe4000880ef26/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac5691-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ed191cf4-f681-46bb-b852-7fdac772591f #EXTINF:-1 tvg-id="",Awkward http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bc1784120ba80007935aaa/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac5692-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c2c2d7cc-7d4d-4255-a842-24443e529840 -#EXTINF:-1 tvg-id="",Baywatch +#EXTINF:-1 tvg-id="Baywatch.us@Germany",Baywatch http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65819e62b228b70008570e9f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac5693-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d16fb6c5-9a46-423c-ad6d-ed7c38457c0d -#EXTINF:-1 tvg-id="BBCTravel.de",BBC Travel +#EXTINF:-1 tvg-id="BBCTravel.us@Germany",BBC Travel http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60e4519e6873180007d3cddb/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac5694-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6c128a45-6314-4183-a002-254731ea91a6 -#EXTINF:-1 tvg-id="",Becker +#EXTINF:-1 tvg-id="AlanBeckerTV.us@SD",Becker http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/630348a54c48ce00077eb6c7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac5695-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b1b31f04-864d-413e-8fc3-19d800ee7569 -#EXTINF:-1 tvg-id="",Bellator MMA +#EXTINF:-1 tvg-id="BellatorMMA.us@SD",Bellator MMA http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63ecbedda9957100089ca486/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac5696-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=efdc0c45-3350-44ad-87e8-545561770707 -#EXTINF:-1 tvg-id="BeverlyHills90210.de",Beverly Hills 90210 +#EXTINF:-1 tvg-id="BeverlyHills90210.us@Germany",Beverly Hills 90210 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60afb576053df900076fa2f0/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac7da0-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c388ec54-e705-453e-8f4f-45a71cebb28d #EXTINF:-1 tvg-id="",Bewegte Männer http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64105834925bd50008f5cde5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac7da1-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=cf79d4d8-a759-4662-8f38-518c050b275c -#EXTINF:-1 tvg-id="BeybladeBurst.de",Beyblade Burst +#EXTINF:-1 tvg-id="BeybladeBurst.us@Germany",Beyblade Burst http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b551ddcd25500072c4dad/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac7da2-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=03306a54-f5db-48a2-aa47-0d5671d10e01 -#EXTINF:-1 tvg-id="",Big Time Rush +#EXTINF:-1 tvg-id="BigTimeRush.us@Germany",Big Time Rush http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/663385cd06839f0008e00e93/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac7da3-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4b885ec0-86a3-4a1e-b3cb-90a1f041ddf9 -#EXTINF:-1 tvg-id="",Billiard TV +#EXTINF:-1 tvg-id="BilliardTV.us@SD",Billiard TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65df0cff66eec8000897b3a4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac7da4-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a6a5c7ba-51fa-40bf-ba59-05a9daef6fd5 #EXTINF:-1 tvg-id="",Blaze und die Monstermaschinen http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b60419becf60008c841fd/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac7da5-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f4041af9-036d-4b63-bc69-460e45fdcf98 #EXTINF:-1 tvg-id="",Bloch Erklärt http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/654a2c1ff9cc82000867dada/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac7da6-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=bf2007bc-2b1a-4227-ad70-315b7a122d66 -#EXTINF:-1 tvg-id="BluesClues.de",Blue's Clues +#EXTINF:-1 tvg-id="BluesClues.us@Germany",Blue's Clues http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b564ff59d130007363823/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ac7da7-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3c6a32f6-bdd9-4cb2-8697-def40b294b7e -#EXTINF:-1 tvg-id="BubbleGuppies.de",Bubble Guppies +#EXTINF:-1 tvg-id="BubbleGuppies.us@Germany",Bubble Guppies http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b5a4bb7da5c0007e5c9e9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aca4b0-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d9f332f4-cf88-4dfa-b110-d5810536c437 #EXTINF:-1 tvg-id="",Car Chase http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a93a9d3af63d00082c4850/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aca4b1-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2f1f40e7-a4ba-4408-8be1-f84ee6cf373e #EXTINF:-1 tvg-id="CBSNews247.us",CBS News 24/7 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62441d6ded1827000763dcda/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aca4b2-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=dccc0e7c-5b78-4526-90f9-401f7ca29bc9 -#EXTINF:-1 tvg-id="CCMadeinGermany.de",CC Made in Germany +#EXTINF:-1 tvg-id="CCMadeinGermany.us@Germany",CC Made in Germany http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d4948418101147596fd6c5a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aca4b3-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=cebc08f6-619a-468b-ba8e-e6971225e6c6 -#EXTINF:-1 tvg-id="CCPlutoTV.de",CC Pluto TV +#EXTINF:-1 tvg-id="CCPlutoTV.us@Germany",CC Pluto TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d4947590ba40f75dc29c26b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aca4b4-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c4adaaf6-09fa-43e6-a254-c92d6891db35 -#EXTINF:-1 tvg-id="ChaosCity.de",Chaos City +#EXTINF:-1 tvg-id="ChaosCity.us@Germany",Chaos City http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60afbad343e3840007164348/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aca4b5-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ac925887-52f7-4055-a15c-ef63b5a406a8 -#EXTINF:-1 tvg-id="Cheers.de",Cheers +#EXTINF:-1 tvg-id="Cheers.us@Germany",Cheers http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/611e7f224676bf00076a4d8d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aca4b6-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0d96d22d-3148-4e7e-b0e9-67b35648c724 #EXTINF:-1 tvg-id="",Çilek Kokusu Strawberry Smell http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/66338e3e23e24f000847f4ae/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84accbc0-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9c892480-c8af-4006-98c1-0f6a7640063d #EXTINF:-1 tvg-id="",Clarissa http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62bc1957e4da730007195dc3/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84accbc1-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1e3c23ed-3d87-4733-9ff1-947db55c9d2d -#EXTINF:-1 tvg-id="ClubbingTV.de",Clubbing TV +#EXTINF:-1 tvg-id="ClubbingTV.us@Germany",Clubbing TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f984784ccb4de0007dfad74/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84accbc2-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=642657d8-c59c-47a9-9046-f8d333c10389 #EXTINF:-1 tvg-id="",Coast Guard http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64eddd96abcba80008d03b74/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84accbc3-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0b5b2224-98cb-4873-9044-ed2cbab31407 #EXTINF:-1 tvg-id="",Cold Blood http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/656064752c46f300087e9c99/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84accbc4-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=eb1d5e92-3e5b-4deb-a7d6-abe3a85bc6fb -#EXTINF:-1 tvg-id="ComedyCentralSouthPark.de",Comedy Central South Park +#EXTINF:-1 tvg-id="ComedyCentralSouthPark.us@Germany",Comedy Central South Park http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60c716084d842c00085f6e64/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84acf2d0-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=97acadcb-fbad-44de-8539-290d36c83227 #EXTINF:-1 tvg-id="",Community http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6523ca21a70bf000081fe675/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84acf2d1-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=87befeb0-9e12-4472-bed0-a9cc35f2b230 -#EXTINF:-1 tvg-id="",Dark Matter +#EXTINF:-1 tvg-id="DarkMatterTV.us@SD",Dark Matter http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e843d849109b700075d5ada/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84acf2d2-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2e3ab5c8-117b-416c-9ac1-fbde8843a568 #EXTINF:-1 tvg-id="",Das Geheimnis der Hunters http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63d9107e60bc8f0008a1d9ed/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84acf2d3-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=070c6bbd-35e0-486f-b1f7-2a1d07821ba3 @@ -105,19 +105,19 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6447df8cd3fdde0008f1f627/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad19e6-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=072707cc-c1e4-4fea-8582-e3b6779c864c #EXTINF:-1 tvg-id="",Dittsche http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/61fbfa1a9e38ec0007a395b7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad19e7-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=41a61ea0-a15c-4696-a42f-21d3370d4067 -#EXTINF:-1 tvg-id="DoraTV.de",Dora TV +#EXTINF:-1 tvg-id="DoraTV.us@Germany",Dora TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e43c344b54fe800093552f4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad19e8-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6f38d5cb-dcfd-4261-b299-2bb3409c224c #EXTINF:-1 tvg-id="",Drake & Josh http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a67c494a10d800085cab06/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad40f0-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8d07619e-6f1c-4551-b814-afb62e97b485 #EXTINF:-1 tvg-id="",Ein Engel auf Erden http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/622f487722d9d400075f74dd/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad40f1-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=dc257dd1-b888-4d09-bd2d-9a97fb61b7ed -#EXTINF:-1 tvg-id="",Emma einfach magisch! +#EXTINF:-1 tvg-id="EmmaeinfachmagischNick.us@Germany",Emma einfach magisch! http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f4796368174910007756454/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad40f2-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1fa557b2-70f2-45b4-b049-46bca25dd335 -#EXTINF:-1 tvg-id="",Euronews +#EXTINF:-1 tvg-id="EuronewsGerman.fr@SD",Euronews http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6639d7d4b18d700008da5316/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad40f3-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3e4b88ec-5984-4688-a30a-030ab8602e7c #EXTINF:-1 tvg-id="",F.B.I. Files http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64eddce19001910008df22b8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad40f4-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4f14a19a-0066-4a45-be41-279347754e05 -#EXTINF:-1 tvg-id="FailArmy.de",FailArmy +#EXTINF:-1 tvg-id="FailArmy.us@Germany",FailArmy http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ad9b7ffe738977e2c312133/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad40f5-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c2b899ff-8adb-43d9-a336-9962f9aeca84 #EXTINF:-1 tvg-id="",Familie Dr. Kleist http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65819f14b9adc4000813ee39/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad40f6-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=40b7900e-6657-42b2-afd3-3bf51708cfce @@ -127,7 +127,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6305ca798bd95300072d2f93/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad40f8-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=266c2f61-4ff7-423e-9af5-2d4f8e57bd34 #EXTINF:-1 tvg-id="",Fluss-Monster http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62a0b2aff4cf470007e47e29/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad40f9-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1bf2399a-9762-4f2b-8e0b-daf1db4fac6e -#EXTINF:-1 tvg-id="",Frasier +#EXTINF:-1 tvg-id="Frasier.us@Germany",Frasier http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62cebf042ffc6d0007c4e59a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad6800-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f552b359-8c8e-4816-8106-6f91f060d965 #EXTINF:-1 tvg-id="",Freitag Nacht News http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64be64070e086a0009d7b028/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad6801-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=cbade38c-4557-4dbe-9035-8337a9b39fac @@ -139,23 +139,23 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/654a2bfeab05240008a12881/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad6804-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=08e0fbef-c298-4024-b6f0-c9a111ea0795 #EXTINF:-1 tvg-id="",Germany Shore http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6447dea7e94c380008dba94c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad6805-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5c4dcd23-a017-4d7e-a0f1-ce0220928f16 -#EXTINF:-1 tvg-id="",Goldstar TV +#EXTINF:-1 tvg-id="GoldstarTVGermany.us@Germany",Goldstar TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6192396135f3910007fc5fc7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad6806-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9ec1275e-0641-49e2-81e6-6d37a37b7bd3 #EXTINF:-1 tvg-id="",Hausmeister Krause http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/622f6faf65be650007f57aab/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad6807-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e7001824-448d-4432-b0f6-f73039f34e53 #EXTINF:-1 tvg-id="",Hawaii Fünf-Null http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6349259d1d90320007fcb1d9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad6808-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a4c2099d-f6da-47f0-b3a9-7626a374cbb0 -#EXTINF:-1 tvg-id="",Hell's Kitchen +#EXTINF:-1 tvg-id="HellsKitchen.us@Germany",Hell's Kitchen http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/644257fe7cb4b100081ed874/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad8f10-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=02a68eb1-ac6e-4f61-b4fb-4c740e614b6b #EXTINF:-1 tvg-id="",Hot Ones http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/655ca3839d5ac400080d14ec/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad8f11-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=66cda8eb-183c-40ce-a92d-ae42b4ae5ea2 #EXTINF:-1 tvg-id="",Hours to Kill Zeitachse des Todes http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/656064e74261ca00081812a9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad8f12-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=57f69955-40a5-48e8-9937-db609244fdd4 -#EXTINF:-1 tvg-id="iCarly.de",iCarly +#EXTINF:-1 tvg-id="iCarly.us@Germany",iCarly http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b580a233dc90007f0cb9d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad8f13-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=016798d3-d8a9-4683-81ba-9d514289474b -#EXTINF:-1 tvg-id="IcePilots.de",Ice Pilots +#EXTINF:-1 tvg-id="IcePilots.us@Germany",Ice Pilots http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ce40f42ba7f7f5ea9518fe1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad8f14-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9e3f7479-1434-4263-91dc-309a9e66bfbe -#EXTINF:-1 tvg-id="InspectorGadget.de",Inspector Gadget +#EXTINF:-1 tvg-id="InspectorGadget.us@Germany",Inspector Gadget http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5dbc2d1ce10f0b0009e6cf9e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad8f15-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=63479ffd-d7d9-473f-9f9f-753a49f5d5d1 #EXTINF:-1 tvg-id="",Instant Mom http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63905b9e799ff100077037a8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ad8f16-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c4e94689-8301-43fb-8643-bf0308937690 @@ -169,79 +169,79 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65dde626ec9fda0008b3dc89/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84adb621-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9c78ff4e-ffa9-4d79-8dde-f3834e4924b9 #EXTINF:-1 tvg-id="",Kultkrimi: Derrick http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65dde5848145cb00083277f6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84adb622-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=06a44c4a-5d6f-4b01-a53c-91e48d9ed4f6 -#EXTINF:-1 tvg-id="",Love Boat +#EXTINF:-1 tvg-id="TheLoveBoat.us@SD",Love Boat http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/655ca3d1fbc15b00081f1186/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84adb623-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1e0f04ba-5d44-4497-a76d-5e853cd252c7 #EXTINF:-1 tvg-id="MarcoPoloTV.de",Marco Polo TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65004cf398020f00084ca8bc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84adb624-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c670d03b-8683-44b1-822a-72919a68ae4d -#EXTINF:-1 tvg-id="",Melrose Place +#EXTINF:-1 tvg-id="PlutoTVMelrosePlace.us@Germany",Melrose Place http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64be745340962900080b55e7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84adb625-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9c899887-c596-406b-8385-e0b91067adf2 -#EXTINF:-1 tvg-id="",Mission Impossible +#EXTINF:-1 tvg-id="MissionImpossible.us@SD",Mission Impossible http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/634fe5afece2e60007c9d8b8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84adb626-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0105bf0a-9d01-41f4-88ef-c646d21554f0 -#EXTINF:-1 tvg-id="",Monster Jam +#EXTINF:-1 tvg-id="MonsterJam.pl@SD",Monster Jam http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65c33f833ef47d00084f47ad/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84adb627-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8d68c96c-30ce-4578-80fe-f99cfe60ceee #EXTINF:-1 tvg-id="",Mork vom Ork http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/642ad2127ef83900085f8910/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84adb628-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e56c1fd6-210e-4009-bdfa-feed08d1e2f1 #EXTINF:-1 tvg-id="Motorvision.de",Motorvision http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6093f2ae4dd5ab0007d1ff9d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84addd30-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=456ff785-b712-4c67-a20f-5327add4053e -#EXTINF:-1 tvg-id="",MOVIEDOME +#EXTINF:-1 tvg-id="Moviedome.us@Germany",MOVIEDOME http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/615c1e5ce3039400070a0547/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84addd31-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5bdf8fde-2533-4c16-b518-58e9777e93ca #EXTINF:-1 tvg-id="",Moviepilot TV mit Pluto TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a67d572fac9c000835eb3a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84addd32-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=fcc33217-17d7-4dc5-9361-70dd91fef90e -#EXTINF:-1 tvg-id="MTVCatfishTVShow.de",MTV Catfish TV Show +#EXTINF:-1 tvg-id="MTVCatfishTVShow.us@Germany",MTV Catfish TV Show http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5db6a697d5f34a000934cd13/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84addd34-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d88db7fd-9049-4209-8a4a-b6fb695742ed -#EXTINF:-1 tvg-id="",MTV Music +#EXTINF:-1 tvg-id="MTVMusic.uk",MTV Music http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6245d15062cd1f00070a2338/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae0440-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=64060fde-9aa0-457f-ba59-1d8c28109d33 -#EXTINF:-1 tvg-id="MTVPlutoTV.de",MTV Pluto TV +#EXTINF:-1 tvg-id="MTVPlutoTV.us@Germany",MTV Pluto TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5caf325764025859afdd6c4d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae0445-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=46816ea6-8434-4e99-9589-496d1e6cd098 -#EXTINF:-1 tvg-id="MTVRidiculousness.de",MTV Ridiculousness +#EXTINF:-1 tvg-id="MTVRidiculousness.us@Germany",MTV Ridiculousness http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f9847fd513250000728a9a5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae0447-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=12cb5d0b-2c4f-4b1b-8610-d3689603c938 -#EXTINF:-1 tvg-id="MTVSerie.de",MTV Serie +#EXTINF:-1 tvg-id="MTVSerie.us@Germany",MTV Serie http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/609536871db47700075a04bf/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae0449-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3ead3cd0-99a8-4b3b-83e4-6c4be0dae5da -#EXTINF:-1 tvg-id="MTVTeenMom.de",MTV Teen Mom +#EXTINF:-1 tvg-id="MTVTeenMom.us@Germany",MTV Teen Mom http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5cffcf5686dfe15595fb3f56/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae044a-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1702995c-e680-43a7-aab2-8ad161900add -#EXTINF:-1 tvg-id="MTVTheHills.de",MTV The Hills +#EXTINF:-1 tvg-id="MTVTheHills.us@Germany",MTV The Hills http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d00e86bf0bac55fe7f75736/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae2b50-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2601e066-e9a4-4c67-8fe1-ea001c98c301 -#EXTINF:-1 tvg-id="MTVTheHillsOV.de",MTV The Hills (OV) +#EXTINF:-1 tvg-id="",MTV The Hills (OV) http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ea8147c6e3dd70007deab3d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae2b51-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5d1b5292-0254-4ec4-8717-17ce2cb193d1 -#EXTINF:-1 tvg-id="MTVTheShores.de",MTV The Shores +#EXTINF:-1 tvg-id="MTVTheShores.us@Germany",MTV The Shores http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5caf32c2a5068259a32320fc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae2b52-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ea57af13-cdf9-4796-a6ce-aa2f1ce34fcf -#EXTINF:-1 tvg-id="MTVUnplugged.de",MTV Unplugged +#EXTINF:-1 tvg-id="MTVUnplugged.us@Germany",MTV Unplugged http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f98471110cca20007d39f76/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae2b53-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=81574af2-8af4-46c8-8d63-00cbea99cbf5 #EXTINF:-1 tvg-id="",Myth Hunters http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63d90f828795f300086745b2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae2b54-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7118ec33-1864-4f3c-9921-f05b649723ac #EXTINF:-1 tvg-id="N24Doku.de",N24 Doku http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60080e8a4bf36000076a81b1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae2b55-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=39199e43-689e-4f83-9f74-b89605373bf0 -#EXTINF:-1 tvg-id="",Naruto +#EXTINF:-1 tvg-id="Naruto.us@Germany",Naruto http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65d5fc39a25d5e00082895c4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae2b56-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=624d6e59-b964-41c4-8e12-4ec9c07d66e8 #EXTINF:-1 tvg-id="",Nick Danger http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f51e6c34d6f40007f992a6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae2b57-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9256bc3b-cf58-46ba-9fba-de7b7838056b -#EXTINF:-1 tvg-id="NickPlutoTV.de",Nick Pluto TV +#EXTINF:-1 tvg-id="NickPlutoTV.us@Germany",Nick Pluto TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ede448d3d50590007a4419e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae2b58-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d3f62f1d-7d8d-4d3f-a141-db9f502deb6b -#EXTINF:-1 tvg-id="NickSpace.de",Nick Space +#EXTINF:-1 tvg-id="NickSpace.us@Germany",Nick Space http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/619b82cc70a9ba00074429e2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae5260-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c6835637-a922-4815-9f33-c332f95fd25c -#EXTINF:-1 tvg-id="",Nick Ukraine +#EXTINF:-1 tvg-id="NickelodeonUkrainePlutoTV.ua@SD",Nick Ukraine http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/622882350f6aad0008c76e77/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae5261-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b3b9970c-0d30-47d7-83dd-c40190676ffa #EXTINF:-1 tvg-id="",Nurse Jackie http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a67c7a07e03a00088de834/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae5262-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ec5a40a8-d64f-4615-99e0-e3e39645f7e3 -#EXTINF:-1 tvg-id="",Pacific Blue +#EXTINF:-1 tvg-id="PacificBlue.us@Germany",Pacific Blue http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/642ad5bd283aa40008064568/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae5263-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5e14b69c-ec83-4ccb-9507-4698f4ad04ec #EXTINF:-1 tvg-id="",Parker Lewis Der Coole von der Schule http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/650adbe0473a54000846ca0c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae5264-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d5f79daf-bcaa-4fbc-9a9a-88dad1866dad #EXTINF:-1 tvg-id="",Pensacola Flügel aus Stahl http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/655ca4b94261ca00080b38d2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae5265-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=304ed6dd-b782-4fee-9de3-30ab786437a1 -#EXTINF:-1 tvg-id="",Perry Mason +#EXTINF:-1 tvg-id="PerryMason.us@SD",Perry Mason http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64eddc3485efec00085b0369/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae5266-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7ab3292e-7fc5-4103-8872-a104548d3ffe #EXTINF:-1 tvg-id="",Pluto TV #1 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/640f4f4083f589000828a544/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae5267-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=eac0ade3-c141-4cf3-a9bd-99313a9f43d3 -#EXTINF:-1 tvg-id="PlutoTVAnimals.de",Pluto TV Animals +#EXTINF:-1 tvg-id="PlutoTVAnimals.us@Germany",Pluto TV Animals http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d767ae7b456c8cf265ce922/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae5268-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f4297955-3ff8-4299-b8e4-ca974cec3c7a -#EXTINF:-1 tvg-id="PlutoTVAnime.de",Pluto TV Anime +#EXTINF:-1 tvg-id="PlutoTVAnime.us@Germany",Pluto TV Anime http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/608181d420fc8500075f612a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae7970-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=042724a5-f12e-43ab-9538-dac62e47d082 -#EXTINF:-1 tvg-id="PlutoTVBiografie.de",Pluto TV Biografie +#EXTINF:-1 tvg-id="PlutoTVBiografie.us@Germany",Pluto TV Biografie http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/61409b5108ae6e0007f9b189/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae7971-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=79697498-7b3e-450e-8f45-6aa30b5a969d #EXTINF:-1 tvg-id="",Pluto TV Camp http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/661801e871e8c30008a73f7b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae7972-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ad3c3224-e568-4336-97ed-de70a70dc695 -#EXTINF:-1 tvg-id="PlutoTVCrime.de",Pluto TV Crime +#EXTINF:-1 tvg-id="PlutoTVCrime.us@Germany",Pluto TV Crime http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e7b6c60fd20c50007910bf5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae7973-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=69be320f-69fa-4e89-9e79-4dce587a0151 #EXTINF:-1 tvg-id="",Pluto TV Crime on the beach http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/666c2b8761a39900088f0c89/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae7974-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e9e22404-2549-4f12-933c-e2baca785777 @@ -249,43 +249,43 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/66 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/630e00c065cfc10007c6e06b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae7975-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=fc241168-281d-4fac-b62d-4585cc441c02 #EXTINF:-1 tvg-id="",Pluto TV Dizikolik http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/650b064ad1f20c000856a5a4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae7976-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b5b1e17f-bd21-46f1-aaf4-6142c68b65ad -#EXTINF:-1 tvg-id="PlutoTVDocumentaries.de",Pluto TV Documentaries +#EXTINF:-1 tvg-id="PlutoTVDocumentaries.us@Germany",Pluto TV Documentaries http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5db048f9447d6c0009b8f29d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae7977-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=afad5263-75e1-48ce-9de2-e9a428ebcb39 -#EXTINF:-1 tvg-id="PlutoTVExplore.de",Pluto TV Explore +#EXTINF:-1 tvg-id="PlutoTVExplore.us@Germany",Pluto TV Explore http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ad9b8551b95267e225e59c1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae7978-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=48b4a91c-514f-44ce-b5b2-0f355a642d0e -#EXTINF:-1 tvg-id="PlutoTVFood.de",Pluto TV Food +#EXTINF:-1 tvg-id="PlutoTVFood.us@Germany",Pluto TV Food http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5dc280c9aa218c0009724b4b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84ae7979-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6afece0b-4e3f-4de4-935d-3288b6200e01 #EXTINF:-1 tvg-id="",Pluto TV heiße Nächte http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64526a145a0cd50008632bfa/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aea080-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8f9d11a2-637a-40fd-aae8-8ad9bf48a0e2 -#EXTINF:-1 tvg-id="PlutoTVHistory.de",Pluto TV History +#EXTINF:-1 tvg-id="PlutoTVHistory.us@Germany",Pluto TV History http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d767b1c126c65d0a307355f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aea081-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8d66523d-c59b-4354-aedb-17d13edf0d26 -#EXTINF:-1 tvg-id="PlutoTVHome.de",Pluto TV Home +#EXTINF:-1 tvg-id="PlutoTVHome.us@Germany",Pluto TV Home http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5eb96303f5bb020008e7e44f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aea082-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=98a9fe20-9187-429d-b9ac-8042d3142022 -#EXTINF:-1 tvg-id="",Pluto TV Horror +#EXTINF:-1 tvg-id="PlutoTVHorror.us@Germany",Pluto TV Horror http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f4f4b88157cf00075c22db/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aea083-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=67746cb2-93c1-4a0a-874d-a4043328cb08 -#EXTINF:-1 tvg-id="PlutoTVIndies.de",Pluto TV Indies +#EXTINF:-1 tvg-id="PlutoTVIndies.us@Germany",Pluto TV Indies http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ce40e59246a395e9758923e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aea084-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1717ce52-d158-4c4f-870e-5f72d6328d3d -#EXTINF:-1 tvg-id="PlutoTVKids.de",Pluto TV Kids +#EXTINF:-1 tvg-id="PlutoTVKids.us@Germany",Pluto TV Kids http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ad9b648e738977e2c312131/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aea085-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=68ca4400-31c3-45e1-ac30-9bcbc6aaefd8 #EXTINF:-1 tvg-id="",Pluto TV Kino Filme http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63c9430af13a9b000786422a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aea086-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7546b852-e5e0-42d1-9d5a-c9e4615d9110 #EXTINF:-1 tvg-id="",Pluto TV Knallhart http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65004605110545000842035d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aea087-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=afe5c1f5-e3c6-453b-a231-7baa7ac86ba1 -#EXTINF:-1 tvg-id="PlutoTVKultfilme.de",Pluto TV Kultfilme +#EXTINF:-1 tvg-id="PlutoTVKultfilme.us@Germany",Pluto TV Kultfilme http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5dde47b63585b500099f74ec/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aea088-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3418c444-a5b9-456d-9d11-e4e9c7b5eec0 #EXTINF:-1 tvg-id="",Pluto TV liebt John Wayne http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65ef0f9d2873090008be19df/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aea089-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=debf8004-1d35-4eb6-830a-47860f09640f -#EXTINF:-1 tvg-id="PlutoTVLives.de",Pluto TV Lives +#EXTINF:-1 tvg-id="PlutoTVLives.us@Germany",Pluto TV Lives http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5db04b360fa2560009deb3de/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aea08a-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=528b6467-6aba-4c44-833a-a64dcdd63b74 #EXTINF:-1 tvg-id="",Pluto TV Maschinen http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/655ca662fbc15b00081f18fc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aec790-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=aa86195a-d5e8-4d9f-ab44-d745649aebba -#EXTINF:-1 tvg-id="PlutoTVMovies.de",Pluto TV Movies +#EXTINF:-1 tvg-id="PlutoTVMovies.us@Germany",Pluto TV Movies http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5c5c3b948002db3c3e0b262e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aec791-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5500aa67-c527-4db6-868b-d37341c34286 -#EXTINF:-1 tvg-id="PlutoTVMystery.de",Pluto TV Mystery +#EXTINF:-1 tvg-id="PlutoTVMystery.us@Germany",Pluto TV Mystery http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/617aad99b68ef100072608cd/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aec792-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2b2bcb00-9a00-402e-b731-873dc95db9fc -#EXTINF:-1 tvg-id="PlutoTVNature.de",Pluto TV Nature +#EXTINF:-1 tvg-id="PlutoTVNature.us@Germany",Pluto TV Nature http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5be1c3f9851dd5632e2c91b2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aec793-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=dd5077d7-0ac1-491c-87dc-536ab13c0313 -#EXTINF:-1 tvg-id="PlutoTVParanormal.de",Pluto TV Paranormal +#EXTINF:-1 tvg-id="PlutoTVParanormal.us@Germany",Pluto TV Paranormal http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f98487036af340008da1e37/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aec794-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0d13891a-ff55-4504-afee-87e1e9ecdbd6 #EXTINF:-1 tvg-id="",Pluto TV Polar+ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ffebbeabd18520007b37709/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aec795-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=41cfa3c9-a6dd-4995-91ad-c950b8d1004e @@ -293,29 +293,29 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64be64445dc166000899ce75/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aec796-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=813b79c7-b5ab-4408-ae58-2c80c52c7f3a #EXTINF:-1 tvg-id="",Pluto TV Power Frauen http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/625423185e237b0007f6764e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aec797-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a1697c3d-51e5-4838-acfd-20d30d7be107 -#EXTINF:-1 tvg-id="PlutoTVRetroToons.de",Pluto TV Retro Toons +#EXTINF:-1 tvg-id="PlutoTVRetroToons.us@Germany",Pluto TV Retro Toons http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e1c669094e0e80009b22ab8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aec798-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ebd144d9-d7a1-43ae-a500-82297b0dbac5 -#EXTINF:-1 tvg-id="PlutoTVRomance.de",Pluto TV Romance +#EXTINF:-1 tvg-id="PlutoTVRomance.us@Germany",Pluto TV Romance http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5dc287ce3086a20009f5024c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aec799-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=91cee60e-49f2-4985-953a-f2cde441fe54 -#EXTINF:-1 tvg-id="PlutoTVSciFi.de",Pluto TV Sci-Fi +#EXTINF:-1 tvg-id="PlutoTVSciFi.us@Germany",Pluto TV Sci-Fi http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60ed498c4248a400077c0b9d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aeeea0-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=91571e99-b22e-454e-9622-6abd1ff79fd1 -#EXTINF:-1 tvg-id="",Pluto TV Science +#EXTINF:-1 tvg-id="PlutoTVScience.us@Germany",Pluto TV Science http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d767b4889bca2ce7b73ef2e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aeeea1-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=823a3c37-13b3-4ca9-b978-d98c2630c834 -#EXTINF:-1 tvg-id="PlutoTVSerie.de",Pluto TV Serie +#EXTINF:-1 tvg-id="PlutoTVSerie.us@Germany",Pluto TV Serie http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5dc190f7bfed110009d934c3/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aeeea2-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c39f6559-678d-4811-85d3-2aeecd09668a -#EXTINF:-1 tvg-id="PlutoTVSeriePlus.de",Pluto TV Serie+ +#EXTINF:-1 tvg-id="PlutoTVSeriePlus.us@Germany",Pluto TV Serie+ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ddbf866b1862a0009a0648e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aeeea3-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2e0c3c1a-9aa2-46b3-994f-ab3a1c929f78 -#EXTINF:-1 tvg-id="PlutoTVSitcoms.de",Pluto TV Sitcoms +#EXTINF:-1 tvg-id="PlutoTVSitcoms.us@Germany",Pluto TV Sitcoms http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d767ab2b456c8cf265ce921/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aeeea4-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=280db36d-ffba-4223-8a7d-77e6a96d3758 #EXTINF:-1 tvg-id="",Pluto TV Sitcoms+ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5cd149f021cb6c55e258bbe8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aeeea5-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=57a04ab4-08c0-4114-8c90-0153ccf85d53 -#EXTINF:-1 tvg-id="PlutoTVSpace.de",Pluto TV Space +#EXTINF:-1 tvg-id="PlutoTVSpace.us@Germany",Pluto TV Space http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/61409f8d6feb30000766b675/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aeeea6-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=aee0c343-6689-49c1-9090-319522e3c837 -#EXTINF:-1 tvg-id="PlutoTVStarTrek.de",Pluto TV Star Trek +#EXTINF:-1 tvg-id="PlutoTVStarTrek.us@Germany",Pluto TV Star Trek http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6152ee71bf99590007893a11/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aeeea7-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3329cc1b-d91f-4194-b516-92fbd807049b -#EXTINF:-1 tvg-id="PlutoTVTrueCrime.de",Pluto TV True Crime +#EXTINF:-1 tvg-id="PlutoTVTrueCrime.us@Germany",Pluto TV True Crime http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/615333098185f00008715a56/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aeeea8-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=96f45124-9486-4038-a177-6f5206a39041 -#EXTINF:-1 tvg-id="",Pluto TV Western +#EXTINF:-1 tvg-id="PlutoTVWesterns.us@Germany",Pluto TV Western http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/630dd3b2605f140007e002f5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aeeea9-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0f9be2fb-9bfd-4c1e-8963-ba4370795ff3 #EXTINF:-1 tvg-id="",Pluto TV: Mehr Star Trek http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6500464a3a0d700008b3ce19/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af15b0-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6b1d8f42-c575-4cb5-88e6-bb6e8e5a6c30 @@ -341,7 +341,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/66 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64be635a40962900080aaca5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af3cc0-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=cdb91578-90c7-424e-baec-62c86af7b3f7 #EXTINF:-1 tvg-id="",Sabrina Total verhext! http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/622f40c901d4b70007ad7609/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af3cc1-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1ddb15fc-284f-40a3-b608-5152c320aa22 -#EXTINF:-1 tvg-id="",Sam & Cat +#EXTINF:-1 tvg-id="SamCat.us@Germany",Sam & Cat http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b5ba20af628000707cee3/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af3cc2-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=bfbf1c99-97ab-4e84-9706-f5141d6bfa99 #EXTINF:-1 tvg-id="",Schitt's Creek: David & Patrick! http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/665f01b8a3865300086a233c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af3cc3-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=91cd8bcd-d069-4713-a856-cde8bb4fbcf0 @@ -351,7 +351,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/660e97bce8fba8000853d43f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af3cc5-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6874b43e-86f9-4252-b693-af5ccc56dd88 #EXTINF:-1 tvg-id="",See Dad Run http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63905bcb0f41d200073e05ff/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af3cc6-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8b058483-7994-4491-a77a-4761448af037 -#EXTINF:-1 tvg-id="SimsalabimSabrina.de",Simsalabim Sabrina +#EXTINF:-1 tvg-id="SimsalabimSabrina.us@Germany",Simsalabim Sabrina http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5dbc327d0451770009ed7577/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af3cc7-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d22fc39b-64c4-41a9-a5a0-18b370793329 #EXTINF:-1 tvg-id="",South Park: Butters Collection http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/646b14a0e94c3800082a8d3a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af3cc8-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c33f5b82-5c79-40fb-b393-4882708946ac @@ -375,21 +375,21 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/66794444efa2a10008ca1b16/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af63d6-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=014d57c7-2724-4893-a460-dea391a4bef9 #EXTINF:-1 tvg-id="",SpongeBob OV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/667944cb63a5f20008df6ad4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af63d7-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e5b95ef0-20c5-423e-ac08-a8b427d48ba5 -#EXTINF:-1 tvg-id="SpongeBobSchwammkopf.de",SpongeBob Schwammkopf +#EXTINF:-1 tvg-id="SpongeBobSchwammkopf.us@Germany",SpongeBob Schwammkopf http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d00e8adaab96b5635b2a005/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af63d8-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3e6bdc7a-78a0-4fdd-8f37-ea9905c5e422 #EXTINF:-1 tvg-id="",Star Trek: Deep Space Nine http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a67d200c7ff50008cb131a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af63d9-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2bc71210-8348-497e-9c67-114c5ae83332 #EXTINF:-1 tvg-id="",Storage Wars: Canada http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ede464e7be0030007c58b73/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af63da-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a367e69b-211e-4ca6-af6b-1dc6fa54bf89 -#EXTINF:-1 tvg-id="Strongman.de",Strongman +#EXTINF:-1 tvg-id="Strongman.us@Germany",Strongman http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e1452156c07b50009d0230e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af8ae0-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c0be139f-be68-4d55-940e-e5aae0d99e04 #EXTINF:-1 tvg-id="",Sünger Bob Kare Pantolon http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/667943a322acab00089fbd58/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af8ae1-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f8dc15cd-5ae5-4f7c-b5a9-8a92be416961 -#EXTINF:-1 tvg-id="TakeshisCastle.de",Takeshi's Castle +#EXTINF:-1 tvg-id="TakeshisCastle.us@Germany",Takeshi's Castle http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6054a9f4bc8a5f000771504c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af8ae2-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=98bea881-8ec4-4d3c-ad12-0a142e47ffe1 #EXTINF:-1 tvg-id="",Täterjagd http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/642abea1283aa4000805bb5b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af8ae3-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d360d3bc-0ba5-40c0-9de5-ad6e1b602f0f -#EXTINF:-1 tvg-id="TeenNick.de",Teen Nick +#EXTINF:-1 tvg-id="",Teen Nick http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f0d668b872e4400073acc68/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af8ae4-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5a971f40-be5f-4406-a0a6-b014ec38a8ce #EXTINF:-1 tvg-id="",Telenovela ZDF http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5cb5d043a461406ffe3fb2de/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af8ae5-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2110f9dc-f7e7-417c-84ec-63f379b710b9 @@ -399,11 +399,11 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/651e94c930876e000840eb50/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af8ae7-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b1dd93b6-2083-4144-a0fe-2262d219187a #EXTINF:-1 tvg-id="",The Twilight Zone http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64c8dd94e4391c0008eb4742/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af8ae8-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=aceb234b-c468-44e9-9d0c-9a032be740c4 -#EXTINF:-1 tvg-id="",Top Gear +#EXTINF:-1 tvg-id="TopGear.uk@SD",Top Gear http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64c109735dc1660008a4a2dc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af8ae9-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=fa4b8f71-6f6a-4851-b8e9-716771846afc -#EXTINF:-1 tvg-id="TotallyTurtles.de",Totally Turtles +#EXTINF:-1 tvg-id="TotallyTurtles.us@Germany",Totally Turtles http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d6792bd6be2998ad0ccce30/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84af8aea-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1d3e241b-d6cf-44c2-bfcd-45ca4d693881 -#EXTINF:-1 tvg-id="TotallyTurtlesOV.de",Totally Turtles (OV) +#EXTINF:-1 tvg-id="",Totally Turtles (OV) http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ea816a44457070007ffabc7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84afb1f0-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=275d9070-7e10-4407-a2c8-d35b6ac97886 #EXTINF:-1 tvg-id="",Transformers TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/643683519b32b400094e0a40/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84afb1f1-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=aeb85f53-a136-4d6f-8952-43fda8f5ce47 @@ -417,7 +417,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/650adb92a1217e00091a3eff/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84afb1f5-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=38e01fae-e485-4ddb-93c0-891443b0d887 #EXTINF:-1 tvg-id="",V.I.P. Die Bodyguards http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/650adc0ba1217e00091a3f4e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84afb1f6-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c9a9f8b4-c92b-43f1-9731-033cc5efe425 -#EXTINF:-1 tvg-id="Victorious.de",Victorious +#EXTINF:-1 tvg-id="Victorious.us@Germany",Victorious http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b5e43f294f8000793c3d7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84afb1f7-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b8f594b9-41be-4385-aa1a-9f9f0de6f06b #EXTINF:-1 tvg-id="",Viper http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/642ad6a5aa2d690008ea6d96/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84afd900-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8c651043-654e-44a1-b9c1-e1a3e1bea2c8 @@ -431,13 +431,13 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/627d2d1d05e09f00073ccdff/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84afd904-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e0111a68-96dd-4929-aea5-e18528a1add5 #EXTINF:-1 tvg-id="",Wings Die Überflieger http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65b38e310d9ab400082bdec2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84afd905-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7925cf55-0cda-4685-beb7-5d7be25d1556 -#EXTINF:-1 tvg-id="WipeoutOV.de",Wipeout (OV) +#EXTINF:-1 tvg-id="",Wipeout (OV) http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5eb963c98ec06d00077d63cb/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84afd906-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e875d4e6-825a-422e-ac7b-e30edcb5ef40 -#EXTINF:-1 tvg-id="WorldPokerTour.de",World Poker Tour +#EXTINF:-1 tvg-id="WorldPokerTour.us@Germany",World Poker Tour http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ad9b7aae738977e2c312132/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84b00010-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=74cccc9f-4a89-4a77-9d46-ad68b9e23890 #EXTINF:-1 tvg-id="",X-Factor: Das Unfassbare http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/642d7e029189ce0008958af5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84b00011-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b0a16fea-9491-49e8-8a50-ca6716fb7976 -#EXTINF:-1 tvg-id="",Yu-Gi-Oh! +#EXTINF:-1 tvg-id="YuGiOh.us@SD",Yu-Gi-Oh! http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/642d4493aa2d690008f0a03f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84b00012-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7978130e-8cf9-40ac-8973-675ca743190d #EXTINF:-1 tvg-id="",Yüksek Sosyete – High Society http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/66338ce79e68c20008b7e00f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84b00013-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3e6320f7-73cf-47b1-b9cb-26e2bd11dde9 diff --git a/streams/de_samsung.m3u b/streams/de_samsung.m3u index 515183cfd5..0b0b96f68b 100644 --- a/streams/de_samsung.m3u +++ b/streams/de_samsung.m3u @@ -5,7 +5,7 @@ https://insighttv-samsung-de.amagi.tv/playlist.m3u8 https://inwonder-samsung-de.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="SofyTV.ch",Sofy TV (720p) https://sofy-ger-samsung.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="Tastemade.de",Tastemade Deutschland (720p) +#EXTINF:-1 tvg-id="",Tastemade Deutschland (720p) https://tastemade-de-samsung.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="XITE.nl",Xite (720p) https://xite-samsung-de.amagi.tv/playlist.m3u8 diff --git a/streams/dk_samsung.m3u b/streams/dk_samsung.m3u index ab0eb74bd3..752c92565a 100644 --- a/streams/dk_samsung.m3u +++ b/streams/dk_samsung.m3u @@ -3,17 +3,17 @@ https://rakuten-africanews-1-dk.samsung.wurl.tv/manifest/playlist.m3u8 #EXTINF:-1 tvg-id="BloombergTV.us",Bloomberg TV US (1080p) https://bloomberg-bloomberg-1-dk.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="EuronewsEnglish.fr",Euronews English -https://rakuten-euronews-1-dk.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="EuronewsEnglish.fr",Euronews English (720p) https://rakuten-euronews-1-dk.samsung.wurl.tv/manifest/playlist.m3u8 -#EXTINF:-1 tvg-id="",Rakuten Action (720p) +#EXTINF:-1 tvg-id="EuronewsEnglish.fr",Euronews English +https://rakuten-euronews-1-dk.samsung.wurl.tv/playlist.m3u8 +#EXTINF:-1 tvg-id="RakutenTVActionMovies.es@Denmark",Rakuten Action (720p) https://rakuten-action-10-dk.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Rakuten Comedy (720p) +#EXTINF:-1 tvg-id="RakutenTVComedyMovies.es@Denmark",Rakuten Comedy (720p) https://rakuten-comedy-10-dk.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Rakuten Drama (720p) +#EXTINF:-1 tvg-id="RakutenTVDramaMovies.es@Denmark",Rakuten Drama (720p) https://rakuten-drama-10-dk.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Rakuten Family (720p) +#EXTINF:-1 tvg-id="RakutenTVFamilyMovies.es@Denmark",Rakuten Family (720p) https://rakuten-family-10-dk.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Rakuten Spotlight (720p) +#EXTINF:-1 tvg-id="RakutenTVSpotlight.es@Denmark",Rakuten Spotlight (720p) https://rakuten-spotlight-10-dk.samsung.wurl.tv/playlist.m3u8 diff --git a/streams/do.m3u b/streams/do.m3u index db58dc992a..c501704ec5 100644 --- a/streams/do.m3u +++ b/streams/do.m3u @@ -26,10 +26,10 @@ https://ss9.domint.net:3040/ame_str/amecanal47/playlist.m3u8 http://animezonetv.net/hls/stream.m3u8 #EXTINF:-1 tvg-id="Antena7.do",Antena 7 (480p) [Not 24/7] [Geo-blocked] https://alba-do-antena7-antena7.stream.mediatiquestream.com/index.m3u8 -#EXTINF:-1 tvg-id="Antena21.do",Antena 21 -https://d1p8txxph783az.cloudfront.net/index.m3u8 #EXTINF:-1 tvg-id="Antena21.do",Antena 21 (480p) [Not 24/7] [Geo-blocked] https://alba-do-antena7-c21.stream.mediatiquestream.com/index.m3u8 +#EXTINF:-1 tvg-id="Antena21.do",Antena 21 +https://d1p8txxph783az.cloudfront.net/index.m3u8 #EXTINF:-1 tvg-id="Area809ElOriginal.do",Area 809 El Original (1080p) https://vdo.voxhdnet.com:3159/stream/play.m3u8 #EXTINF:-1 tvg-id="ARROZTV.do",ARROZ TV @@ -120,7 +120,7 @@ https://ssh101-fl.bozztv.com/ssh101/ctv8hd/index.m3u8 https://ssh101.bozztv.com/ssh101/rctvhd21/playlist.m3u8 #EXTINF:-1 tvg-id="CotubanamaTV.do",Cotubanama TV (1080p) https://host.streamingnation.live/p/3588/hybrid/play.m3u8 -#EXTINF:-1 tvg-id="",Cotui TV (720p) +#EXTINF:-1 tvg-id="TVCotuiCanal31.do@SD",Cotui TV (720p) https://cloudflare.streamgato.us:3490/live/cotuitvlive.m3u8 #EXTINF:-1 tvg-id="CromTV.do",CromTV (480p) https://cnn.essastream.com:3333/live/cromtvlive.m3u8 @@ -183,7 +183,7 @@ https://ss9.domint.net:3042/gstv_str/globalsocialtv/playlist.m3u8 https://ss3.domint.net:3136/gtv_str/globalhd/playlist.m3u8 #EXTINF:-1 tvg-id="GuacaraTV.do",Guacara TV (720p) https://imagenuniversaltv.net:3820/live/guacaratvlive.m3u8 -#EXTINF:-1 tvg-id="",Guaymate [Not 24/7] +#EXTINF:-1 tvg-id="GuaymateTV.do@SD",Guaymate [Not 24/7] https://5790d294af2dc.streamlock.net/8100/8100/playlist.m3u8 #EXTINF:-1 tvg-id="GuaymateTV.do",Guaymate TV (720p) https://ssh101stream.ssh101.com/akamaissh101/ssh101/guaymatetv/playlist.m3u8 @@ -280,7 +280,7 @@ https://ed18ov.live.opencaster.com/bznudxxdtppv/index.m3u8 https://cdn.essastream.com:3457/live/noticiasn16live.m3u8 #EXTINF:-1 tvg-id="",Notisur TV https://ss9.domint.net:3006/nsb_str/notisur/playlist.m3u8 -#EXTINF:-1 tvg-id="",Oepm TV (720p) +#EXTINF:-1 tvg-id="OEPMTV.do@SD",Oepm TV (720p) https://cnn.essastream.com:3318/live/oepmtelevisionlive.m3u8 #EXTINF:-1 tvg-id="OndaTV.do",Onda TV (720p) https://ss5.domint.net:3176/otv_str/ondatv/playlist.m3u8 @@ -342,7 +342,7 @@ https://rdn.essastream.com:3160/live/sanisidrotvlive.m3u8 https://vdo1.streamgato.us:3677/live/telemileniolive.m3u8 #EXTINF:-1 tvg-id="SensacionTV.do",Sensación TV (360p) https://ss5.domint.net:3002/stv_str/sensaciontv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Siembra TV (720p) +#EXTINF:-1 tvg-id="SiembraTV.ve@SD",Siembra TV (720p) https://streamunoapp.com:3809/live/siembratvlive.m3u8 #EXTINF:-1 tvg-id="SimavisionCanal18.do",Sima Vision TV (720p) https://soportedvb.click:3668/live/simavisiontvlive.m3u8 @@ -422,7 +422,7 @@ http://server3.prostudionetwork.com:1945/teleunion/TU/playlist.m3u8 https://teleuniversotv.streamgato.us:3110/live/teleuniversotvlive.m3u8 #EXTINF:-1 tvg-id="Telever.do",Telever (1080p) [Not 24/7] https://vdo1.streamgato.us:3342/live/televercanal12live.m3u8 -#EXTINF:-1 tvg-id="" http-referrer="https://player.castr.com/live_76112a202cd411ef87bac55efba9cb2e",Televiaducto 3 (720p) [Not 24/7] +#EXTINF:-1 tvg-id="TeleviaductoCanal3.do@SD" http-referrer="https://player.castr.com/live_76112a202cd411ef87bac55efba9cb2e",Televiaducto 3 (720p) [Not 24/7] #EXTVLCOPT:http-referrer=https://player.castr.com/live_76112a202cd411ef87bac55efba9cb2e https://stream.castr.com/5da89a909db964293ad13301/live_76112a202cd411ef87bac55efba9cb2e/index.fmp4.m3u8 #EXTINF:-1 tvg-id="" http-referrer="https://player.castr.com/live_569ad240b0b911efa498833d767149d5",Televiaducto 14 (720p) [Not 24/7] @@ -475,7 +475,7 @@ https://ss5.domint.net:3064/tvm_str/montanatv/playlist.m3u8 https://ss5.domint.net:3032/vozz_str/vozzmedia/playlist.m3u8 #EXTINF:-1 tvg-id="TVPlata.do",TV Plata (720p) https://ss9.domint.net:3032/tvp_str/tvp2111/playlist.m3u8 -#EXTINF:-1 tvg-id="",TV QUISQUEYA (720p) +#EXTINF:-1 tvg-id="TVQuisqueya.us@SD",TV QUISQUEYA (720p) https://cloud5.livescast.com:19360/canaltvquisqueya/canaltvquisqueya.m3u8 #EXTINF:-1 tvg-id="TVVision.do",TV Visión (720p) [Not 24/7] https://cloudflare.streamgato.us:3691/live/tvvisionlive.m3u8 @@ -499,7 +499,7 @@ https://rdn.essastream.com:3400/live/canal18hdlive.m3u8 https://inliveserver.com:1936/10016/10016/playlist.m3u8 #EXTINF:-1 tvg-id="Vision3000.do",Vision 3000 TV https://ss3.domint.net:3102/v3_str/v3000/playlist.m3u8 -#EXTINF:-1 tvg-id="",Vision Global TV (720p) +#EXTINF:-1 tvg-id="VisionGlobalTV.us@SD",Vision Global TV (720p) https://ss5.domint.net:3012/vgtv_str/visionglobaltv/playlist.m3u8 #EXTINF:-1 tvg-id="VisionNDV.do",VisionNDV TV https://cloudflare.streamgato.us:3820/live/visionndvlive.m3u8 diff --git a/streams/ec.m3u b/streams/ec.m3u index e1e30dad89..e528f24586 100644 --- a/streams/ec.m3u +++ b/streams/ec.m3u @@ -130,6 +130,8 @@ https://ssh101-fl.bozztv.com/ssh101/scandalotv/index.m3u8 https://eu1.servers10.com:8081/8108/index.m3u8 #EXTINF:-1 tvg-id="SonoOndaTV.ec",Sono Onda TV (720p) https://live.obslivestream.com/sonoondatv/index.m3u8 +#EXTINF:-1 tvg-id="Teleamazonas.ec",Teleamazonas (1080p) +https://teleamazonas-live.cdn.vustreams.com/live/fd4ab346-b4e3-4628-abf0-b5a1bc192428/live.isml/playlist.m3u8 #EXTINF:-1 tvg-id="Teledigital.ec",Teledigital (240p) [Not 24/7] https://tv.portalexpress.es:3182/hybrid/play.m3u8 #EXTINF:-1 tvg-id="Telerama.ec",Telerama (240p) [Not 24/7] @@ -152,5 +154,3 @@ https://cloud37.ecuatel.com/vostv/live/manifest.m3u8 https://video2.makrodigital.com/wuanplus/wuanplus/playlist.m3u8 #EXTINF:-1 tvg-id="ZaracayTV.ec",Zaracay TV (1080p) [Not 24/7] https://video2.makrodigital.com/zaracay/zaracay/playlist.m3u8 -#EXTINF:-1 tvg-id="Teleamazonas.ec",Teleamazonas (1080p) -https://teleamazonas-live.cdn.vustreams.com/live/fd4ab346-b4e3-4628-abf0-b5a1bc192428/live.isml/playlist.m3u8 diff --git a/streams/eg.m3u b/streams/eg.m3u index 69af3923e2..b45428c47e 100644 --- a/streams/eg.m3u +++ b/streams/eg.m3u @@ -43,15 +43,15 @@ https://mbc1-enc.edgenextcdn.net/out/v1/d5036cabf11e45bf9d0db410ca135c18/index.m https://shls-masr2-ak.akamaized.net/out/v1/f683685242b549f48ea8a5171e3e993a/index.m3u8 #EXTINF:-1 tvg-id="NogoumFMTV.eg",NogoumFMTV (672p) [Not 24/7] https://nogoumtv.nrpstream.com/hls/stream.m3u8 +#EXTINF:-1 tvg-id="OnE.eg",On E (1080p) +https://bcovlive-a.akamaihd.net/3dc60bab470f4c9fbf00408ecb7c3d7a/eu-west-1/6057955906001/playlist_dvr.m3u8 #EXTINF:-1 tvg-id="PNCDrama.eg",PNC Drama (1080p) https://d35j504z0x2vu2.cloudfront.net/v1/master/0bc8e8376bd8417a1b6761138aa41c26c7309312/pnc-drama/playlist.m3u8 +#EXTINF:-1 tvg-id="RotanaCinemaEgypt.eg",Rotana Cinema Egypt (1080p) +https://rotana.hibridcdn.net/rotana/cinemamasr_net-7Y83PP5adWixDF93/playlist.m3u8 #EXTINF:-1 tvg-id="TeN.eg",TeN (720p) [Geo-blocked] https://weyyak-live.akamaized.net/weyyak_ten_tv/index.m3u8 #EXTINF:-1 tvg-id="TheKingdomSat.eg",The Kingdom Sat (720p) https://bcovlive-a.akamaihd.net/0e524e1838ed411dad0a674d18e07914/eu-central-1/6415808954001/playlist_dvr.m3u8 #EXTINF:-1 tvg-id="WatanTV.eg",Watan TV (1080p) https://rp.tactivemedia.com/watantv_source/live/playlist.m3u8 -#EXTINF:-1 tvg-id="RotanaCinemaEgypt.eg",Rotana Cinema Egypt (1080p) -https://rotana.hibridcdn.net/rotana/cinemamasr_net-7Y83PP5adWixDF93/playlist.m3u8 -#EXTINF:-1 tvg-id="OnE.eg",On E (1080p) -https://bcovlive-a.akamaihd.net/3dc60bab470f4c9fbf00408ecb7c3d7a/eu-west-1/6057955906001/playlist_dvr.m3u8 diff --git a/streams/es.m3u b/streams/es.m3u index 63461de66f..1cec457f4d 100644 --- a/streams/es.m3u +++ b/streams/es.m3u @@ -48,16 +48,20 @@ https://streaming01.gestec-video.com/hls/artequatreAlacanti.m3u8 http://217.182.77.27/live/alcarriatv-livestream.m3u8 #EXTINF:-1 tvg-id="AlcarriaTV.es",Alcarria TV (576p) [Not 24/7] https://cls.alcarria.tv/alcarriatv/livestream/playlist.m3u8 -#EXTINF:-1 tvg-id="AMC.es",AMC (Spain) (720p) +#EXTINF:-1 tvg-id="AMC.us@Spain",AMC (Spain) (720p) http://vegafibratv.com:8085/AMC/index.m3u8 #EXTINF:-1 tvg-id="Antena3.es",Antena 3 (720p) http://185.189.225.150:85/Antena3HD/index.m3u8 +#EXTINF:-1 tvg-id="Antena3.es",Antena 3 (480p) +http://181.78.109.48:8000/play/a00f/index.m3u8 #EXTINF:-1 tvg-id="AquiNoHayQuienViva.es",Aqui No Hay Quien Viva (720p) https://fast-channels.atresmedia.com/648ef3951756b0e425af83cc/648ef3951756b0e425af83cc.m3u8 #EXTINF:-1 tvg-id="ArabiTV.es",Arabí TV (1080p) https://streamtv2.elitecomunicacion.cloud:3956/live/arabitvlive.m3u8 #EXTINF:-1 tvg-id="AragonTV.es",Aragón TV (720p) [Not 24/7] https://cartv.streaming.aranova.es/hls/live/aragontv_canal1.m3u8 +#EXTINF:-1 tvg-id="Atreseries.es",Atreseries (480p) +http://181.78.109.48:8000/play/a00l/index.m3u8 #EXTINF:-1 tvg-id="AtresplayerClasicos.es",Atresplayer Clasicos (1080p) https://fast-channels.atresmedia.com/648ef12c2bfab0e4507e0d61/648ef12c2bfab0e4507e0d61.m3u8 #EXTINF:-1 tvg-id="AtresplayerComedia.es",Atresplayer Comedia (1080p) @@ -66,7 +70,11 @@ https://fast-channels.atresmedia.com/648ef23d2bfab0e4557e0d61/648ef23d2bfab0e455 https://fast-channels.atresmedia.com/648ef3162bfab0e4587e0d61/648ef3162bfab0e4587e0d61.m3u8 #EXTINF:-1 tvg-id="AtresplayerMulticine.es",Atresplayer Multicine (1080p) https://fast-channels.atresmedia.com/648ef18c1756b0e41daf83cc/648ef18c1756b0e41daf83cc.m3u8 -#EXTINF:-1 tvg-id="BabyTV.es",BabyTV (Spain) (1080p) +#EXTINF:-1 tvg-id="AXN.es",AXN (1080p) +http://181.78.109.48:8000/play/a05u/index.m3u8 +#EXTINF:-1 tvg-id="AXN.es",AXN (480p) +http://181.78.109.48:8000/play/a023/index.m3u8 +#EXTINF:-1 tvg-id="BabyTV.uk@Spain",BabyTV (Spain) (1080p) http://185.189.225.150:85/BabyTV/index.m3u8 #EXTINF:-1 tvg-id="BailenTV.es",Bailén TV (720p) [Not 24/7] http://cpd.bailen.tv:8080/Playlist_CANAL_24H/playlist.m3u8 @@ -391,6 +399,8 @@ https://shls-live-ak.akamaized.net/out/v1/b06a89a463764d3688cda337d40dc5bf/index https://streaming013.gestec-video.com/hls/negociostv.m3u8 #EXTINF:-1 tvg-id="Neox.es",Neox (576p) http://185.189.225.150:85/neox/index.m3u8 +#EXTINF:-1 tvg-id="Nickelodeon.es",Nickelodeon (480p) +http://181.78.109.48:8000/play/a05a/index.m3u8 #EXTINF:-1 tvg-id="Nickelodeon.es",Nickelodeon (Spain) (576p) http://185.189.225.150:85/nickelodeon/index.m3u8 #EXTINF:-1 tvg-id="NoroesteTV.es",Noroeste TV (1080p) [Not 24/7] @@ -581,7 +591,7 @@ https://liveingesta318.cdnmedia.tv/berguedatvlive/smil:migracion.smil/playlist.m #EXTINF:-1 tvg-id="TVCostaBrava.es" http-user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.97 Safari/537.36 CrKey/1.44.191160",TV Costa Brava (1080p) #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.97 Safari/537.36 CrKey/1.44.191160 https://liveingesta318.cdnmedia.tv/costabravatvlive/smil:live.smil/playlist.m3u8 -#EXTINF:-1 tvg-id="",Tv Famypanc HD (1080p) +#EXTINF:-1 tvg-id="FamypancTV.es@HD",Tv Famypanc HD (1080p) https://panel.host-live.com:19360/8042/8042.m3u8 #EXTINF:-1 tvg-id="TVFerrol.es",TV Ferrol (576p) https://directo.tvferrol.es/tv.m3u8 @@ -679,13 +689,3 @@ https://janus.xpbroadcasting.com:8443/hls/xptvUS.m3u8 #EXTINF:-1 tvg-id="ZafraTV.es" http-referrer="https://player.streamingconnect.com/",Zafra TV (1080p) #EXTVLCOPT:http-referrer=https://player.streamingconnect.com/ https://cloud.fastchannel.es/mic/manifiest/hls/radiotvzafra/radiotvzafra.m3u8 -#EXTINF:-1 tvg-id="Atreseries.es",Atreseries (480p) -http://181.78.109.48:8000/play/a00l/index.m3u8 -#EXTINF:-1 tvg-id="Antena3.es",Antena 3 (480p) -http://181.78.109.48:8000/play/a00f/index.m3u8 -#EXTINF:-1 tvg-id="AXN.es",AXN (1080p) -http://181.78.109.48:8000/play/a05u/index.m3u8 -#EXTINF:-1 tvg-id="AXN.es",AXN (480p) -http://181.78.109.48:8000/play/a023/index.m3u8 -#EXTINF:-1 tvg-id="Nickelodeon.es",Nickelodeon (480p) -http://181.78.109.48:8000/play/a05a/index.m3u8 diff --git a/streams/es_pluto.m3u b/streams/es_pluto.m3u index 55e10d72d7..f7d80c3d8f 100644 --- a/streams/es_pluto.m3u +++ b/streams/es_pluto.m3u @@ -1,43 +1,43 @@ #EXTM3U -#EXTINF:-1 tvg-id="BBCDrama.es",BBC Drama (720p) +#EXTINF:-1 tvg-id="BBCDrama.uk@Spain",BBC Drama (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/60dafb9a0df1ba000758d37b/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&serverSideAds=false&studio_id=viacom&tags=ROKU_CONTENT_TAGS #EXTINF:-1 tvg-id="ComediaMadeinSpain.us",Comedia Made in Spain (720p) [Not 24/7] https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f1abce155a03d0007718834/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f1abce155a03d0007718834&deviceLat=41.1167&deviceLon=1.2500&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=ES&serverSideAds=false&sid=505&terminate=false&userId= -#EXTINF:-1 tvg-id="Anaylos7.es",Pluto TV Ana y los 7 (720p) +#EXTINF:-1 tvg-id="",Pluto TV Ana y los 7 (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1acce7f17797000718f9be/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVAnimakids.es",Pluto TV Animakids (720p) +#EXTINF:-1 tvg-id="PlutoTVAnimakids.us@Spain",Pluto TV Animakids (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1aabee6f4a2c00076a322c/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVAnimakids.es",Pluto TV Animakids (Spain) (720p) +#EXTINF:-1 tvg-id="",Pluto TV Animakids (Spain) (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f1aabee6f4a2c00076a322c/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f1aabee6f4a2c00076a322c&deviceLat=41.1167&deviceLon=1.2500&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=ES&serverSideAds=false&sid=905&terminate=false&userId= -#EXTINF:-1 tvg-id="PlutoTVAnimales.es",Pluto TV Animales (288p) +#EXTINF:-1 tvg-id="PlutoTVAnimales.us@Spain",Pluto TV Animales (288p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dd834c66fe2ca0009303b8d/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId= -#EXTINF:-1 tvg-id="PlutoTVCineAccion.es",Pluto TV Cine Acción (720p) +#EXTINF:-1 tvg-id="PlutoTVCineAccion.us@Spain",Pluto TV Cine Acción (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d8d164d92e97a5e107638d2/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d8d164d92e97a5e107638d2&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=904&terminate=false&userId= -#EXTINF:-1 tvg-id="PlutoTVCineAccion.es",Pluto TV Cine Acción (720p) +#EXTINF:-1 tvg-id="PlutoTVCineAccion.us@Spain",Pluto TV Cine Acción (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcb62e63d4d8f0009f36881/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId= -#EXTINF:-1 tvg-id="PlutoTVCineAccion.es",Pluto TV Cine Acción (720p) +#EXTINF:-1 tvg-id="PlutoTVCineAccion.us@Spain",Pluto TV Cine Acción (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1ac2591dd8880007bb7d6d/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVCineAccion.es",Pluto TV Cine Acción (240p) +#EXTINF:-1 tvg-id="PlutoTVCineAccion.us@Spain",Pluto TV Cine Acción (240p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d8d164d92e97a5e107638d2/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVCineClasico.es",Pluto TV Cine Clásico (720p) +#EXTINF:-1 tvg-id="PlutoTVCineClasico.us@Spain",Pluto TV Cine Clásico (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/61373bb45168fe000773eecd/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVCineEstelar.es",Pluto TV Cine Estelar (720p) +#EXTINF:-1 tvg-id="PlutoTVCineEstelar.us@Spain",Pluto TV Cine Estelar (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcde437229eff00091b6c30/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId= -#EXTINF:-1 tvg-id="PlutoTVCineEstelar.es",Pluto TV Cine Estelar (720p) +#EXTINF:-1 tvg-id="PlutoTVCineEstelar.us@Spain",Pluto TV Cine Estelar (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5cf968040ab7d8f181e6a68b/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVCineEstelar.es",Pluto TV Cine Estelar (720p) +#EXTINF:-1 tvg-id="PlutoTVCineEstelar.us@Spain",Pluto TV Cine Estelar (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1ac1f1b66c76000790ef27/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVCineEstelar.es",Pluto TV Cine Estelar (684p) +#EXTINF:-1 tvg-id="PlutoTVCineEstelar.us@Spain",Pluto TV Cine Estelar (684p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5cf968040ab7d8f181e6a68b/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5cf968040ab7d8f181e6a68b&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=901&terminate=false&userId= -#EXTINF:-1 tvg-id="PlutoTVCocina.es",Pluto TV Cocina (720p) +#EXTINF:-1 tvg-id="PlutoTVCocina.us@Spain",Pluto TV Cocina (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d8d0fbaa8742fa3093899da/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVCocina.es",Pluto TV Cocina (720p) +#EXTINF:-1 tvg-id="PlutoTVCocina.us@Spain",Pluto TV Cocina (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1acdaa8ba90f0007d5e760/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVCocina.es",Pluto TV Cocina (720p) [Not 24/7] +#EXTINF:-1 tvg-id="PlutoTVCocina.us@Spain",Pluto TV Cocina (720p) [Not 24/7] https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcde0657444a40009cd2422/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId= -#EXTINF:-1 tvg-id="PlutoTVCocina.es",Pluto TV Cocina (240p) +#EXTINF:-1 tvg-id="PlutoTVCocina.us@Spain",Pluto TV Cocina (240p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d8d0fbaa8742fa3093899da/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d8d0fbaa8742fa3093899da&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=956&terminate=false&userId= -#EXTINF:-1 tvg-id="PlutoTVCocina.es",Pluto TV Cocina (Spain) (720p) +#EXTINF:-1 tvg-id="PlutoTVCocina.us@Spain",Pluto TV Cocina (Spain) (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f1acdaa8ba90f0007d5e760/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f1acdaa8ba90f0007d5e760&deviceLat=41.1167&deviceLon=1.2500&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=ES&serverSideAds=false&sid=700&terminate=false&userId= #EXTINF:-1 tvg-id="",Pluto TV Comedia (Made in Spain) (720p) [Not 24/7] https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1abce155a03d0007718834/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS @@ -45,43 +45,43 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1abce15 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e94cd036cc69d0007e8a1ba/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5e94cd036cc69d0007e8a1ba&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=933&terminate=false&userId= #EXTINF:-1 tvg-id="ForensicFiles.us",Pluto TV Forensic Files en ESP (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e94cd036cc69d0007e8a1ba/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVKids.es",Pluto TV Kids (720p) +#EXTINF:-1 tvg-id="PlutoTVKids.us@Spain",Pluto TV Kids (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ad9b648e738977e2c312131/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5ad9b648e738977e2c312131&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=30292edb-0714-11eb-97af-0242ac110002&terminate=false&userId= -#EXTINF:-1 tvg-id="PlutoTVKids.es",Pluto TV Kids (720p) +#EXTINF:-1 tvg-id="PlutoTVKids.us@Spain",Pluto TV Kids (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/51c75f7bb6f26ba1cd00002f/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=51c75f7bb6f26ba1cd00002f&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=989&terminate=false&userId= -#EXTINF:-1 tvg-id="PlutoTVKids.es",Pluto TV Kids (720p) +#EXTINF:-1 tvg-id="PlutoTVKids.us@Spain",Pluto TV Kids (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ad8d54be738977e2c310940/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVKids.es",Pluto TV Kids (720p) +#EXTINF:-1 tvg-id="PlutoTVKids.us@Spain",Pluto TV Kids (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ad9b648e738977e2c312131/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVKids.es",Pluto TV Kids (720p) +#EXTINF:-1 tvg-id="PlutoTVKids.us@Spain",Pluto TV Kids (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1aab1d29b39600073e243f/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVKids.es",Pluto TV Kids (720p) +#EXTINF:-1 tvg-id="PlutoTVKids.us@Spain",Pluto TV Kids (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/51c75f7bb6f26ba1cd00002f/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVKids.es",Pluto TV Kids (720p) [Not 24/7] +#EXTINF:-1 tvg-id="PlutoTVKids.us@Spain",Pluto TV Kids (720p) [Not 24/7] https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dd6dae8ce788b0009eaf77b/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId= -#EXTINF:-1 tvg-id="PlutoTVKids.es",Pluto TV Kids (720p) [Not 24/7] +#EXTINF:-1 tvg-id="PlutoTVKids.us@Spain",Pluto TV Kids (720p) [Not 24/7] https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1214a637c6fd00079c652f/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVKids.es",Pluto TV Kids (Spain) (720p) +#EXTINF:-1 tvg-id="PlutoTVKids.us@Spain",Pluto TV Kids (Spain) (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f1aab1d29b39600073e243f/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f1aab1d29b39600073e243f&deviceLat=41.1167&deviceLon=1.2500&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=ES&serverSideAds=false&sid=910&terminate=false&userId= -#EXTINF:-1 tvg-id="MTVCatfishTVShow.es",Pluto TV MTV Catfish (Spain) (720p) [Not 24/7] +#EXTINF:-1 tvg-id="",Pluto TV MTV Catfish (Spain) (720p) [Not 24/7] https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f1ab3c7778230000735cf41/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f1ab3c7778230000735cf41&deviceLat=41.1167&deviceLon=1.2500&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=ES&serverSideAds=false&sid=305&terminate=false&userId= #EXTINF:-1 tvg-id="PlutoTVMTVMusicMadeinSpain.us",Pluto TV MTV Music Made in Spain (720p) [Not 24/7] https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/60a26a056d55b30007918d5a/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&serverSideAds=false&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="MTVOriginals.es",Pluto TV MTV Originals (Spain) (480p) +#EXTINF:-1 tvg-id="",Pluto TV MTV Originals (Spain) (480p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f1aadf373bed3000794d1d7/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f1aadf373bed3000794d1d7&deviceLat=41.1167&deviceLon=1.2500&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=ES&serverSideAds=false&sid=300&terminate=false&userId= #EXTINF:-1 tvg-id="PlutoTVRealitiesESP.us",Pluto TV Realities ESP (720p) [Not 24/7] https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d93b4d71754e6a4298d086e/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d93b4d71754e6a4298d086e&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=953&terminate=false&userId= #EXTINF:-1 tvg-id="PlutoTVRealitiesESP.us",Pluto TV Realities ESP (720p) [Not 24/7] https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d93b4d71754e6a4298d086e/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVTeenStars.es",Pluto TV Teen Stars (720p) +#EXTINF:-1 tvg-id="PlutoTVTeenStars.us@Spain",Pluto TV Teen Stars (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/60016a60a8e3520008e0d331/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVTelenovelas.es",Pluto TV Telenovelas (720p) +#EXTINF:-1 tvg-id="PlutoTVTelenovelas.us@Spain",Pluto TV Telenovelas (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/60b4c06717da110007ee1af6/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&serverSideAds=false&studio_id=viacom&tags=ROKU_CONTENT_TAGS #EXTINF:-1 tvg-id="PlutoTVTheWalkingDeadESP.us",Pluto TV The Walking Dead ESP (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e82bb378601b80007b4bd78/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5e82bb378601b80007b4bd78&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=925&terminate=false&userId= #EXTINF:-1 tvg-id="PlutoTVTheWalkingDeadESP.us",Pluto TV The Walking Dead ESP (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e82bb378601b80007b4bd78/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVToonsClasico.es",Pluto TV Toons Clásico (720p) +#EXTINF:-1 tvg-id="PlutoTVToonsClasico.us@Spain",Pluto TV Toons Clásico (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/609e7e423e9173000706a681/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS #EXTINF:-1 tvg-id="TopGear.uk",Top Gear (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/60d356a534f63f000850cdd7/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&serverSideAds=false&studio_id=viacom&tags=ROKU_CONTENT_TAGS diff --git a/streams/es_rakuten.m3u b/streams/es_rakuten.m3u index 8818cff9cc..e7ab9705d9 100644 --- a/streams/es_rakuten.m3u +++ b/streams/es_rakuten.m3u @@ -1,7 +1,7 @@ #EXTM3U #EXTINF:-1 tvg-id="BloombergQuicktake.us",Bloomberg Quicktake (1080p) https://bloomberg-quicktake-2-eu.rakuten.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="ClubbingTV.fr",Clubbing TV (720p) +#EXTINF:-1 tvg-id="ClubbingTV.us@Spain",Clubbing TV (720p) https://clubbingtv-rakuten.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="LoneStar.us",Lone Star (1080p) https://lonestar-rakuten.amagi.tv/playlist.m3u8 diff --git a/streams/es_samsung.m3u b/streams/es_samsung.m3u index 00105f5788..d31665e361 100644 --- a/streams/es_samsung.m3u +++ b/streams/es_samsung.m3u @@ -25,7 +25,7 @@ https://sofytv-samsunges.amagi.tv/playlist.m3u8 https://kedoo-supertoonstv-2-es.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="Tastemade.us",Tastemade https://tastemade-es16tm-samsung.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="ThePetCollective.es",The Pet Collective +#EXTINF:-1 tvg-id="ThePetCollective.us@Spain",The Pet Collective https://the-pet-collective-international-es.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="TraceSportStars.fr",Trace Sport Stars (1080p) [Geo-blocked] http://tracesportstars-samsunges.amagi.tv/hls/amagi_hls_data_samsunguk-tracesport-samsungspain/CDN/playlist.m3u8 diff --git a/streams/et.m3u b/streams/et.m3u index 3d63acff64..a86e856e5a 100644 --- a/streams/et.m3u +++ b/streams/et.m3u @@ -3,7 +3,7 @@ https://rrsatrtmp.tulix.tv/addis1/addis1multi.smil/playlist.m3u8 #EXTINF:-1 tvg-id="EBSCinema.us",EBS Cinema (720p) https://rpn.bozztv.com/ebstv/ebscinema/index.m3u8 -#EXTINF:-1 tvg-id="EBSHD.us",EBS HD (1080p) +#EXTINF:-1 tvg-id="EBS.us@HD",EBS HD (1080p) https://rpn.bozztv.com/ebstv/ebstv/index.m3u8 #EXTINF:-1 tvg-id="EBSMusika.us",EBS Musika (720p) https://rpn.bozztv.com/ebstv/ebsmusika/index.m3u8 diff --git a/streams/fi_samsung.m3u b/streams/fi_samsung.m3u index 6e1faebc52..ce8dadd0df 100644 --- a/streams/fi_samsung.m3u +++ b/streams/fi_samsung.m3u @@ -7,5 +7,5 @@ https://bloomberg-quicktake-1-fi.samsung.wurl.tv/manifest/playlist.m3u8 https://bloomberg-bloomberg-1-fi.samsung.wurl.tv/manifest/playlist.m3u8 #EXTINF:-1 tvg-id="EuronewsEnglish.fr",Euronews English (720p) https://rakuten-euronews-1-fi.samsung.wurl.tv/manifest/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVFamilyMovies.fi",Rakuten Family (Finland) (720p) +#EXTINF:-1 tvg-id="RakutenTVFamilyMovies.es@Finland",Rakuten Family (Finland) (720p) https://rakuten-family-12-fi.samsung.wurl.tv/playlist.m3u8 diff --git a/streams/fr.m3u b/streams/fr.m3u index 934dd079ad..2158742e1e 100644 --- a/streams/fr.m3u +++ b/streams/fr.m3u @@ -3,7 +3,7 @@ https://origin-caf900c010ea8046.live.6cloud.fr/out/v1/29c7a579af3348b48230f76cd75699a5/dash_short_cenc10_6ter_hd_index.mpd #EXTINF:-1 tvg-id="20MinutesTV.fr",20 Minutes TV (1080p) https://lives.digiteka.com/stream/86d3e867-a272-496b-8412-f59aa0104771/index.m3u8 -#EXTINF:-1 tvg-id="",A12 TV (720p) +#EXTINF:-1 tvg-id="A12TV.ci@SD",A12 TV (720p) https://video1.getstreamhosting.com:1936/8420/8420/playlist.m3u8 #EXTINF:-1 tvg-id="ADNTVPlus.fr",ADN TV+ (1080p) [Geo-Blocked] https://samsunguk-adn-samsung-fre-qfrlc.amagi.tv/playlist/samsunguk-adn-samsung-fre/playlist.m3u8 @@ -45,7 +45,7 @@ http://51.254.199.122:8080/cdirectTV/index.m3u8 http://cdn2.ujjina.com:1935/iptvcentraltv/livecentraltvtv/playlist.m3u8 #EXTINF:-1 tvg-id="Cherie25.fr",Chérie 25 (1080p) https://cherie25.nrjaudio.fm/hls/live/2038375/c25/FHD.m3u8 -#EXTINF:-1 tvg-id="ClubbingTV.fr",Clubbing TV (720p) +#EXTINF:-1 tvg-id="ClubbingTV.us@France",Clubbing TV (720p) https://clubbingtv-rakuten.amagi.tv/hls/amagi_hls_data_rakutenAA-clubbingtv-rakuten/CDN/master.m3u8 #EXTINF:-1 tvg-id="CNews.fr",CNews (1080p) [Geo-blocked] https://raw.githubusercontent.com/LeBazarDeBryan/XTVZ_/main/Stream/Live/CNews.m3u8 @@ -55,13 +55,13 @@ https://live.creacast.com/d5tv/smil:d5tv.smil/playlist.m3u8 https://edge.vedge.infomaniak.com/livecast/ik:dbmtv/manifest.m3u8 #EXTINF:-1 tvg-id="DBMTV.fr",DBM TV (1080p) https://dbmtv.vedge.infomaniak.com/livecast/dbmtv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Equidia (1080p) +#EXTINF:-1 tvg-id="Equidia.fr@SD",Equidia (1080p) https://raw.githubusercontent.com/Paradise-91/ParaTV/main/streams/equidia/live2.m3u8 #EXTINF:-1 tvg-id="",Equidia Racing Mag (1080p) https://raw.githubusercontent.com/Paradise-91/ParaTV/main/streams/equidia/racingmag.m3u8 #EXTINF:-1 tvg-id="EreTV.fr",Ère TV (1080p) https://mn-nl.mncdn.com/awraastv/awraastv_hd.smil/playlist.m3u8 -#EXTINF:-1 tvg-id="EuronewsEnglishHD.fr",Euronews English HD (1080p) +#EXTINF:-1 tvg-id="EuronewsEnglish.fr@HD",Euronews English HD (1080p) http://stream01.vnet.am/Channel_119/mono.m3u8 #EXTINF:-1 tvg-id="FashionTVCzechSlovak.fr",FashionTV Czech&Slovak (450p) [Not 24/7] http://lb.streaming.sk/fashiontv/stream/playlist.m3u8 @@ -77,69 +77,69 @@ https://raw.githubusercontent.com/Paradise-91/ParaTV/main/streams/francetv/franc http://69.64.57.208/france5/mono.m3u8 #EXTINF:-1 tvg-id="France5.fr",France 5 (1080p) [Geo-blocked] https://raw.githubusercontent.com/Paradise-91/ParaTV/main/streams/francetv/france5.m3u8 -#EXTINF:-1 tvg-id="France24Arabic.fr",France 24 Arabic (1080p) +#EXTINF:-1 tvg-id="France24.fr@Arabic",France 24 Arabic (1080p) https://live.france24.com/hls/live/2037222-b/F24_AR_HI_HLS/master_5000.m3u8 -#EXTINF:-1 tvg-id="France24Arabic.fr",France 24 Arabic (1080p) +#EXTINF:-1 tvg-id="France24.fr@Arabic",France 24 Arabic (1080p) https://live.france24.com/hls/live/2037222/F24_AR_HI_HLS/master_5000.m3u8 -#EXTINF:-1 tvg-id="France24Arabic.fr",France 24 Arabic (720p) +#EXTINF:-1 tvg-id="France24.fr@Arabic",France 24 Arabic (720p) https://live.france24.com/hls/live/2037222-b/F24_AR_HI_HLS/master_2300.m3u8 -#EXTINF:-1 tvg-id="France24Arabic.fr",France 24 Arabic (720p) +#EXTINF:-1 tvg-id="France24.fr@Arabic",France 24 Arabic (720p) https://live.france24.com/hls/live/2037222/F24_AR_HI_HLS/master_2300.m3u8 -#EXTINF:-1 tvg-id="France24Arabic.fr",France 24 Arabic (576p) +#EXTINF:-1 tvg-id="France24.fr@Arabic",France 24 Arabic (576p) https://live.france24.com/hls/live/2037222-b/F24_AR_HI_HLS/master_900.m3u8 -#EXTINF:-1 tvg-id="France24Arabic.fr",France 24 Arabic (576p) +#EXTINF:-1 tvg-id="France24.fr@Arabic",France 24 Arabic (576p) https://live.france24.com/hls/live/2037222/F24_AR_HI_HLS/master_900.m3u8 -#EXTINF:-1 tvg-id="France24Arabic.fr",France 24 Arabic (360p) +#EXTINF:-1 tvg-id="France24.fr@Arabic",France 24 Arabic (360p) https://live.france24.com/hls/live/2037222-b/F24_AR_HI_HLS/master_500.m3u8 -#EXTINF:-1 tvg-id="France24Arabic.fr",France 24 Arabic (360p) +#EXTINF:-1 tvg-id="France24.fr@Arabic",France 24 Arabic (360p) https://live.france24.com/hls/live/2037222/F24_AR_HI_HLS/master_500.m3u8 -#EXTINF:-1 tvg-id="France24English.fr",France 24 English (1080p) +#EXTINF:-1 tvg-id="France24.fr@English",France 24 English (1080p) https://live.france24.com/hls/live/2037218-b/F24_EN_HI_HLS/master_5000.m3u8 -#EXTINF:-1 tvg-id="France24English.fr",France 24 English (1080p) +#EXTINF:-1 tvg-id="France24.fr@English",France 24 English (1080p) https://live.france24.com/hls/live/2037218/F24_EN_HI_HLS/master_5000.m3u8 -#EXTINF:-1 tvg-id="France24English.fr",France 24 English (720p) +#EXTINF:-1 tvg-id="France24.fr@English",France 24 English (720p) https://live.france24.com/hls/live/2037218-b/F24_EN_HI_HLS/master_2300.m3u8 -#EXTINF:-1 tvg-id="France24English.fr",France 24 English (720p) +#EXTINF:-1 tvg-id="France24.fr@English",France 24 English (720p) https://live.france24.com/hls/live/2037218/F24_EN_HI_HLS/master_2300.m3u8 -#EXTINF:-1 tvg-id="France24English.fr",France 24 English (576p) +#EXTINF:-1 tvg-id="France24.fr@English",France 24 English (576p) https://live.france24.com/hls/live/2037218-b/F24_EN_HI_HLS/master_900.m3u8 -#EXTINF:-1 tvg-id="France24English.fr",France 24 English (576p) +#EXTINF:-1 tvg-id="France24.fr@English",France 24 English (576p) https://live.france24.com/hls/live/2037218/F24_EN_HI_HLS/master_900.m3u8 -#EXTINF:-1 tvg-id="France24English.fr",France 24 English (360p) +#EXTINF:-1 tvg-id="France24.fr@English",France 24 English (360p) https://live.france24.com/hls/live/2037218-b/F24_EN_HI_HLS/master_500.m3u8 -#EXTINF:-1 tvg-id="France24English.fr",France 24 English (360p) +#EXTINF:-1 tvg-id="France24.fr@English",France 24 English (360p) https://live.france24.com/hls/live/2037218/F24_EN_HI_HLS/master_500.m3u8 -#EXTINF:-1 tvg-id="France24Espanol.fr",France 24 Español (1080p) +#EXTINF:-1 tvg-id="France24.fr@Spanish",France 24 Español (1080p) https://live.france24.com/hls/live/2037220-b/F24_ES_HI_HLS/master_5000.m3u8 -#EXTINF:-1 tvg-id="France24Espanol.fr",France 24 Español (1080p) +#EXTINF:-1 tvg-id="France24.fr@Spanish",France 24 Español (1080p) https://live.france24.com/hls/live/2037220/F24_ES_HI_HLS/master_5000.m3u8 -#EXTINF:-1 tvg-id="France24Espanol.fr",France 24 Español (720p) +#EXTINF:-1 tvg-id="France24.fr@Spanish",France 24 Español (720p) https://live.france24.com/hls/live/2037220-b/F24_ES_HI_HLS/master_2300.m3u8 -#EXTINF:-1 tvg-id="France24Espanol.fr",France 24 Español (720p) +#EXTINF:-1 tvg-id="France24.fr@Spanish",France 24 Español (720p) https://live.france24.com/hls/live/2037220/F24_ES_HI_HLS/master_2300.m3u8 -#EXTINF:-1 tvg-id="France24Espanol.fr",France 24 Español (576p) +#EXTINF:-1 tvg-id="France24.fr@Spanish",France 24 Español (576p) https://live.france24.com/hls/live/2037220-b/F24_ES_HI_HLS/master_900.m3u8 -#EXTINF:-1 tvg-id="France24Espanol.fr",France 24 Español (576p) +#EXTINF:-1 tvg-id="France24.fr@Spanish",France 24 Español (576p) https://live.france24.com/hls/live/2037220/F24_ES_HI_HLS/master_900.m3u8 -#EXTINF:-1 tvg-id="France24Espanol.fr",France 24 Español (360p) +#EXTINF:-1 tvg-id="France24.fr@Spanish",France 24 Español (360p) https://live.france24.com/hls/live/2037220-b/F24_ES_HI_HLS/master_500.m3u8 -#EXTINF:-1 tvg-id="France24Espanol.fr",France 24 Español (360p) +#EXTINF:-1 tvg-id="France24.fr@Spanish",France 24 Español (360p) https://live.france24.com/hls/live/2037220/F24_ES_HI_HLS/master_500.m3u8 -#EXTINF:-1 tvg-id="France24French.fr",France 24 French (1080p) +#EXTINF:-1 tvg-id="France24.fr@French",France 24 French (1080p) https://live.france24.com/hls/live/2037179-b/F24_FR_HI_HLS/master_5000.m3u8 -#EXTINF:-1 tvg-id="France24French.fr",France 24 French (1080p) +#EXTINF:-1 tvg-id="France24.fr@French",France 24 French (1080p) https://live.france24.com/hls/live/2037179/F24_FR_HI_HLS/master_5000.m3u8 -#EXTINF:-1 tvg-id="France24French.fr",France 24 French (720p) +#EXTINF:-1 tvg-id="France24.fr@French",France 24 French (720p) https://live.france24.com/hls/live/2037179-b/F24_FR_HI_HLS/master_2300.m3u8 -#EXTINF:-1 tvg-id="France24French.fr",France 24 French (720p) +#EXTINF:-1 tvg-id="France24.fr@French",France 24 French (720p) https://live.france24.com/hls/live/2037179/F24_FR_HI_HLS/master_2300.m3u8 -#EXTINF:-1 tvg-id="France24French.fr",France 24 French (576p) +#EXTINF:-1 tvg-id="France24.fr@French",France 24 French (576p) https://live.france24.com/hls/live/2037179-b/F24_FR_HI_HLS/master_900.m3u8 -#EXTINF:-1 tvg-id="France24French.fr",France 24 French (576p) +#EXTINF:-1 tvg-id="France24.fr@French",France 24 French (576p) https://live.france24.com/hls/live/2037179/F24_FR_HI_HLS/master_900.m3u8 -#EXTINF:-1 tvg-id="France24French.fr",France 24 French (360p) +#EXTINF:-1 tvg-id="France24.fr@French",France 24 French (360p) https://live.france24.com/hls/live/2037179-b/F24_FR_HI_HLS/master_500.m3u8 -#EXTINF:-1 tvg-id="France24French.fr",France 24 French (360p) +#EXTINF:-1 tvg-id="France24.fr@French",France 24 French (360p) https://live.france24.com/hls/live/2037179/F24_FR_HI_HLS/master_500.m3u8 #EXTINF:-1 tvg-id="Francophonie24.fr",Francophonie (360p) http://mv2.tvfrancophonie.org/live/Stream1/playlist.m3u8 @@ -229,10 +229,10 @@ https://raw.githubusercontent.com/Paradise-91/ParaTV/main/streams/tf1plus/tf1.m3 https://raw.githubusercontent.com/Paradise-91/ParaTV/main/streams/tf1plus/tf1sf.m3u8 #EXTINF:-1 tvg-id="TFX.fr",TFX (720p) [Geo-blocked] https://raw.githubusercontent.com/Paradise-91/ParaTV/main/streams/tf1plus/tfx.m3u8 -#EXTINF:-1 tvg-id="TiVi5Monde.fr",TiVi5 Monde [Geo-blocked] -https://ott.tv5monde.com/Content/HLS/Live/channel(tivi5)/variant.m3u8 #EXTINF:-1 tvg-id="TiVi5Monde.fr",TiVi5Monde (1080p) http://154.197.91.168:7001/play/a0dz/index.m3u8 +#EXTINF:-1 tvg-id="TiVi5Monde.fr",TiVi5 Monde [Geo-blocked] +https://ott.tv5monde.com/Content/HLS/Live/channel(tivi5)/variant.m3u8 #EXTINF:-1 tvg-id="TMC.fr",TMC (720p) [Geo-blocked] https://raw.githubusercontent.com/Paradise-91/ParaTV/main/streams/tf1plus/tmc.m3u8 #EXTINF:-1 tvg-id="TraceLatina.fr",Trace Latina diff --git a/streams/fr_pluto.m3u b/streams/fr_pluto.m3u index 4d52b41509..35868865b3 100644 --- a/streams/fr_pluto.m3u +++ b/streams/fr_pluto.m3u @@ -5,27 +5,27 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64bab8ba5dc1660008969b5a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06ff28-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5c583725-776e-440c-a02f-17dca14750d3 #EXTINF:-1 tvg-id="",Alerte Cobra http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f3e4bc08f5ec000744f552/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06b105-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e8eddbbb-a9fd-424c-9473-64dc6420b913 -#EXTINF:-1 tvg-id="AmourGloireetBeaute.fr",Amour Gloire et Beauté +#EXTINF:-1 tvg-id="AmourGloireetBeaute.us@France",Amour Gloire et Beauté http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/61533b6334ba9b000763d7b1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0662e0-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f9535dab-8477-46f9-9989-31f9ea0a251f -#EXTINF:-1 tvg-id="AngelaAnaconda.fr",Angela Anaconda +#EXTINF:-1 tvg-id="AngelaAnaconda.us@France",Angela Anaconda http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/611e73687fcd580007d1f052/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e063bd1-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=28121508-e373-4b45-8f21-c48bbc48ecda -#EXTINF:-1 tvg-id="AreYouTheOne.fr",Are You The One? +#EXTINF:-1 tvg-id="AreYouTheOne.us@France",Are You The One? http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6192416c06d23b0007379766/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0662e6-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9bf91fcc-8ee0-4cc6-90c2-822e386de523 -#EXTINF:-1 tvg-id="Avatar.fr",Avatar +#EXTINF:-1 tvg-id="Avatar.us@France",Avatar http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60b4c17a81e29300071d3a39/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e05edb7-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=640a4092-5016-4d01-bcbf-d66e4f7aa21d -#EXTINF:-1 tvg-id="BBCDrama.fr",BBC Drama +#EXTINF:-1 tvg-id="BBCDrama.uk@France",BBC Drama http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60d35a74c63c3c0008df6a90/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0614c5-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=eff52b4b-c804-4f5a-968a-d48a2898e184 -#EXTINF:-1 tvg-id="",BET CLASSICS Pluto TV +#EXTINF:-1 tvg-id="BETClassicsPlutoTV.us@France",BET CLASSICS Pluto TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f92b5ba040eaa0007074d0a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e059f90-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f90dc5f8-5a4a-4bbd-bb99-e092a9625269 -#EXTINF:-1 tvg-id="Bobleponge.fr",Bob l'éponge +#EXTINF:-1 tvg-id="Bobleponge.us@France",Bob l'éponge http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ffc8c345822750007e167de/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e059f93-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=eb72cd85-f8e2-414a-99d0-c0cd8a98518d -#EXTINF:-1 tvg-id="BubbleGuppies.fr",Bubble Guppies +#EXTINF:-1 tvg-id="BubbleGuppies.us@France",Bubble Guppies http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/618e3c1106d23b0007366723/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0662e5-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7d78b066-1897-473b-a861-c3b256c623ae #EXTINF:-1 tvg-id="",C'est pas sorcier http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63b579961bdba100071214cb/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06ff23-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=410cc83b-4396-41a0-b726-70e8f1e3fea4 #EXTINF:-1 tvg-id="",Car Chase http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65bd05483a11680007813560/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e074d43-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e6543233-9385-400c-9f39-b1ad35070504 -#EXTINF:-1 tvg-id="",CATFISH TV +#EXTINF:-1 tvg-id="PlutoTVCatfish.us@SD",CATFISH TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8eb66537867f0007146953/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e04b530-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=49bb6c77-a3e5-4314-90b2-4494da60cda0 #EXTINF:-1 tvg-id="CBSNews247.us",CBS News 24/7 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6231ec93779a9d00079ba8e2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0689f3-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=fed25d80-74f3-47d1-a87b-51755ac6ef8a @@ -35,37 +35,37 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f3dd1c2f29ce0007e18596/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06b102-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0031c60f-4d94-4726-b1ae-5054583e82c7 #EXTINF:-1 tvg-id="",CRIBS : MAISONS DE STAR http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/602cf8963b4bc90007454541/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e059f95-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ef9cbc32-fe18-4548-b776-ce85f69ae4aa -#EXTINF:-1 tvg-id="",DAZN Combat +#EXTINF:-1 tvg-id="DAZNCombat.uk@France",DAZN Combat http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64d626ac9b414d000820e2fc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e072633-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=af4aed2d-44b9-45af-9707-5d83d9aaba97 -#EXTINF:-1 tvg-id="Degrassi.fr",Degrassi +#EXTINF:-1 tvg-id="Degrassi.us@France",Degrassi http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/611e71322f5f180007001dde/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e063bd0-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b13bbde4-6ce3-474b-9630-e27748ff481f #EXTINF:-1 tvg-id="",Detective Conan http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f3e8ad2a8e8000077b013d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06b107-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=165463a5-b9d3-452a-84d9-0cf94452227f #EXTINF:-1 tvg-id="",Digimon Adventure http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/617bae1d69bca3000729561e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0662e2-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d081da78-acbb-459e-9034-63720548296e -#EXTINF:-1 tvg-id="DoctorWho.fr",Doctor Who +#EXTINF:-1 tvg-id="DoctorWho.us@France",Doctor Who http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60d359c98f262f00070c364e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0614c4-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a836d7ad-5d71-4fc0-ad59-2017a44eddb6 -#EXTINF:-1 tvg-id="DoraTV.fr",Dora TV +#EXTINF:-1 tvg-id="DoraTV.us@France",Dora TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ecb9524419b0007365a1c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e050350-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c938e920-2111-4877-9e36-97d7a0a0d005 -#EXTINF:-1 tvg-id="DossiersFBI.fr",Dossiers FBI +#EXTINF:-1 tvg-id="DossiersFBI.us@France",Dossiers FBI http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8edad922b10b000753bc37/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e057883-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a243842a-2a92-4ca0-bdea-73f35b29bf5c #EXTINF:-1 tvg-id="",Echappées Belles & Co http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63b578b524f0cf00072f2a52/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06ff22-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3edb47ac-db16-4729-ab4d-d838f822b945 #EXTINF:-1 tvg-id="",Enquêtes de Choc http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63921a1bf76e7d0007c998a6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06d816-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7931c2bb-1392-4543-8cc4-684661cfd449 -#EXTINF:-1 tvg-id="",Euronews +#EXTINF:-1 tvg-id="EuronewsFrench.fr@SD",Euronews http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60d35bcaf1ff4a00078af0a6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0614c6-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=90bc590c-c00a-4ff4-b9e2-ad20ea686992 #EXTINF:-1 tvg-id="",Extreme Channel http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/626be090c5340d00073773f9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06b100-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=04f3e8bb-bf34-46ea-9933-86c44de2d919 -#EXTINF:-1 tvg-id="FailArmy.fr",FailArmy +#EXTINF:-1 tvg-id="FailArmy.us@France",FailArmy http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ecd9169d2d4000864a974/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e052a61-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9b7a96a5-bbde-4e9f-8dd8-997f6a97611f #EXTINF:-1 tvg-id="",Family Club http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64c9260ac0222700089ee62b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e072631-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=364c137f-40b0-4bdd-a96c-0065bd886eaf -#EXTINF:-1 tvg-id="GamingTV.fr",Gaming TV +#EXTINF:-1 tvg-id="GamingTV.us@France",Gaming TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8eccd81062c300078a11df/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e050353-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1020d719-457b-4030-b4a2-b5301461d381 #EXTINF:-1 tvg-id="",Génération Sitcoms http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60afb203ec391c00070ea1bf/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e05edb6-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=268b6554-9dcf-4fcd-bcd8-d9cb017d0cd0 -#EXTINF:-1 tvg-id="Heleneetlesgarcons.fr",Hélène et les garçons +#EXTINF:-1 tvg-id="Heleneetlesgarcons.us@France",Hélène et les garçons http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/604f8de01b479400078fb1e7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e05c6a0-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=081319e1-aad5-46bc-a821-8d7f431286e4 #EXTINF:-1 tvg-id="",Homicide http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63921a3d00c96100082a3cb4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06ff20-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=565ac5c2-e1ef-42f5-ae84-d1094ca9e136 @@ -73,65 +73,65 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ecc7aa44d9c00081fca29/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e050352-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=eaebd5fc-5255-402d-a88a-1c56b0f17230 #EXTINF:-1 tvg-id="",INA 70 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/639b54404cfdf7000729b3c1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06ff21-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=95c3471a-db5b-4447-994a-2655607bc4b2 -#EXTINF:-1 tvg-id="InazumaEleven.fr",Inazuma Eleven +#EXTINF:-1 tvg-id="InazumaEleven.us@France",Inazuma Eleven http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/611e75226b7f420007c3f319/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e063bd2-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=80879397-91d6-4d71-9c36-ad9f3ac25c0e -#EXTINF:-1 tvg-id="InstantSaga.fr",Instant Saga +#EXTINF:-1 tvg-id="InstantSaga.us@France",Instant Saga http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60549e98061b5f000776866a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e05c6a3-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=16bbfa2e-016b-4b40-921e-897d0f478a5e #EXTINF:-1 tvg-id="",Just Tattoo of Us http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6304f20c941c5d00089634e7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06d813-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=bd619bf4-9a83-4ae8-86d7-ec8f0db9023c -#EXTINF:-1 tvg-id="JustepourRire.fr",Juste pour Rire +#EXTINF:-1 tvg-id="JustepourRire.us@France",Juste pour Rire http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60afa1508284e60007163c08/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e05edb3-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a0ee8bde-7a09-45e2-b51d-4cf3012304cd -#EXTINF:-1 tvg-id="Lemiracledelamour.fr",Le miracle de l'amour +#EXTINF:-1 tvg-id="Lemiracledelamour.us@France",Le miracle de l'amour http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60549c238c3f21000753d3e0/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e05c6a1-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=21b0efd4-95cf-47d3-8340-8a9081e64732 #EXTINF:-1 tvg-id="",Les 30 Histoires http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64353456af2bd900088c1a1c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06ff25-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2e73bb66-086b-4174-9fe6-19d951e83e7c -#EXTINF:-1 tvg-id="LesAnneesfac.fr",Les Années fac +#EXTINF:-1 tvg-id="LesAnneesfac.us@France",Les Années fac http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60afae68a7fc50000737186d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e05edb5-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f7ccca4e-2376-4b24-b7e1-561c50fd11f1 -#EXTINF:-1 tvg-id="LesCordier.fr",Les Cordier +#EXTINF:-1 tvg-id="LesCordier.us@France",Les Cordier http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ed80fa09f120007c8daa5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e057881-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5245267d-c5fb-4400-bd66-dc84e2d51b0d -#EXTINF:-1 tvg-id="Lesfillesdacote.fr",Les filles d'à côté +#EXTINF:-1 tvg-id="Lesfillesdacote.us@France",Les filles d'à côté http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60549d97cd7b090007c73314/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e05c6a2-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=61cfbbdf-3d49-4d7f-8543-a26adf49304b -#EXTINF:-1 tvg-id="LesNouveauxDetectives.fr",Les Nouveaux Detectives +#EXTINF:-1 tvg-id="LesNouveauxDetectives.us@France",Les Nouveaux Detectives http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8edb6df1ebb800072edf10/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e057884-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=887f2f41-cfec-4cf3-9d93-fd01cf780148 -#EXTINF:-1 tvg-id="LesRazmoket.fr",Les Razmoket +#EXTINF:-1 tvg-id="LesRazmoket.us@France",Les Razmoket http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/619cee9d5dc3ed0007d845c8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0662e8-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5e83b1e5-d8f7-4a55-9c3f-251caf9360f8 #EXTINF:-1 tvg-id="",Les Z'amours http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/652d0b756208700008d758ad/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e072637-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=71d0e873-d985-45af-839e-e1df31b4c82c -#EXTINF:-1 tvg-id="LouisLaBrocante.fr",Louis La Brocante +#EXTINF:-1 tvg-id="LouisLaBrocante.us@France",Louis La Brocante http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ed6d569d2d4000864a976/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e057880-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e2513a1b-6870-4923-9291-f318e9804044 #EXTINF:-1 tvg-id="",MacGyver http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6245ccd0c6cdb800074632e4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0689f4-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c819e186-9c9f-4c4c-b2a0-ab6e0dee5fab -#EXTINF:-1 tvg-id="",Melrose Place +#EXTINF:-1 tvg-id="PlutoTVMelrosePlace.us@France",Melrose Place http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6245ceece1977a00079e2fbd/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0689f5-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=10e5d770-d56c-414c-8e80-dedbac870ea5 -#EXTINF:-1 tvg-id="",Monster Jam +#EXTINF:-1 tvg-id="MonsterJam.pl@SD",Monster Jam http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/655e053efbc15b00082277de/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e074d41-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=df261cab-9eb5-4b1b-9e27-67395bdf79ab -#EXTINF:-1 tvg-id="",Motorvision +#EXTINF:-1 tvg-id="Motorvision.de@SD",Motorvision http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60817e1aa6997500072d0d6d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e05edb0-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b8d137b0-1aae-46e0-9340-0eb38de9935b #EXTINF:-1 tvg-id="",MTV CLASSICS http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f92b56a367e170007cd43f4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e057887-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=26866fb9-ab48-465b-85a8-8314ba7340fa #EXTINF:-1 tvg-id="",MTV Classics+ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ff5ec5500d4c70007341c7c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e059f92-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=457511ca-61ab-4eec-b63a-a8f7fbd11f13 -#EXTINF:-1 tvg-id="",Nature Time +#EXTINF:-1 tvg-id="NatureTime.es@SD",Nature Time http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/61fc0df14159c40007250432/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0689f1-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c6eb9bb4-6b13-4301-ab2b-7475ad0a7145 -#EXTINF:-1 tvg-id="",One Piece +#EXTINF:-1 tvg-id="OnePiece.us@SD",One Piece http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6380c94947c72b0007ee9a13/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06d815-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=011422f0-e50a-4334-9bb5-b01fe7684ef5 -#EXTINF:-1 tvg-id="",PFL MMA +#EXTINF:-1 tvg-id="PFLMMA.pl@SD",PFL MMA http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/654a620d53fc9700083b2e21/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e074d40-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8f8fcc86-3a94-4ce2-9955-c103e94fd2b9 #EXTINF:-1 tvg-id="",Pluto TV #1 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6304f115fa5b2d00078cff6b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06d812-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=60426565-8585-4ea7-8f43-9095cf315b6a -#EXTINF:-1 tvg-id="PlutoTVAction.fr",Pluto TV Action +#EXTINF:-1 tvg-id="PlutoTVAction.us@France",Pluto TV Action http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ed1ff5c39700007e2204a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e055171-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c3b67254-4628-4f0e-8164-5a50e8969a42 -#EXTINF:-1 tvg-id="PlutoTVAnimaux.fr",Pluto TV Animaux +#EXTINF:-1 tvg-id="PlutoTVAnimaux.us@France",Pluto TV Animaux http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60925a44f0350600075a1fdc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e05edb2-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=754cd30f-6a34-42d3-9e06-63128a8e07e3 #EXTINF:-1 tvg-id="",Pluto TV Aventure http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/611e7811eb9daf000764cbfd/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e063bd4-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f4bcb3a3-c66e-47ef-80c5-fcf29cba6e6a #EXTINF:-1 tvg-id="",Pluto TV Catastrophe http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a69ef53af63d000825e0ee/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e074d42-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=68b1c3a0-a3f2-41b3-ae05-e83e4e687617 -#EXTINF:-1 tvg-id="PlutoTVCine.fr",Pluto TV Ciné +#EXTINF:-1 tvg-id="",Pluto TV Ciné http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ed0f17564a300082b676a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e052a64-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=aaa3f7a8-585d-4916-bff9-f90769b38333 #EXTINF:-1 tvg-id="",Pluto TV Ciné d'Asie http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f3e2d000418d00070f7dbc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06b104-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=05e57977-cc39-4403-b3e6-4865a2677ec1 -#EXTINF:-1 tvg-id="PlutoTVCineRetro.fr",Pluto TV Ciné Rétro +#EXTINF:-1 tvg-id="PlutoTVCineRetro.us@France",Pluto TV Ciné Rétro http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ed168f72fcd0007e56269/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e055170-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=16087aae-45a5-4664-9dd5-7ba7c4fa78cf #EXTINF:-1 tvg-id="",Pluto TV Ciné+ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ff5eb810e2996000768c0e2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e059f91-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=08ff6b98-d06f-4b08-acd6-c97e0886ea1f @@ -141,71 +141,71 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6447d08f2858cb0008b9957c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06ff26-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=713ee127-0f8a-4167-a669-0f01b34cc722 #EXTINF:-1 tvg-id="",Pluto TV Classic TV FR http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e46ae801f347500099d461a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e046710-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d5a0b272-dd4e-43ac-a7de-c838f640afd0 -#EXTINF:-1 tvg-id="PlutoTVComedie.fr",Pluto TV Comédie +#EXTINF:-1 tvg-id="PlutoTVComedie.us@France",Pluto TV Comédie http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8eb91bb9b9e7000817e67f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e04dc40-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7eeb5026-2fd1-4f02-8b21-df9f69932d00 -#EXTINF:-1 tvg-id="PlutoTVCuisine.fr",Pluto TV Cuisine +#EXTINF:-1 tvg-id="PlutoTVCuisine.us@France",Pluto TV Cuisine http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ed48146ba9e00078424b6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e055175-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d65e7814-007f-4b37-ac42-189f2577bbff -#EXTINF:-1 tvg-id="PlutoTVExtreme.fr",Pluto TV Extrême +#EXTINF:-1 tvg-id="PlutoTVExtreme.us@France",Pluto TV Extrême http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ed327f9e9b0000761141e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e055173-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7522642e-9d44-4966-a890-495997625c28 #EXTINF:-1 tvg-id="",Pluto TV French Collection http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f3e0522443200008c567d7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06b103-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4bbc9d99-9639-4d56-9418-ebeff0d039f1 -#EXTINF:-1 tvg-id="PlutoTVHistoire.fr",Pluto TV Histoire +#EXTINF:-1 tvg-id="PlutoTVHistoire.us@France",Pluto TV Histoire http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/611e771e2f5f180007002224/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e063bd3-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a7663e8d-062c-4293-9b93-a2bd07b5cb20 -#EXTINF:-1 tvg-id="PlutoTVInside.fr",Pluto TV Inside +#EXTINF:-1 tvg-id="PlutoTVInside.us@France",Pluto TV Inside http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ed3892ed7bb000741a1d2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e055174-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=487dd86d-4b70-41e0-bab7-33de0eda4283 -#EXTINF:-1 tvg-id="PlutoTVInvestigation.fr",Pluto TV Investigation +#EXTINF:-1 tvg-id="PlutoTVInvestigation.us@France",Pluto TV Investigation http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f914f4b36d67d0007a91a04/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e057885-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a6c08e34-78b6-42cf-bca2-5017c1566c3c -#EXTINF:-1 tvg-id="PlutoTVJunior.fr",Pluto TV Junior +#EXTINF:-1 tvg-id="PlutoTVJunior.us@France",Pluto TV Junior http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ecb336537e8000764a17f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e04dc43-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=39cb1f02-1907-4cc7-8224-1bd6adfb09bc -#EXTINF:-1 tvg-id="",Pluto TV K-Pop +#EXTINF:-1 tvg-id="PlutoTVKPop.us@France",Pluto TV K-Pop http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60c8b57beef158000787ac19/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0614c3-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ce63d982-1282-42b7-a025-1ac79fadce36 -#EXTINF:-1 tvg-id="PlutoTVKidsAnimation.fr",Pluto TV Kids Animation +#EXTINF:-1 tvg-id="PlutoTVKidsAnimation.us@France",Pluto TV Kids Animation http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8eba14a4ffb8000764e950/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e04dc42-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1894d5d0-76ab-4321-9f74-30abda806f6e #EXTINF:-1 tvg-id="",Pluto TV Kids Classics http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/654a58dbf9cc82000868f0fb/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e072639-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f64d55f0-5a5d-460e-9d8f-a12bb3309360 -#EXTINF:-1 tvg-id="PlutoTVKidsGaming.fr",Pluto TV Kids Gaming +#EXTINF:-1 tvg-id="PlutoTVKidsGaming.us@France",Pluto TV Kids Gaming http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/611e6ddc7fcd580007d1eb5f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0614c9-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e5e05ce9-206e-4e18-bc1a-aeaae6cc75d3 -#EXTINF:-1 tvg-id="PlutoTVKidsSeries.fr",Pluto TV Kids Séries +#EXTINF:-1 tvg-id="PlutoTVKidsSeries.us@France",Pluto TV Kids Séries http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8eb99ff17815000784a3b0/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e04dc41-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1b78d402-2a11-47c6-a674-a4b8f5098e41 #EXTINF:-1 tvg-id="",Pluto TV Kids Ukraine http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6228b86dbb834e0007b75019/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0689f2-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=adf4d584-92af-483e-8ace-38b46a8ac014 -#EXTINF:-1 tvg-id="PlutoTVLoveSongs.fr",Pluto TV Love Songs +#EXTINF:-1 tvg-id="PlutoTVLoveSongs.us@France",Pluto TV Love Songs http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/619b80acac5329000740c022/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0662e7-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=af267621-bff5-4a9c-8852-07f7c4aef3de -#EXTINF:-1 tvg-id="PlutoTVMotor.fr",Pluto TV Motor +#EXTINF:-1 tvg-id="PlutoTVMotor.us@France",Pluto TV Motor http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/618d4ea306d23b0007356080/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0662e3-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1d7e5e82-392b-4e7e-84f2-2f5ce35e088d -#EXTINF:-1 tvg-id="PlutoTVParanormal.fr",Pluto TV Paranormal +#EXTINF:-1 tvg-id="PlutoTVParanormal.us@France",Pluto TV Paranormal http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ed9461b35690007a0bc3a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e057882-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=71e28713-4d07-4b50-8bdf-ede6b2fac167 -#EXTINF:-1 tvg-id="PlutoTVPolar.fr",Pluto TV Polar +#EXTINF:-1 tvg-id="PlutoTVPolar.us@France",Pluto TV Polar http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ed4dbf6bb0800071ffbcb/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e055176-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=13a0cdb7-ad38-4359-a137-634d80c1b23b #EXTINF:-1 tvg-id="",Pluto TV Polar+ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ffebbeabd18520007b37709/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e059f94-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8c0239cc-0d96-4499-b1e3-83502189015d #EXTINF:-1 tvg-id="",Pluto TV Rap http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65d4be214e01740008991d3b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e074d46-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7259af3a-5d9c-4d37-ba1b-3afdd9ec3b10 -#EXTINF:-1 tvg-id="",Pluto TV Reality +#EXTINF:-1 tvg-id="PlutoTVReality.us@France",Pluto TV Reality http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6092544e7639460007d4835e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e05edb1-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=97ed3328-d359-49d3-914f-a68568384f64 -#EXTINF:-1 tvg-id="PlutoTVRetroToons.fr",Pluto TV Retro Toons +#EXTINF:-1 tvg-id="PlutoTVRetroToons.us@France",Pluto TV Retro Toons http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/611e6a9b4bb5790007a6f0f8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0614c8-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e3784c13-5aeb-4c18-bd31-9334376945c6 -#EXTINF:-1 tvg-id="PlutoTVRomance.fr",Pluto TV Romance +#EXTINF:-1 tvg-id="PlutoTVRomance.us@France",Pluto TV Romance http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60812fc8539963000707d1e1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e05c6a4-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d84357a9-e5ec-4c91-a037-9a426fa2cdff -#EXTINF:-1 tvg-id="PlutoTVSciFi.fr",Pluto TV Sci-Fi +#EXTINF:-1 tvg-id="PlutoTVSciFi.us@France",Pluto TV Sci-Fi http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60c34592c911890007f29a73/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0614c1-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6b2680c6-291b-492d-a7cf-589b55d330d2 -#EXTINF:-1 tvg-id="PlutoTVSeries.fr",Pluto TV Series +#EXTINF:-1 tvg-id="PlutoTVSeries.us@France",Pluto TV Series http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ed2d1c34c2300073bf02c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e055172-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4bf0c406-dfcb-4037-8de6-bd12c393c6a5 #EXTINF:-1 tvg-id="",Pluto TV Séries Fantastiques http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/625ec7a1c853fd00073b38fd/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0689f7-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=73335f0a-bb15-4a60-b2d2-8eaac6dadf6f -#EXTINF:-1 tvg-id="PlutoTVSports.fr",Pluto TV Sports +#EXTINF:-1 tvg-id="PlutoTVSports.us@France",Pluto TV Sports http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6081310e48d3200007afaf3b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e05c6a5-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=aa2cd1f8-5f20-441d-97cb-63e4c1c5e4f6 -#EXTINF:-1 tvg-id="PlutoTVStarTrek.fr",Pluto TV Star Trek +#EXTINF:-1 tvg-id="PlutoTVStarTrek.us@France",Pluto TV Star Trek http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/61f93af0b253440007c54ad8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0689f0-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=84850a7e-c30d-4988-863c-25f2007665d9 #EXTINF:-1 tvg-id="",Pluto TV Super Kids http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/652557d93fd33c000802f995/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e072636-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3cdbfc7d-6e82-40c4-be54-7974658b4cc2 -#EXTINF:-1 tvg-id="",Pluto TV TEEN SERIES +#EXTINF:-1 tvg-id="PlutoTVTeenSeries.us@France",Pluto TV TEEN SERIES http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8eb7e3d2ed18000746d09a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e04b531-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=af7e8ed7-6977-4fd3-ad9f-89d89e958736 -#EXTINF:-1 tvg-id="PlutoTVTelenovela.fr",Pluto TV Telenovela +#EXTINF:-1 tvg-id="PlutoTVTelenovela.us@France",Pluto TV Telenovela http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f914f9dccb4de0007df8bc4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e057886-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d7eaddd1-d723-4144-822d-b65de1267e5e -#EXTINF:-1 tvg-id="PlutoTVThrillers.fr",Pluto TV Thrillers +#EXTINF:-1 tvg-id="PlutoTVThrillers.us@France",Pluto TV Thrillers http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60c3472a51a2050008dad272/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0614c2-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b27ed94e-1347-4dd0-af99-b2e901fd5e71 -#EXTINF:-1 tvg-id="",Pluto TV Western +#EXTINF:-1 tvg-id="PlutoTVWesterns.us@France",Pluto TV Western http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65cca3e2ec452d0008af3a65/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e074d44-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=bae761e4-0e1a-4102-8f5e-fa657934946c #EXTINF:-1 tvg-id="",Qui veut gagner des millions? http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/652d0b9ceb72580008a4ea5b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e072638-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=aa2f770a-beb0-4b2b-a263-f675cf594993 @@ -217,23 +217,23 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64ff1ce298020f000849ff20/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e072634-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=65a59c6b-2c76-49f3-97a2-43e9a41020c6 #EXTINF:-1 tvg-id="",Rotana M+ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64c926b44e3f020008e19112/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e072632-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=480862f0-a3b1-4a41-ace7-43c6c645f118 -#EXTINF:-1 tvg-id="Sabrinalaserieanimee.fr",Sabrina la série animée +#EXTINF:-1 tvg-id="Sabrinalaserieanimee.us@France",Sabrina la série animée http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/611e78c4954f250007ef7b84/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e063bd5-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d91f8235-755b-4e9c-8062-05d444de314d -#EXTINF:-1 tvg-id="SouthPark.fr",South Park +#EXTINF:-1 tvg-id="SouthPark.us@France",South Park http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/618e34ac4a270700077b1f32/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0662e4-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0d7bbd81-5b0c-45a3-b97c-c2ac8161fb85 #EXTINF:-1 tvg-id="",South Park Armageddon http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65ccd2173ef47d000863a72e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e074d45-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0be489df-0535-4784-92a8-e44498d16455 -#EXTINF:-1 tvg-id="",Teen Mom +#EXTINF:-1 tvg-id="TeenMom.us@SD",Teen Mom http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f3f05505e621000783df2f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06d811-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ed84458b-d963-4758-88f3-5745e78c08a4 #EXTINF:-1 tvg-id="",Têtu TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/615c4bdfdd585f000732a22b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0662e1-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=374c4c09-bb54-4981-878c-03c02e87b86a -#EXTINF:-1 tvg-id="TheAsylum.fr",The Asylum +#EXTINF:-1 tvg-id="TheAsylum.us@France",The Asylum http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ece1a89d79800072510e6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e052a62-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1739a4c5-d7e2-41f4-aa40-91bb650267c5 -#EXTINF:-1 tvg-id="ThePetCollective.fr",The Pet Collective +#EXTINF:-1 tvg-id="ThePetCollective.us@France",The Pet Collective http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ecd336d64c9000754cdf1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e052a60-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6ad13452-4038-4ee5-9d1d-60ffd7bdf4ed -#EXTINF:-1 tvg-id="",Top Gear +#EXTINF:-1 tvg-id="TopGear.uk@SD",Top Gear http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64c1093824ade50008bd117f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06ff29-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c899871e-cbc2-427a-96ca-5b12be666bec -#EXTINF:-1 tvg-id="TortuesNinjaTV.fr",Tortues Ninja TV +#EXTINF:-1 tvg-id="TortuesNinjaTV.us@France",Tortues Ninja TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ecc1b37867f00071469e9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e050351-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8626ec32-5f10-4aef-bfdb-f5495f6d4ff1 #EXTINF:-1 tvg-id="",Toute une histoire http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f3e6aebcdda4000754fa47/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06b106-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=944d6772-86fc-4c0e-8d05-e958415ee0be @@ -243,11 +243,11 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f3ece7b09fd6000783bfb9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06d810-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d4806e73-8205-4c2d-96f4-b4107c552c9a #EXTINF:-1 tvg-id="",Un Village Français http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6304f2e2eb10450007298023/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06d814-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d68b6dc2-69b4-4a6c-9775-d8cca16bea85 -#EXTINF:-1 tvg-id="",Unbeaten Sports +#EXTINF:-1 tvg-id="UnbeatenEsports.us@France",Unbeaten Sports http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64c3b0bf0e086a0009e8a60d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e072630-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1d441167-0fab-494c-981d-be5d461f5181 -#EXTINF:-1 tvg-id="",Victorious +#EXTINF:-1 tvg-id="Victorious.us@France",Victorious http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64bab8830e086a0009d44273/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06ff27-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d562924d-7b50-4dfa-bcf9-0cb983d72a29 -#EXTINF:-1 tvg-id="WalkerTexasRanger.fr",Walker Texas Ranger +#EXTINF:-1 tvg-id="WalkerTexasRanger.us@France",Walker Texas Ranger http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60afa749ac7f3200078adb40/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e05edb4-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=53334da2-2bf6-4492-9d72-20248eaff31c #EXTINF:-1 tvg-id="",Wellbeing TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f21f7e0f61420008273b9e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e06b101-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7c44e8c0-697e-4427-8e61-0aaafe70cf08 @@ -255,7 +255,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60b4d6c806ad2a00073b3108/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0614c0-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d329ef28-8c5a-4451-bc8a-ab7d7083f320 #EXTINF:-1 tvg-id="",WPT http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8ecfb9db6c180007a6d1b0/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e052a63-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6b59a91e-3da5-46c2-b495-c383ef6eaa90 -#EXTINF:-1 tvg-id="Yaquelaveritequicompte.fr",Y'a que la vérité qui compte +#EXTINF:-1 tvg-id="Yaquelaveritequicompte.us@France",Y'a que la vérité qui compte http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/612e044c970e6f00083bcf3b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e063bd6-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2371cf64-2e91-492c-9f0c-c88a7f973944 -#EXTINF:-1 tvg-id="",Yu-Gi-Oh! +#EXTINF:-1 tvg-id="YuGiOh.us@SD",Yu-Gi-Oh! http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6130d9c712c2b000070abb50/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e063bd7-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9dfe906b-1b35-424b-b7f0-ed75c3050f92 diff --git a/streams/fr_rakuten.m3u b/streams/fr_rakuten.m3u index 7d30b9084d..e4951ff0bc 100644 --- a/streams/fr_rakuten.m3u +++ b/streams/fr_rakuten.m3u @@ -15,7 +15,7 @@ https://amg01796-amg01796c6-rakuten-fr-5334.playouts.now.amagi.tv/playlist/amg01 https://bloomberg-bloombergtv-6-eu.rakuten.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",Bref Cinéma 100% Court Métrage https://lagenceducourtmetrage-brefcinema-01-eu.rakuten.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",CGTN Français +#EXTINF:-1 tvg-id="CGTNFrench.cn@SD",CGTN Français https://amg01314-cgtn-amg01314c2-rakuten-us-1319.playouts.now.amagi.tv/cgtn-fr-rakuten/playlist.m3u8 #EXTINF:-1 tvg-id="",Echappées Belles https://rakutenaa-botravail-echappeesbelles-rakuten-ccn98.amagi.tv/playlist/rakutenAA-botravail-echappeesbelles-rakuten/playlist.m3u8 @@ -79,21 +79,21 @@ https://amg01492-secomsasmediart-myzen-fr-rakuten-spvgz.amagi.tv/hls/amagi_hls_d https://amg01076-lightning-amg01076c5-rakuten-us-1788.playouts.now.amagi.tv/playlist/amg01076-lightning-newsworld-rakutenus/playlist.m3u8 #EXTINF:-1 tvg-id="",Passion Bollywood https://fast-rakuten.okast.tv/fa2e8c4385712f9a9a653242c406e725/channels/2888294c-5918-42f6-a2bd-91d49b26634c/03bc9e11-13bd-4a07-ba09-0586d910741d/PassionBollywood_FR.m3u8 -#EXTINF:-1 tvg-id="",Passion Novelas +#EXTINF:-1 tvg-id="PassionNovelas.ci@SD",Passion Novelas https://fast-rakuten.okast.tv/fa2e8c4385712f9afaf32f805a288b31/channels/2888294c-5918-42f6-a2bd-91d49b26634c/1c6724fa-d5f7-493a-aadb-ee4bd0fee7a8/index.m3u8 #EXTINF:-1 tvg-id="",Qui Veut Gagner Des Millions La Chaîne https://amg02393-awpg-amg02393c1-rakuten-uk-2461.playouts.now.amagi.tv/playlist/amg02393-awpg-quiveutgagnerdesmillions-rakutenuk/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVSpotlight.fr",Rakuten Spotlight France (720p) +#EXTINF:-1 tvg-id="RakutenTVSpotlight.es@France",Rakuten Spotlight France (720p) https://rakuten-spotlight-7-eu.rakuten.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVSpotlight.fr",Rakuten Spotlight France (720p) +#EXTINF:-1 tvg-id="RakutenTVSpotlight.es@France",Rakuten Spotlight France (720p) https://rakuten-spotlight-7-fr.plex.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",Rakuten TV Alerte Cobra https://rakuten-alertecobra-7-fr.rakuten.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",Rakuten TV BBC Drama (720p) https://amg00793-amg00793c42-rakuten-fr-5446.playouts.now.amagi.tv/playlist/amg00793-bbcstudios-bbcdramafrance-rakutenfr/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVActionMovies.fr",Rakuten TV Films Action (720p) +#EXTINF:-1 tvg-id="",Rakuten TV Films Action (720p) https://01ac9352fbfa4204998783d41f9b1a2e.mediatailor.eu-west-1.amazonaws.com/v1/master/0547f18649bd788bec7b67b746e47670f558b6b2/production-LiveChannel-6068/master.m3u8 -#EXTINF:-1 tvg-id="RakutenTVComedyMovies.fr",Rakuten TV Films Comédie (720p) +#EXTINF:-1 tvg-id="",Rakuten TV Films Comédie (720p) https://cc9f70371e7144e7acae4de8b5832d7a.mediatailor.eu-west-1.amazonaws.com/v1/master/0547f18649bd788bec7b67b746e47670f558b6b2/production-LiveChannel-6183/master.m3u8 #EXTINF:-1 tvg-id="",Rakuten TV Films Drames (720p) https://f396f4db84a54f7bb496b2541477b626.mediatailor.eu-west-1.amazonaws.com/v1/master/0547f18649bd788bec7b67b746e47670f558b6b2/production-LiveChannel-6095/master.m3u8 @@ -113,13 +113,13 @@ https://alchimie-ateliersdeschefs-rakuten.amagi.tv/playlist.m3u8 https://1ffd245e4d30495e9b006502a155479e.mediatailor.eu-west-1.amazonaws.com/v1/master/0547f18649bd788bec7b67b746e47670f558b6b2/production-LiveChannel-6214/master.m3u8 #EXTINF:-1 tvg-id="",Rakuten TV The Guardian (720p) https://the-guardian-3d0e32e7-aa40-49e5-b9d9-c433151fa61a-fr.fast.rakuten.tv/v1/master/0547f18649bd788bec7b67b746e47670f558b6b2/production-LiveChannel-6437/master.m3u8 -#EXTINF:-1 tvg-id="RakutenTVTopMovies.fr",Rakuten TV Top Films (720p) +#EXTINF:-1 tvg-id="",Rakuten TV Top Films (720p) https://93ed06eba1ef4cf783b66dc6ea7c4f28.mediatailor.eu-west-1.amazonaws.com/v1/master/0547f18649bd788bec7b67b746e47670f558b6b2/production-LiveChannel-5986/master.m3u8 #EXTINF:-1 tvg-id="",Rakuten TV Trailers (720p) https://a01cb16df2c946afa72d661622953cad.mediatailor.eu-west-1.amazonaws.com/v1/master/0547f18649bd788bec7b67b746e47670f558b6b2/production-LiveChannel-4546/master.m3u8 #EXTINF:-1 tvg-id="",Rakuten TV Viki Europe (720p) https://newidco-rakutenviki-2-eu.rakuten.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Reuters +#EXTINF:-1 tvg-id="ReutersTV.us@SD",Reuters https://amg00453-reuters-amg00453c1-rakuten-uk-2110.playouts.now.amagi.tv/playlist/amg00453-reuters-reuters-rakutenuk/playlist.m3u8 #EXTINF:-1 tvg-id="",Revry Europe (Frequency backend) https://03e7e5beea1d42fea576037d67f531eb.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/RakutenTV-eu_Revry/playlist.m3u8 @@ -131,7 +131,7 @@ https://televisa-telenovelas-3-eu.rakuten.wurl.tv/playlist.m3u8 https://amg01259-lemeilleurducin-universcine-rakuten-bifrz.amagi.tv/hls/amagi_hls_data_rakutenAA-universcine-rakuten/CDN/master.m3u8 #EXTINF:-1 tvg-id="",Vevo Hip-Hop et RnB https://amg00056-amg00056c14-rakuten-fr-3244.playouts.now.amagi.tv/playlist/amg00056-vevotvfast-vevohiphopandrbfr-rakutenfr/playlist.m3u8 -#EXTINF:-1 tvg-id="",Vevo Pop +#EXTINF:-1 tvg-id="VevoPop.us@SD",Vevo Pop https://amg00056-amg00056c9-rakuten-fr-3243.playouts.now.amagi.tv/playlist/amg00056-vevotvfast-vevopopfr-rakutenfr/playlist.m3u8 #EXTINF:-1 tvg-id="",Vogue Europe https://d39g1vxj2ef6in.cloudfront.net/v1/master/3fec3e5cac39a52b2132f9c66c83dae043dc17d4/prod-rakuten-stitched/master.m3u8?ads.xumo_channelId=88883060 diff --git a/streams/fr_samsung.m3u b/streams/fr_samsung.m3u index 5b42400566..8041b97b59 100644 --- a/streams/fr_samsung.m3u +++ b/streams/fr_samsung.m3u @@ -1,9 +1,9 @@ #EXTM3U #EXTINF:-1 tvg-id="",BBC Doctor Who https://bbceu-doctorwho-3-fr.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="BBCDrama.fr",BBC Drama +#EXTINF:-1 tvg-id="BBCDrama.uk@France",BBC Drama https://bbceu-bbcdrama-1-fr.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="BloombergTVPlus.us",Bloomberg TV+ UHD (2160p) +#EXTINF:-1 tvg-id="",Bloomberg TV+ UHD (2160p) https://bloomberg-bloombergtv-1-fr.samsung.wurl.tv/manifest/playlist.m3u8 #EXTINF:-1 tvg-id="Caillou.fr",Caillou https://dhx-caillou-2-fr.samsung.wurl.tv/playlist.m3u8 @@ -13,13 +13,13 @@ https://euronews-euronews-french-3-us.plex.wurl.tv/playlist.m3u8 https://rakuten-euronews-2-fr.samsung.wurl.tv/manifest/playlist.m3u8 #EXTINF:-1 tvg-id="",Mytime Movies (1080p) https://mytimefrance-rakuten-samsung.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVActionMovies.fr",Rakuten Action Movies (720p) +#EXTINF:-1 tvg-id="RakutenTVActionMovies.es@France",Rakuten Action Movies (720p) https://rakuten-actionmovies-7-fr.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVComedyMovies.fr",Rakuten Comedy Movies (720p) +#EXTINF:-1 tvg-id="RakutenTVComedyMovies.es@France",Rakuten Comedy Movies (720p) https://rakuten-comedymovies-7-fr.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVFamilyMovies.fr",Rakuten Family (720p) +#EXTINF:-1 tvg-id="RakutenTVFamilyMovies.es@France",Rakuten Family (720p) https://rakuten-family-7-fr.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVSpotlight.fr",Rakuten Spotlight (720p) +#EXTINF:-1 tvg-id="RakutenTVSpotlight.es@France",Rakuten Spotlight (720p) https://rakuten-spotlight-7-fr.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",Rakuten TV Shows (720p) https://rakuten-tvshows-7-fr.samsung.wurl.tv/playlist.m3u8 diff --git a/streams/gr.m3u b/streams/gr.m3u index dcc6444bba..9d5c900c39 100644 --- a/streams/gr.m3u +++ b/streams/gr.m3u @@ -59,7 +59,7 @@ http://live.streams.ovh:1935/cannali/cannali/playlist.m3u8 https://raw.githubusercontent.com/azgaresncf/strm2hls/main/streams/centertv.m3u8 #EXTINF:-1 tvg-id="Choice.gr",Choice (1080p) [Not 24/7] https://vod.streams.ovh:3528/stream/play.m3u8 -#EXTINF:-1 tvg-id="",Corfu TV (576p) [Not 24/7] +#EXTINF:-1 tvg-id="CorfuChannel.gr@SD",Corfu TV (576p) [Not 24/7] https://itv.streams.ovh/corfuchannel/corfuchannel/playlist.m3u8 #EXTINF:-1 tvg-id="TVCreta.gr",Creta (540p) [Not 24/7] http://live.streams.ovh:1935/tvcreta/tvcreta/playlist.m3u8 @@ -121,13 +121,13 @@ https://ssh101.bozztv.com/ssh101/galaxygr/playlist.m3u8 https://live.streams.ovh:8081/gnomitv/index.m3u8 #EXTINF:-1 tvg-id="GnomiTV.gr",Gnomi TV (720p) https://channel.streams.ovh:1936/gnomitv/gnomitv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Greek TV London (720p) [Not 24/7] +#EXTINF:-1 tvg-id="GreekTVLondon.uk@SD",Greek TV London (720p) [Not 24/7] https://vdo3.alphaserver.gr:3466/live/greektvlondonlive.m3u8 -#EXTINF:-1 tvg-id="",Greek TV London (720p) [Not 24/7] +#EXTINF:-1 tvg-id="GreekTVLondon.uk@SD",Greek TV London (720p) [Not 24/7] https://vdo3.alphaserver.gr:3466/stream/play.m3u8 #EXTINF:-1 tvg-id="GroovyTV.gr",Groovy TV (360p) http://web.onair-radio.eu:1935/groovytv/groovytv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Hellenic TV (720p) [Not 24/7] +#EXTINF:-1 tvg-id="HellenicTV.uk@SD",Hellenic TV (720p) [Not 24/7] https://l5.cloudskep.com/hellenictv/htv/playlist.m3u8 #EXTINF:-1 tvg-id="HighTV.gr",High TV (720p) [Not 24/7] http://live.streams.ovh:1935/hightv/hightv/playlist.m3u8 @@ -138,17 +138,17 @@ https://raw.githubusercontent.com/iptvnikolas/Nikki-TVM3U8/main/ioanninatv.m3u8 http://stream.ioniantv.gr:8081/ionian/live/playlist.m3u8 #EXTINF:-1 tvg-id="IonianTV.gr",Ionian Channel (720p) [Not 24/7] https://stream.ioniantv.gr/ionian/live_abr/playlist.m3u8 -#EXTINF:-1 tvg-id="IridaTV.gr",Irida TV -https://www.hellasnet.tv/rest2.live.hn/w2r.iri/playlist.m3u8 #EXTINF:-1 tvg-id="IridaTV.gr",Irida TV (226p) [Not 24/7] https://www.hellasnet.tv/rest.live.hn/w2r.iri/playlist.m3u8 +#EXTINF:-1 tvg-id="IridaTV.gr",Irida TV +https://www.hellasnet.tv/rest2.live.hn/w2r.iri/playlist.m3u8 #EXTINF:-1 tvg-id="KontraChannel.gr",Kontra Channel (1080p) https://kontralive.siliconweb.com/live/kontratv/playlist.m3u8 #EXTINF:-1 tvg-id="LepantoTV.gr",Lepanto TV (1080p) [Not 24/7] https://raw.githubusercontent.com/azgaresncf/strm2hls/main/streams/LePanto.m3u8 #EXTINF:-1 tvg-id="LychnosTV.gr",Lychnos TV (1080p) https://thor.mental-media.gr:19360/imp/imp.m3u8 -#EXTINF:-1 tvg-id="",MAD Greekz (360p) +#EXTINF:-1 tvg-id="MadGreekz.gr@SD",MAD Greekz (360p) http://live.streams.ovh:1935/foxtv/foxtv/playlist.m3u8 #EXTINF:-1 tvg-id="MadWorld.gr",Mad World (720p) https://ellastvmax.better-than.tv/freetv/madworldtv/index.m3u8 @@ -196,10 +196,10 @@ https://video.streams.ovh:1936/pellatv/pellatv/master.m3u8 https://svs.itworkscdn.net/pemptousialive/pemptousia.smil/playlist.m3u8 #EXTINF:-1 tvg-id="PlayTV.gr",Play TV (480p) [Not 24/7] http://web.onair-radio.eu:1935/Alpha-Host/Alpha-Host/playlist.m3u8 -#EXTINF:-1 tvg-id="PLP.gr",PLP -https://www.hellasnet.tv/rest2.live.hn/w2r.plp/playlist.m3u8 #EXTINF:-1 tvg-id="PLP.gr",PLP (226p) [Not 24/7] https://www.hellasnet.tv/rest.live.hn/w2r.plp/playlist.m3u8 +#EXTINF:-1 tvg-id="PLP.gr",PLP +https://www.hellasnet.tv/rest2.live.hn/w2r.plp/playlist.m3u8 #EXTINF:-1 tvg-id="PrimeNewsTV.gr",Prime News TV (720p) https://vdo.alphaserver.gr:3411/stream/play.m3u8 #EXTINF:-1 tvg-id="RealMusicTV.gr",Real Music TV (720p) diff --git a/streams/hk.m3u b/streams/hk.m3u index 67e29eaba5..c760ebbfdc 100644 --- a/streams/hk.m3u +++ b/streams/hk.m3u @@ -1,16 +1,16 @@ #EXTM3U -#EXTINF:-1 tvg-id="BloombergTVAsia.hk",Bloomberg TV Asia (720p) +#EXTINF:-1 tvg-id="BloombergTV.us@Asia",Bloomberg TV Asia (720p) https://bloomberg.com/media-manifest/streams/asia.m3u8 -#EXTINF:-1 tvg-id="BloombergTVAsiaLiveEvent.hk",Bloomberg TV Asia Live Event (720p) +#EXTINF:-1 tvg-id="BloombergTV.us@AsiaLiveEvent",Bloomberg TV Asia Live Event (720p) https://bloomberg.com/media-manifest/streams/asia-event.m3u8 #EXTINF:-1 tvg-id="CreationTV.hk",Creation TV (720p) https://cdn.deepcore.online/hlsme/ctv_hk.m3u8 #EXTINF:-1 tvg-id="",HOY Infotainment (1080p) [Geo-blocked] https://hoytv-live-stream.hoy.tv/ch78/index-fhd.m3u8 -#EXTINF:-1 tvg-id="HKIBC.hk",HOY International Business Channel [Geo-blocked] -https://hoytv-live-stream.hoy.tv/ch76/va2-index.m3u8 #EXTINF:-1 tvg-id="HKIBC.hk",HOY International Business Channel (1080p) [Geo-blocked] https://hoytv-live-stream.hoy.tv/ch76/index-fhd.m3u8 +#EXTINF:-1 tvg-id="HKIBC.hk",HOY International Business Channel [Geo-blocked] +https://hoytv-live-stream.hoy.tv/ch76/va2-index.m3u8 #EXTINF:-1 tvg-id="HOYTV.hk",HOY TV (1080p) [Geo-blocked] https://hoytv-live-stream.hoy.tv/ch77/index-fhd.m3u8 #EXTINF:-1 tvg-id="RTHKTV31.hk",RTHK TV 31 (港台電視31) (1080p) [Geo-blocked] diff --git a/streams/in.m3u b/streams/in.m3u index b1d1820046..53470813a8 100644 --- a/streams/in.m3u +++ b/streams/in.m3u @@ -9,12 +9,12 @@ https://amg01281-9xmediapvtltd-9xtashan-samsungin-xz1sd.amagi.tv/playlist/amg012 https://d35j504z0x2vu2.cloudfront.net/v1/manifest/0bc8e8376bd8417a1b6761138aa41c26c7309312/9xm/23886666-8fc5-470f-aab1-bd637ed607b1/3.m3u8 #EXTINF:-1 tvg-id="A1TVRajasthan.in",A1 TV Rajasthan (720p) https://5b48d7e1b4bce.streamlock.net/myapp/a1live/playlist.m3u8 -#EXTINF:-1 tvg-id="AajTak.in",Aaj Tak -https://feeds.intoday.in/aajtak/api/aajtakhd/master.m3u8 #EXTINF:-1 tvg-id="AajTak.in",Aaj Tak (404p) https://aajtaklive-amd.akamaized.net/hls/live/2014416/aajtak/aajtaklive/live_404p/chunks.m3u8 #EXTINF:-1 tvg-id="AajTak.in",Aaj Tak (360p) [Geo-blocked] https://lmil.live-s.cdn.bitgravity.com/cdn-live/_definst_/lmil/live/aajtak_app.smil/playlist.m3u8 +#EXTINF:-1 tvg-id="AajTak.in",Aaj Tak +https://feeds.intoday.in/aajtak/api/aajtakhd/master.m3u8 #EXTINF:-1 tvg-id="Aastha.in",Aastha (480p) https://aasthaott.akamaized.net/110923/smil:aasthatv.smil/chunklist_b1328000.m3u8 #EXTINF:-1 tvg-id="AasthaBhajan.in" http-referrer="Aasthatv.in",Aastha Bhajan (480p) @@ -40,25 +40,25 @@ http://akaram.zecast.net/akaram-live/akaramkidz/index.m3u8 https://d39iawgzv3h0yo.cloudfront.net/out/v1/1ef4344a3b4a41908915d58ac7bd5e23/index.m3u8 #EXTINF:-1 tvg-id="AmritaTV.in",Amrita TV (720p) https://dr1zhpsuem5f4.cloudfront.net/master.m3u8 -#EXTINF:-1 tvg-id="AngelTVAfrica.in",Angel TV Africa (720p) +#EXTINF:-1 tvg-id="AngelTV.in@Africa",Angel TV Africa (720p) https://cdn3.wowza.com/5/TDJ0aWNkNXFxWWta/angeltvcloud/ngrp:angelafrica_all/playlist.m3u8 -#EXTINF:-1 tvg-id="AngelTVAmerica.in",Angel TV America (720p) +#EXTINF:-1 tvg-id="AngelTV.in@America",Angel TV America (720p) https://cdn3.wowza.com/5/TDJ0aWNkNXFxWWta/angeltvcloud/ngrp:angelamerica_all/playlist.m3u8 -#EXTINF:-1 tvg-id="AngelTVArabia.in",Angel TV Arabia (720p) +#EXTINF:-1 tvg-id="AngelTV.in@Arabia",Angel TV Arabia (720p) https://cdn3.wowza.com/5/TDJ0aWNkNXFxWWta/angeltvcloud/ngrp:angelarabia_all/playlist.m3u8 -#EXTINF:-1 tvg-id="AngelTVAustralia.in",Angel TV Australia (720p) +#EXTINF:-1 tvg-id="AngelTV.in@Australia",Angel TV Australia (720p) https://cdn3.wowza.com/5/TDJ0aWNkNXFxWWta/angeltvcloud/ngrp:angelaustralia_all/playlist.m3u8 -#EXTINF:-1 tvg-id="AngelTVChinese.in",Angel TV Chinese (720p) +#EXTINF:-1 tvg-id="AngelTV.in@Chinese",Angel TV Chinese (720p) https://cdn3.wowza.com/5/TDJ0aWNkNXFxWWta/angeltvcloud/ngrp:angelchinese_all/playlist.m3u8 -#EXTINF:-1 tvg-id="AngelTVFarEast.in",Angel TV Far East (720p) +#EXTINF:-1 tvg-id="AngelTV.in@FarEast",Angel TV Far East (720p) https://cdn3.wowza.com/5/TDJ0aWNkNXFxWWta/angeltvcloud/ngrp:angelfareast_all/playlist.m3u8 -#EXTINF:-1 tvg-id="AngelTVHebrew.in",Angel TV Hebrew (720p) +#EXTINF:-1 tvg-id="AngelTV.in@Hebrew",Angel TV Hebrew (720p) https://cdn3.wowza.com/5/TDJ0aWNkNXFxWWta/angeltvcloud/ngrp:angelhebrew_all/playlist.m3u8 -#EXTINF:-1 tvg-id="AngelTVIndia.in",Angel TV India (720p) +#EXTINF:-1 tvg-id="AngelTV.in@India",Angel TV India (720p) https://cdn3.wowza.com/5/TDJ0aWNkNXFxWWta/angeltvcloud/ngrp:angelindia_all/playlist.m3u8 -#EXTINF:-1 tvg-id="AngelTVPortuguese.in",Angel TV Portuguese (720p) +#EXTINF:-1 tvg-id="AngelTV.in@Portuguese",Angel TV Portuguese (720p) https://cdn3.wowza.com/5/TDJ0aWNkNXFxWWta/angeltvcloud/ngrp:angelportuguese_all/playlist.m3u8 -#EXTINF:-1 tvg-id="AngelTVSpanish.in",Angel TV Spanish (720p) +#EXTINF:-1 tvg-id="AngelTV.in@Spanish",Angel TV Spanish (720p) https://cdn3.wowza.com/5/TDJ0aWNkNXFxWWta/angeltvcloud/ngrp:angelspanish_all/playlist.m3u8 #EXTINF:-1 tvg-id="AnjanTV.in",Anjan (1080p) [Not 24/7] https://anjantvevent.pc.cdn.bitgravity.com/anjantv/live/amlst:event_anjan_,b400,b800,b1024,b1200,b1500,b4000,.smil/playlist.m3u8 @@ -82,9 +82,9 @@ https://vidcdn.vidgyor.com/ptm-origin/aslive/playlist.m3u8 https://95eryw39dwn4-hls-live.wmncdn.net/Ayushu/271ddf829afeece44d8732757fba1a66.sdp/index.m3u8 #EXTINF:-1 tvg-id="B4UKadak.in",B4U Kadak (576p) [Not 24/7] http://103.199.160.85/Content/moviehouse/Live/Channel(MovieHouse)/index.m3u8 -#EXTINF:-1 tvg-id="B4UMoviesIndia.in",B4U Movies India (576p) +#EXTINF:-1 tvg-id="B4UMovies.in@India",B4U Movies India (576p) http://183.89.246.119:8881/play/a08n/index.m3u8 -#EXTINF:-1 tvg-id="B4UMusicIndia.in",B4U Music India (576p) +#EXTINF:-1 tvg-id="B4UMusic.in@India",B4U Music India (576p) http://183.89.246.119:8881/play/a08o/index.m3u8 #EXTINF:-1 tvg-id="B4UPlus.in",B4U Plus (576p) http://183.89.246.119:8881/play/a08l/index.m3u8 @@ -112,7 +112,7 @@ https://5a1178b42cc03.streamlock.net/8174/8174/playlist.m3u8 https://mcncdndigital.com/divyatv/index.fmp4.m3u8 #EXTINF:-1 tvg-id="ChannelWIN.in",Channel WIN (360p) https://streamer.winfoundation.in:8081/live/winstream/playlist.m3u8 -#EXTINF:-1 tvg-id="",Channel Y (720p) [Not 24/7] +#EXTINF:-1 tvg-id="ChannelY.ca@SD",Channel Y (720p) [Not 24/7] http://cdn19.live247stream.com/channely/tv/playlist.m3u8 #EXTINF:-1 tvg-id="CNBCBajar.in",CNBC Bajar (504p) [Geo-blocked] https://cnbcbazar-lh.akamaihd.net/i/cnbcbajar_1@178933/index_5_av-p.m3u8 @@ -126,6 +126,8 @@ https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91e https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/3829f99b-4951-4a9d-98c1-dbc3acfe5193/2.m3u8 #EXTINF:-1 tvg-id="DDGirnar.in",DD Girnar https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/4a7a0c8a-c58d-43d6-baff-13492d67bf3e/2.m3u8 +#EXTINF:-1 tvg-id="DDHaryana.in",DD Haryana +https://d2lk5u59tns74c.cloudfront.net/out/v1/950fc69666474351bde0a32b9600c804/index.m3u8 #EXTINF:-1 tvg-id="DDJharkhand.in",DD Jharkhand https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/2c6c5c20-6afe-47c4-934f-a0d7002cb151/2.m3u8 #EXTINF:-1 tvg-id="DDMalayalam.in",DD Malayalam @@ -146,6 +148,10 @@ https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91e https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/1324a5ee-c108-423f-ae78-c83b2fd31065/2.m3u8 #EXTINF:-1 tvg-id="DDPunjabi.in",DD Punjabi https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/20c8ad14-a158-4a42-8889-e032d070856e/2.m3u8 +#EXTINF:-1 tvg-id="DDSahyadri.in",DD Sahyadri +https://d3qs3d2rkhfqrt.cloudfront.net/out/v1/66dcc3ebe182447ba42837e746cf0c7c/index.m3u8 +#EXTINF:-1 tvg-id="DDSaptagiri.in",DD Saptagiri +https://d2lk5u59tns74c.cloudfront.net/out/v1/26e915d6d12b4a06822c5e33c088ed56/index.m3u8 #EXTINF:-1 tvg-id="DDTripura.in",DD Tripura https://d3qs3d2rkhfqrt.cloudfront.net/out/v1/52b998e9510d41c29ad2ceca8ea3d849/index_3.m3u8 #EXTINF:-1 tvg-id="DesiChannel.in",Desi Channel (720p) @@ -168,7 +174,7 @@ https://5a1178b42cc03.streamlock.net/8250/8250/playlist.m3u8 https://cdn.smartstream.video/smartstream-us/dy365/dy365/playlist.m3u8 #EXTINF:-1 tvg-id="E24.in",E 24 https://live-e24.dailyhunt.in/eternowsa/live/amlst:E24_,b256,b512,b1024,b1824,.smil/playlist.m3u8 -#EXTINF:-1 tvg-id="",Eagle One News (576p) +#EXTINF:-1 tvg-id="EagleOneNews.us@SD",Eagle One News (576p) https://5a1178b42cc03.streamlock.net/8182/8182/playlist.m3u8 #EXTINF:-1 tvg-id="EETTV.in",EET TV (1080p) [Not 24/7] https://live.streamjo.com/eetlive/eettv.m3u8 @@ -230,7 +236,7 @@ https://server.livelegitpro.in:9899/hindikhabar/hindikhabar/index.m3u8 https://videodelivery.net/98334a974d26e45759c6baa8bceabbcf/manifest/video.m3u8 #EXTINF:-1 tvg-id="HornbillTV.in",Hornbill TV (720p) http://172.104.191.216:1935/hornbilltv/hornbilltv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Hulchul TV (720p) [Not 24/7] +#EXTINF:-1 tvg-id="HulchulTVCanada.ca@SD",Hulchul TV (720p) [Not 24/7] http://cdn12.henico.net:8080/live/jbani/index.m3u8 #EXTINF:-1 tvg-id="IBC24.in",IBC 24 (720p) https://livetv.ibc24.in/livestream.m3u8 @@ -387,12 +393,12 @@ http://131.153.22.8:1935/NCV/ncvstream/playlist.m3u8 https://ndtv24x7elemarchana.akamaized.net/hls/live/2003678/ndtv24x7/master.m3u8 #EXTINF:-1 tvg-id="NDTVIndia.in",NDTV India (480p) [Not 24/7] https://ndtvindiaelemarchana.akamaized.net/hls/live/2003679/ndtvindia/master.m3u8 -#EXTINF:-1 tvg-id="NDTVProfit.in",NDTV Profit [Geo-blocked] -https://ndtv.live-s.cdn.bitgravity.com/cdn-live/_definst_/ndtv/live/ndtv_profit.smil/playlist.m3u8 #EXTINF:-1 tvg-id="NDTVProfit.in",NDTV Profit (480p) https://ndtvprofitelemarchana.akamaized.net/hls/live/2003680-b/ndtvprofit/master.m3u8 #EXTINF:-1 tvg-id="NDTVProfit.in",NDTV Profit (480p) [Not 24/7] https://ndtvprofitelemarchana.akamaized.net/hls/live/2003680/ndtvprofit/master.m3u8 +#EXTINF:-1 tvg-id="NDTVProfit.in",NDTV Profit [Geo-blocked] +https://ndtv.live-s.cdn.bitgravity.com/cdn-live/_definst_/ndtv/live/ndtv_profit.smil/playlist.m3u8 #EXTINF:-1 tvg-id="News1st.in",News 1st (1080p) [Not 24/7] https://932y4563djv8-hls-live.qezycdn.com/newsfirst/cb582cc2f3b08e0bbd1c9f3d23541e26.sdp/playlist.m3u8 #EXTINF:-1 tvg-id="News11.in",News 11 (360p) @@ -403,10 +409,10 @@ https://vidcdn.vidgyor.com/news24-origin/liveabr/playlist.m3u8 https://5b48d7e1b4bce.streamlock.net/myapp/newslive/playlist.m3u8 #EXTINF:-1 tvg-id="NewsNation.in",News Nation (720p) https://livetv-channels.b-cdn.net/8006/playlist.m3u8 -#EXTINF:-1 tvg-id="NickHDPlus.in",Nick HD+ -http://103.68.28.58:5001/live/1226.m3u8 #EXTINF:-1 tvg-id="NickHDPlus.in",Nick HD+ (1080p) https://prod-sports-north-gm.jiocinema.com/bpk-tv/Nick_HD_Plus_voot_MOB/Fallback/index.m3u8 +#EXTINF:-1 tvg-id="NickHDPlus.in",Nick HD+ +http://103.68.28.58:5001/live/1226.m3u8 #EXTINF:-1 tvg-id="NickJr.in",Nick Jr India (1080p) https://prod-sports-north-gm.jiocinema.com/bpk-tv/Nick_Junior_voot_MOB/Fallback/index.m3u8 #EXTINF:-1 tvg-id="NickelodeonSonic.in",Nickelodeon Sonic Hindi (1080p) @@ -465,6 +471,8 @@ http://103.199.160.85/Content/puthuyugam/Live/Channel(Puthuyugam)/index.m3u8 https://thelegitpro.in/pntv/rplusnews24x7/index.m3u8 #EXTINF:-1 tvg-id="RajNewsMalayalam.in",Raj News Malayalam https://rajnewsmalayalam.ylivestream.com/rajnewsmalayalam/index.m3u8 +#EXTINF:-1 tvg-id="RajTV.in",Raj TV +https://d3qs3d2rkhfqrt.cloudfront.net/out/v1/2839e3d1e0f84a2e821c1708d5fdfdf0/index.m3u8 #EXTINF:-1 tvg-id="RDXGoa.in",RDX Goa (720p) https://g5nl6xoalpq6-hls-live.5centscdn.com/rdxgoa/d0dbe915091d400bd8ee7f27f0791303.sdp/playlist.m3u8 #EXTINF:-1 tvg-id="RealNewsKerala.in",Real News Kerala (1080p) [Not 24/7] @@ -513,6 +521,8 @@ https://d1ji7e9jbzm5g8.cloudfront.net/out/v1/769f22f64d80442889306b9c4abea63c/in https://api.new.livestream.com/accounts/25038049/events/7483919/live.m3u8 #EXTINF:-1 tvg-id="ShemarooMarathiBana.in",Shemaroo Marathi Bana (720p) https://livetv-channels.b-cdn.net/8042/chunklist0.m3u8 +#EXTINF:-1 tvg-id="ShowBox.in",ShowBox +https://epiconvh.akamaized.net/live/showbox/master.m3u8 #EXTINF:-1 tvg-id="ShubhTV.in",Shubh TV (1080p) https://d2g1vdc6ozl2o8.cloudfront.net/out/v1/0a0dc7d7911b4fddbb4dfc963fdd4b9e/index.m3u8 #EXTINF:-1 tvg-id="Shubhsandesh.in",Shubhsandesh (720p) [Not 24/7] @@ -561,10 +571,10 @@ https://249553662f3e.ap-south-1.playback.live-video.net/api/video/v1/ap-south-1. https://segment.yuppcdn.net/110322/thanthi/110322/thanthi_1800/playlist.m3u8 #EXTINF:-1 tvg-id="TimeVisionNews.in",Time Vision News (720p) http://rtmp.logichost.in:1935/timevision/timevision/playlist.m3u8 -#EXTINF:-1 tvg-id="TimesNow.in",Times Now [Geo-blocked] -https://pubads.g.doubleclick.net/ssai/event/1mR1QUQ3Tg-VuKfiyjwNuA/master.m3u8 #EXTINF:-1 tvg-id="TimesNow.in",Times Now (480p) [Geo-blocked] https://timesnow-lh.akamaihd.net/i/TNHD_1@129288/master.m3u8 +#EXTINF:-1 tvg-id="TimesNow.in",Times Now [Geo-blocked] +https://pubads.g.doubleclick.net/ssai/event/1mR1QUQ3Tg-VuKfiyjwNuA/master.m3u8 #EXTINF:-1 tvg-id="TimesNowNavbharat.in",Times Now Navbharat [Geo-blocked] https://pubads.g.doubleclick.net/ssai/event/nRWQsGoJSzmcErJFgAy67g/master.m3u8 #EXTINF:-1 tvg-id="",Toonz Kids (Indonesian dub) (576p) @@ -676,13 +686,3 @@ https://livetv-channels.b-cdn.net/8076/playlist.m3u8 http://183.89.246.119:8881/play/a09a/index.m3u8 #EXTINF:-1 tvg-id="Zoom.in",Zoom (1080p) http://103.81.104.118/hls/stream8.m3u8 -#EXTINF:-1 tvg-id="ShowBox.in",ShowBox -https://epiconvh.akamaized.net/live/showbox/master.m3u8 -#EXTINF:-1 tvg-id="RajTV.in",Raj TV -https://d3qs3d2rkhfqrt.cloudfront.net/out/v1/2839e3d1e0f84a2e821c1708d5fdfdf0/index.m3u8 -#EXTINF:-1 tvg-id="DDSahyadri.in",DD Sahyadri -https://d3qs3d2rkhfqrt.cloudfront.net/out/v1/66dcc3ebe182447ba42837e746cf0c7c/index.m3u8 -#EXTINF:-1 tvg-id="DDSaptagiri.in",DD Saptagiri -https://d2lk5u59tns74c.cloudfront.net/out/v1/26e915d6d12b4a06822c5e33c088ed56/index.m3u8 -#EXTINF:-1 tvg-id="DDHaryana.in",DD Haryana -https://d2lk5u59tns74c.cloudfront.net/out/v1/950fc69666474351bde0a32b9600c804/index.m3u8 diff --git a/streams/in_samsung.m3u b/streams/in_samsung.m3u index 6dde77d1e4..a5f4d9f8ff 100644 --- a/streams/in_samsung.m3u +++ b/streams/in_samsung.m3u @@ -9,7 +9,7 @@ https://brandusa-gousa-1-in.samsung.wurl.tv/playlist.m3u8 https://insighttv-samsungindia.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="InTrouble.nl",InTrouble (1080p) https://introuble-samsungindia.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",InWild (720p) +#EXTINF:-1 tvg-id="InWild.it@SD",InWild (720p) https://inwild-samsungindia.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="InWonder.nl",InWonder (720p) https://inwonder-samsungindia.amagi.tv/playlist.m3u8 @@ -17,7 +17,7 @@ https://inwonder-samsungindia.amagi.tv/playlist.m3u8 https://mavtv-mavtvglobal-1-in.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="PeopleAreAwesome.us",People are Awesome https://jukin-peopleareawesome-2-in.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="ThePetCollective.in",The Pet Collective +#EXTINF:-1 tvg-id="ThePetCollective.us@India",The Pet Collective https://the-pet-collective-international-in.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="WeatherSpy.in",Weatherspy https://jukin-weatherspy-2-in.samsung.wurl.tv/playlist.m3u8 diff --git a/streams/ir.m3u b/streams/ir.m3u index 4d7c35b2aa..9dc324649d 100644 --- a/streams/ir.m3u +++ b/streams/ir.m3u @@ -15,16 +15,16 @@ https://nl.livekadeh.com/hls2/alwilayah_tv.m3u8 https://live.asil.tv/asiltv/index.m3u8 #EXTINF:-1 tvg-id="AssiratTV.ir",Assirat TV (700p) https://svs.itworkscdn.net/assiratvlive/assirat/playlist.m3u8 -#EXTINF:-1 tvg-id="AVAFamily.ir",AVA Family (720p) [Not 24/7] +#EXTINF:-1 tvg-id="AVAFamily.iq@SD",AVA Family (720p) [Not 24/7] https://familyhls.avatv.live/hls/stream.m3u8 #EXTINF:-1 tvg-id="HastiTV.uk",Hasti TV (1080p) [Not 24/7] https://live.hastitv.com/hls/livetv.m3u8 #EXTINF:-1 tvg-id="",Health Media TV (720p) https://6n3yowknl9ok-hls-live.5centscdn.com/HMN/271ddf829afeece44d8732757fba1a66.sdp/playlist.m3u8 -#EXTINF:-1 tvg-id="HighVisionTV.us",High Vision -https://streamer1.connectto.com/HIGHVISION_WEB_1205/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="HighVisionTV.us",High Vision (1080p) [Not 24/7] https://streamer1.connectto.com/HIGHVISION_WEB_1205/index.m3u8 +#EXTINF:-1 tvg-id="HighVisionTV.us",High Vision +https://streamer1.connectto.com/HIGHVISION_WEB_1205/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="HispanTV.ir",Hispan TV https://cdnlive.presstv.ir/live/smil:live.smil/playlist.m3u8 #EXTINF:-1 tvg-id="HodHodFarsiTV.ir",HodHod Farsi @@ -51,11 +51,11 @@ https://5acf9f9415a10.streamlock.net/live_transcoder/ngrp:mohabat.stream_all/pla https://iptv.negahtv.com/negahtv/playlist.m3u8 #EXTINF:-1 tvg-id="OXIRTV.ir",OXIR TV (720p) https://hls.oxir.live/hls/stream.m3u8 -#EXTINF:-1 tvg-id="",Payam Javan TV (720p) [Not 24/7] +#EXTINF:-1 tvg-id="PayamJavanTV.us@SD",Payam Javan TV (720p) [Not 24/7] https://uni01rtmp.tulix.tv/kensecure/pjtv.stream/playlist.m3u8 #EXTINF:-1 tvg-id="PayvandTV.ir",Payvand TV (720p) [Not 24/7] https://uni6rtmp.tulix.tv/ucur1/Payvand/playlist.m3u8 -#EXTINF:-1 tvg-id="",PBC Tapesh TV (720p) [Not 24/7] +#EXTINF:-1 tvg-id="PBCTapeshTV.us@SD",PBC Tapesh TV (720p) [Not 24/7] https://iptv.tapesh.tv/tapesh/playlist.m3u8 #EXTINF:-1 tvg-id="PressTV.ir",Press TV https://live.presstv.ir/hls/presstv.m3u8 diff --git a/streams/it.m3u b/streams/it.m3u index 933581a684..356d77e6bb 100644 --- a/streams/it.m3u +++ b/streams/it.m3u @@ -1,4 +1,6 @@ #EXTM3U +#EXTINF:-1 tvg-id="7RadioVisione.it",7 RadioVisione (720p) +https://stream10.xdevel.com/video1s976543-1932/stream/playlist.m3u8 #EXTINF:-1 tvg-id="12TVParma.it",12 TV Parma (540p) [Not 24/7] https://5929b138b139d.streamlock.net/12TVParma/livestream/playlist.m3u8 #EXTINF:-1 tvg-id="20.it",20 Mediaset [Geo-blocked] @@ -137,16 +139,16 @@ https://tsw.streamingwebtv24.it:1936/insuranceconnect/insuranceconnect/playlist. https://live3-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(ki)/index.m3u8 #EXTINF:-1 tvg-id="Italia1.it",Italia 1 [Geo-blocked] https://live3-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(i1)/index.m3u8 -#EXTINF:-1 tvg-id="Italia2.it",Italia 2 [Geo-blocked] -https://live3-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(i2)/index.m3u8 #EXTINF:-1 tvg-id="Italia2.it",Italia 2 (480p) [Geo-blocked] https://59d7d6f47d7fc.streamlock.net/italia2/italia2/playlist.m3u8 +#EXTINF:-1 tvg-id="Italia2.it",Italia 2 [Geo-blocked] +https://live3-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(i2)/index.m3u8 #EXTINF:-1 tvg-id="Italia2TV.it",Italia 2 TV (480p) [Geo-blocked] http://wms.shared.streamshow.it/italia2/mp4:italia2/playlist.m3u8 -#EXTINF:-1 tvg-id="Italia7.it",Italia 7 -https://streaming.softwarecreation.it/Italia7/Italia7/playlist.m3u8 #EXTINF:-1 tvg-id="Italia7.it",Italia 7 (576p) http://151.0.207.99:1935/italia7/italia7/playlist.m3u8 +#EXTINF:-1 tvg-id="Italia7.it",Italia 7 +https://streaming.softwarecreation.it/Italia7/Italia7/playlist.m3u8 #EXTINF:-1 tvg-id="ItaliaChannel.it",Italia Channel (1080p) https://stream1.aswifi.it/italiachannel/stream/index.m3u8 #EXTINF:-1 tvg-id="",Iunior TV (720p) [Not 24/7] @@ -249,7 +251,7 @@ https://iptv.peer.biz/live/peertv-it.m3u8 https://iptv.peer.biz/live/peertv-en.m3u8 #EXTINF:-1 tvg-id="PeerTVSudtirol.it",Peer TV Südtirol (1080p) https://iptv.peer.biz/live/peertv.m3u8 -#EXTINF:-1 tvg-id="PlutoTVTopGear.it" http-referrer="https://pluto.tv/it/live-tv/64c109a4798def0008a6e03e",Pluto TV Top Gear +#EXTINF:-1 tvg-id="PlutoTVTopGear.us@Italy" http-referrer="https://pluto.tv/it/live-tv/64c109a4798def0008a6e03e",Pluto TV Top Gear #EXTVLCOPT:http-referrer=https://pluto.tv/it/live-tv/64c109a4798def0008a6e03e https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/64c109a4798def0008a6e03e/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",POP Television (720p) @@ -316,7 +318,7 @@ https://mediapolisevent.rai.it/relinker/relinkerServlet.htm?cont=2606803 https://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=308718 #EXTINF:-1 tvg-id="Rai2.it",Rai 2 (302p) [Geo-blocked] http://stream.tvtap.net:8081/live/it-rai2.stream/playlist.m3u8 -#EXTINF:-1 tvg-id="Rai2HD.it" http-referrer="https://babaktv.com/",Rai 2 HD +#EXTINF:-1 tvg-id="Rai2.it@HD" http-referrer="https://babaktv.com/",Rai 2 HD #EXTVLCOPT:http-referrer=https://babaktv.com/ https://m3u.iranvids.com/rai02/output.m3u8 #EXTINF:-1 tvg-id="Rai3.it",Rai 3 (720p) @@ -345,7 +347,7 @@ http://stream.tvtap.net:8081/live/it-rai5.stream/playlist.m3u8 http://188.60.179.180:8000/play/xxRaiGulpxx #EXTINF:-1 tvg-id="RaiGulp.it",Rai Gulp (576p) https://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=746953 -#EXTINF:-1 tvg-id="RaiItaliaAsia.it",RAI Italia Asia (576p) +#EXTINF:-1 tvg-id="RaiItalia.it@Asia",RAI Italia Asia (576p) http://210.210.155.37/x6bnqe/s/s63/index2.m3u8 #EXTINF:-1 tvg-id="RaiMovie.it",Rai Movie (1080p) http://188.60.179.180:8000/play/xxRaiMOviexx @@ -423,6 +425,8 @@ https://5f22d76e220e1.streamlock.net/rtm/rtm/playlist.m3u8 https://flash2.xdevel.com/rtptv/rtptv/playlist.m3u8 #EXTINF:-1 tvg-id="RTTRTrento.it",RTTR Trento (720p) https://5f204aff97bee.streamlock.net/RTTRlive/livestream/playlist.m3u8 +#EXTINF:-1 tvg-id="RTV38.it",RTV38 (576p) +https://streamcdne1-845d8509d2cb4f249dd0b2ae5755b6c2.msvdn.net/rtv38/rtv38_live_main/mainabr/rtv38_live_main/main_576/chunks_dvr.m3u8 #EXTINF:-1 tvg-id="SardegnaUno.it",Sardegna Uno https://raw.githubusercontent.com/azgaresncf/strm2hls/main/streams/Sardegna1.m3u8 #EXTINF:-1 tvg-id="SienaTV.it",Siena TV (1080p) @@ -439,10 +443,10 @@ https://di-yx2saj20.vo.lswcdn.net/sportitalia/smil:silive24.smil/playlist.m3u8 https://di-g7ij0rwh.vo.lswcdn.net/sportitalia/silive24.smil/playlist.m3u8 #EXTINF:-1 tvg-id="SportitaliaMotori.it",Sportitalia Motori (720p) [Geo-blocked] https://di-yx2saj20.vo.lswcdn.net/sportitalia/smil:simotori.smil/playlist.m3u8 -#EXTINF:-1 tvg-id="SportitaliaSolocalcio.it",Sportitalia SoloCalcio -https://di-g7ij0rwh.vo.lswcdn.net/sportitalia/sisolocalcio.smil/playlist.m3u8 #EXTINF:-1 tvg-id="SportitaliaSolocalcio.it",Sportitalia Solocalcio (720p) [Geo-blocked] https://di-yx2saj20.vo.lswcdn.net/sportitalia/smil:sisolocalcio.smil/playlist.m3u8 +#EXTINF:-1 tvg-id="SportitaliaSolocalcio.it",Sportitalia SoloCalcio +https://di-g7ij0rwh.vo.lswcdn.net/sportitalia/sisolocalcio.smil/playlist.m3u8 #EXTINF:-1 tvg-id="Sportitalia.it",Sportitalia TV/Sportitalia/SI https://di-g7ij0rwh.vo.lswcdn.net/sportitalia/sihd/playlist.m3u8 #EXTINF:-1 tvg-id="STEuropeChannel.it",ST Europe Channel (720p) @@ -465,7 +469,7 @@ http://193.70.81.40:1935/supertvoristano/supertvoristano/playlist.m3u8 https://vimnitaly.akamaized.net/hls/live/2094034/super/master-2500.m3u8 #EXTINF:-1 tvg-id="SuperSix.it",SuperSix Lombardia (720p) https://5db313b643fd8.streamlock.net/SUPERSIXLombardia/SUPERSIXLombardia/playlist.m3u8 -#EXTINF:-1 tvg-id="SuperTennisHD.it",SuperTennis HD +#EXTINF:-1 tvg-id="SuperTennis.it@HD",SuperTennis HD https://live-embed.supertennix.hiway.media/restreamer/supertennix_client/gpu-a-c0-16/restreamer/outgest/h24_supertennix/manifest.m3u8 #EXTINF:-1 tvg-id="T9.it",T9 (288p) https://streaming.softwarecreation.it/tnove/tnove/playlist.m3u8 @@ -485,6 +489,8 @@ https://ssh101-fl.bozztv.com/ssh101/telemessina/index.m3u8 http://wms.shared.streamshow.it/telepavia/telepavia/playlist.m3u8 #EXTINF:-1 tvg-id="TelePegasoCatania.it",Tele Pegaso Catania (404p) [Not 24/7] https://flash2.xdevel.com/telepegasocanale812/telepegasocanale812/playlist.m3u8 +#EXTINF:-1 tvg-id="TeleQuattro.it",Tele Quattro (720p) +https://59d7d6f47d7fc.streamlock.net/telequattro/telequattro/playlist.m3u8 #EXTINF:-1 tvg-id="TeleQuattro.it",Tele Quattro (480p) [Not 24/7] http://wms.shared.streamshow.it/telequattro/telequattro/playlist.m3u8 #EXTINF:-1 tvg-id="TeleRadioSciacca.it",Tele Radio Sciacca (240p) [Not 24/7] @@ -513,7 +519,7 @@ https://1aadf145546f475282c5b4e658c0ac4b.msvdn.net/live/324149/hlbAWtl/playlist. http://wms.shared.streamshow.it/telefoggia/mp4:telefoggia/playlist.m3u8 #EXTINF:-1 tvg-id="Telefoggia.it",Telefoggia (480p) [Not 24/7] https://59d7d6f47d7fc.streamlock.net/telefoggia/telefoggia/playlist.m3u8 -#EXTINF:-1 tvg-id="",TeleFormula (720p) [Not 24/7] +#EXTINF:-1 tvg-id="TeleFormula.mx@SD",TeleFormula (720p) [Not 24/7] https://wms60.tecnoxia.com/radiof/abr_radioftele/playlist.m3u8 #EXTINF:-1 tvg-id="Telefriuli.it",Telefriuli (1080p) https://5757bf2aa08e42248fb9b9d620f5d900.msvdn.net/live/S11646715/pE3ax0lT0rBd/playlist.m3u8 @@ -545,6 +551,8 @@ http://wms.shared.streamshow.it:1935/telemonteneve/telemonteneve/live.m3u8 http://stream2.xdevel.com/video2s976570-2303/stream/playlist_dvr.m3u8 #EXTINF:-1 tvg-id="Telenord.it",Telenord (576p) [Not 24/7] https://5db313b643fd8.streamlock.net/Telenord/Telenord/playlist.m3u8 +#EXTINF:-1 tvg-id="Telenova.it",Telenova (720p) +https://64b16f23efbee.streamlock.net/telenova/telenova/playlist.m3u8 #EXTINF:-1 tvg-id="Telepace1.it",Telepace 1 (1080p) https://live.mariatvcdn.com/teleradiopace1/efcc8fc46cab26315ce3f5845d76008f.sdp/index.m3u8 #EXTINF:-1 tvg-id="Telepace2.it",Telepace 2 (1080p) @@ -667,11 +675,3 @@ https://stream.cp.ets-sistemi.it:1936/profservtv/profservtv/playlist.m3u8 https://5f22d76e220e1.streamlock.net/canale5/canale5/playlist.m3u8 #EXTINF:-1 tvg-id="ZerounoTVNews.it",Zerouno TV News (720p) https://5db313b643fd8.streamlock.net/ZerounoTVEventi/ZerounoTVEventi/playlist.m3u8 -#EXTINF:-1 tvg-id="Telenova.it",Telenova (720p) -https://64b16f23efbee.streamlock.net/telenova/telenova/playlist.m3u8 -#EXTINF:-1 tvg-id="TeleQuattro.it",Tele Quattro (720p) -https://59d7d6f47d7fc.streamlock.net/telequattro/telequattro/playlist.m3u8 -#EXTINF:-1 tvg-id="7RadioVisione.it",7 RadioVisione (720p) -https://stream10.xdevel.com/video1s976543-1932/stream/playlist.m3u8 -#EXTINF:-1 tvg-id="RTV38.it",RTV38 (576p) -https://streamcdne1-845d8509d2cb4f249dd0b2ae5755b6c2.msvdn.net/rtv38/rtv38_live_main/mainabr/rtv38_live_main/main_576/chunks_dvr.m3u8 diff --git a/streams/it_pluto.m3u b/streams/it_pluto.m3u index bfe6b9efd2..b35086ef2c 100644 --- a/streams/it_pluto.m3u +++ b/streams/it_pluto.m3u @@ -1,87 +1,87 @@ #EXTM3U -#EXTINF:-1 tvg-id="16AnnieIncinta.it",16 Anni e Incinta Italy (720p) +#EXTINF:-1 tvg-id="16AnnieIncinta.us@Italy",16 Anni e Incinta Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/60940a07d88ba90007b9cb71/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="Andromeda.it",Andromeda Italy (720p) +#EXTINF:-1 tvg-id="Andromeda.us@Italy",Andromeda Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/60802d37ee238e0007c94e64/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Avatar La Leggenda di Aang Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/624da1cd2af90c0007c13205/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="CatfishTVShow.it",Catfish TV Show Italy (720p) +#EXTINF:-1 tvg-id="CatfishTVShow.us@Italy",Catfish TV Show Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6093f9ed2c75660007322bb7/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="ClubbingTV.it",Clubbing TV Italy (720p) +#EXTINF:-1 tvg-id="ClubbingTV.us@Italy",Clubbing TV Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/60802de3fd2d70000763bb83/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="ConsulenzeIllegali.it",Consulenze Illegali Italy (720p) +#EXTINF:-1 tvg-id="ConsulenzeIllegali.us@Italy",Consulenze Illegali Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/60b9dc99521a1400079bdfba/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Doctor Who Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/62e7f8db27ce19000732d1aa/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Due Fantagenitori Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/62b57a6752a0060008bc65cd/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="ExOnTheBeach.it",Ex On The Beach Italy (720p) +#EXTINF:-1 tvg-id="ExOnTheBeach.us@Italy",Ex On The Beach Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/60940ebad67fd900072382db/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="FailArmy.it",FailArmy Italy (720p) +#EXTINF:-1 tvg-id="FailArmy.us@Italy",FailArmy Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/608014d19a26320007c92ab6/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="GeordieShore.it",Geordie Shore Italy (720p) +#EXTINF:-1 tvg-id="GeordieShore.us@Italy",Geordie Shore Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/619263ee9541940007d20d60/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="IGN.it",IGN Italy (720p) +#EXTINF:-1 tvg-id="IGN.us@Italy",IGN Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/608015ea48a6e800076f0f2f/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="IlBancodeiPugni.it",Il Banco dei Pugni Italy (720p) +#EXTINF:-1 tvg-id="IlBancodeiPugni.us@Italy",Il Banco dei Pugni Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/60e4507a06171800072339a3/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Il mio amico Arnold Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6385eb5588399a000759ef45/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Il Testimone Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/61fbd3f0733df400076c9a2d/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="JustforLaughs.it",Just for Laughs Italy (720p) +#EXTINF:-1 tvg-id="JustforLaughs.us@Italy",Just for Laughs Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6093f48c95132a00075fd859/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="LesorelleMcLeod.it",Le Sorelle McLeod Italy (720p) +#EXTINF:-1 tvg-id="LesorelleMcLeod.us@Italy",Le Sorelle McLeod Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/60a2837f8154ab0007c4dcdf/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",MacGyver Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6245d4511358320007029cdf/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Mai Dire Sì Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6349279ed5023700078f2bc2/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="MutantX.it",Mutant X Italy (720p) +#EXTINF:-1 tvg-id="MutantX.us@Italy",Mutant X Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/60802c209a26320007c92ad5/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Pimp My Ride Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/636a4eaf77279a0007f14861/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVAnime.it",Pluto TV Anime Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVAnime.us@Italy",Pluto TV Anime Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/612375086abc84000738fc03/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVCinemaItaliano.it",Pluto TV Cinema Italiano Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVCinemaItaliano.us@Italy",Pluto TV Cinema Italiano Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/608aa7d8359b270007861489/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVCrime.it",Pluto TV Crime Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVCrime.us@Italy",Pluto TV Crime Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/608aa777b907770007e5d05d/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVCucina.it",Pluto TV Cucina Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVCucina.us@Italy",Pluto TV Cucina Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6261868633a2890007e87885/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVDocumentari.it",Pluto TV Documentary Italy (720p) +#EXTINF:-1 tvg-id="",Pluto TV Documentary Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/608aa8a5709d6b0007b132fe/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVFamily.it",Pluto TV Family Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVFamily.us@Italy",Pluto TV Family Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6123742451cce0000789fc7a/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVFilmAzione.it",Pluto TV Film Azione Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVFilmAzione.us@Italy",Pluto TV Film Azione Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/608aa17fb9f4490007e6419a/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVFilmClassici.it",Pluto TV Film Classici Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVFilmClassici.us@Italy",Pluto TV Film Classici Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/608aa3c446d73500075f0e24/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVFilmCommedia.it",Pluto TV Film Commedia Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVFilmCommedia.us@Italy",Pluto TV Film Commedia Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/608aa512d67fd900072323db/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVFilmDrama.it",Pluto TV Film Drama Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVFilmDrama.us@Italy",Pluto TV Film Drama Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/608aa42b5c2b8f0007197529/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVFilm.it",Pluto TV Film Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVFilm.us@Italy",Pluto TV Film Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/608aa20a2e7f270007c4878d/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVFilmRomantici.it",Pluto TV Film Romantici Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVFilmRomantici.us@Italy",Pluto TV Film Romantici Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/608aa4a4cc92820007b663af/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVFilmThriller.it",Pluto TV Film Thriller Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVFilmThriller.us@Italy",Pluto TV Film Thriller Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/608aa5e995132a00075f7005/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Pluto TV Horror Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/61c09e3ac210ed0007606620/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Pluto TV Kids Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/62444e195d2ab7000861694b/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVNatura.it",Pluto TV Natura Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVNatura.us@Italy",Pluto TV Natura Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/60802b37709d6b0007b0c549/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVRealLife.it",Pluto TV Real Life Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVRealLife.us@Italy",Pluto TV Real Life Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/60801976f92a750007a0699c/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVReality.it",Pluto TV Reality Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVReality.us@Italy",Pluto TV Reality Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/61925f874b1ec000075e700a/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVSciFi.it",Pluto TV Sci-Fi Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVSciFi.us@Italy",Pluto TV Sci-Fi Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/61728bb9ee3773000840c1fa/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVSerie.it",Pluto TV Serie Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVSerie.us@Italy",Pluto TV Serie Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/60b9ff2722bfa400072676ef/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVSport.it",Pluto TV Sport Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVSport.us@Italy",Pluto TV Sport Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/608030eff4b6f70007e1684c/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Pluto TV Viaggi Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/63c923944207be0007fd0887/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY @@ -91,9 +91,9 @@ https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/62e7fb67478a5b0007e6c https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/634926e4b51d2d00077819a2/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Ridiculousness Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/61fbd721e5b49e00079bfedc/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="Scherzierisate.it",Scherzi e risate Italy (720p) +#EXTINF:-1 tvg-id="Scherzierisate.us@Italy",Scherzi e risate Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/609404b0a8ec810007d8de9d/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="SerieTeen.it",Serie Teen Italy (720p) +#EXTINF:-1 tvg-id="SerieTeen.us@Italy",Serie Teen Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/60940639add5910008c0cdd1/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Settimo Cielo Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6245d3792792150007e20634/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY @@ -101,21 +101,21 @@ https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6245d3792792150007e20 https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/62bc1f502b70e3000706298e/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Squadra Speciale Cobra 11 Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/625e6cc905e09f00073addee/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="SuperBrothersandSisters.it",Super! Brothers and Sisters Italy (720p) +#EXTINF:-1 tvg-id="SuperBrothersandSisters.us@Italy",Super! Brothers and Sisters Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/61925ea79541940007d20881/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Super! Danger and Thunder Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/62e8e3bca3766a0007387284/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="SuperEroi.it",Super! Eroi Italy (720p) +#EXTINF:-1 tvg-id="SuperEroi.us@Italy",Super! Eroi Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6093f5ab128c2b00070ebd51/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="SuperiCarly.it",Super! iCarly Italy (720p) +#EXTINF:-1 tvg-id="SuperiCarly.us@Italy",Super! iCarly Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/609401db8cf51c00084b592e/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="SuperPop.it",Super! Pop Italy (720p) +#EXTINF:-1 tvg-id="SuperPop.us@Italy",Super! Pop Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6093f7b5bb49b90007cecaad/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Super! Rugrats Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/62e8ddbbaed0390007b258a6/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="SuperSpongeBob.it",Super! SpongeBob Italy (720p) +#EXTINF:-1 tvg-id="SuperSpongeBob.us@Italy",Super! SpongeBob Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/61fbd4c9e5b49e00079bfed9/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="SuperStar.it",Super! Star Italy (720p) +#EXTINF:-1 tvg-id="SuperStar.us@Italy",Super! Star Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6093f6f8351eb0000754afb8/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Super! Victorious Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/63c012504faf1c0007abfa93/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY @@ -123,17 +123,17 @@ https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/63c012504faf1c0007abf https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/62e7fc8c0d061100083946a9/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",Teenage Mutant Ninja Turtles Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/62619405c733e8000732d1fe/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="ThePetCollective.it",The Pet Collective Italy (720p) +#EXTINF:-1 tvg-id="ThePetCollective.us@Italy",The Pet Collective Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/60801317a0ccef00072aaf75/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",VH1+ Canzoni Italiane (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/63724270c7c2360007b170e8/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",VH1+ Christmas Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/62e8e137865c590007ecae3c/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="PlutoTVVH1Plus.it",VH1+ Italy (720p) +#EXTINF:-1 tvg-id="PlutoTVVH1Plus.us@Italy",VH1+ Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/61cd822216e2fd00086d0aeb/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",VH1+ Music Legends Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/62e8cc10ca869f00078efca8/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY #EXTINF:-1 tvg-id="",VH1+ Rock Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/636a4173e34fd50007534542/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY -#EXTINF:-1 tvg-id="WorldPokerTour.it",World Poker Tour Italy (720p) +#EXTINF:-1 tvg-id="WorldPokerTour.us@Italy",World Poker Tour Italy (720p) https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/608016e446d73500075ea7e0/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY diff --git a/streams/it_samsung.m3u b/streams/it_samsung.m3u index be91fc96b3..e982ec64a9 100644 --- a/streams/it_samsung.m3u +++ b/streams/it_samsung.m3u @@ -1,9 +1,9 @@ #EXTM3U -#EXTINF:-1 tvg-id="",BBC Drama +#EXTINF:-1 tvg-id="BBCDrama.uk@Italy",BBC Drama https://bbceu-bbcdrama-2-it.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="BizzarroMovies.it",Bizzarro Movies https://minerva-bizzarromovies-1-it.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="BloombergTVPlus.us",Bloomberg TV+ UHD (2160p) +#EXTINF:-1 tvg-id="",Bloomberg TV+ UHD (2160p) https://bloomberg-bloombergtv-1-it.samsung.wurl.tv/manifest/playlist.m3u8 #EXTINF:-1 tvg-id="CanaleEuropaTV.it",Canale Europa (720p) https://canaleeuropa-canaleeuropa-1-it.samsung.wurl.tv/playlist.m3u8 @@ -13,7 +13,7 @@ https://cgentertainment-cgtv-1-it.samsung.wurl.tv/playlist.m3u8 https://minerva-cinemasegreto-1-it.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="EuronewsItalian.fr",Euronews Italiano (720p) https://rakuten-euronews-3-it.samsung.wurl.tv/manifest/playlist.m3u8 -#EXTINF:-1 tvg-id="FailArmy.it",Failarmy +#EXTINF:-1 tvg-id="FailArmy.us@Italy",Failarmy https://failarmy-international-it.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",Full Moon https://minerva-fullmoon-1-it.samsung.wurl.tv/playlist.m3u8 @@ -31,19 +31,19 @@ https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01492-secomsasmediart-museumtv-eng- https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01255-secomcofites-my-myzen-samsungen-samsungit/playlist.m3u8 #EXTINF:-1 tvg-id="PeopleAreAwesome.us",People are Awesome https://jukin-peopleareawesome-2-it.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Planeta Junior +#EXTINF:-1 tvg-id="PlanetaJuniorTV.us@Italy",Planeta Junior https://deaplaneta-planetakidz-2-it.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="RadioItaliaTrendTVHD.it",Radio Italia Trend https://radioitalia-samsungitaly.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVActionMovies.it",Rakuten Action Movies +#EXTINF:-1 tvg-id="RakutenTVActionMovies.es@Italy",Rakuten Action Movies https://rakuten-actionmovies-6-it.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVComedyMovies.it",Rakuten Comedy Movies +#EXTINF:-1 tvg-id="RakutenTVComedyMovies.es@Italy",Rakuten Comedy Movies https://rakuten-comedymovies-6-it.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVDramaMovies.it",Rakuten Drama +#EXTINF:-1 tvg-id="RakutenTVDramaMovies.es@Italy",Rakuten Drama https://rakuten-tvshows-6-it.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVFamilyMovies.it",Rakuten Family +#EXTINF:-1 tvg-id="RakutenTVFamilyMovies.es@Italy",Rakuten Family https://rakuten-family-6-it.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenTVSpotlight.it",Rakuten Spotlight +#EXTINF:-1 tvg-id="RakutenTVSpotlight.es@Italy",Rakuten Spotlight https://rakuten-spotlight-6-it.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",Shorts [Geo-blocked] https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg00784-shortsinternati-shortstv-fast-italy-samsungit/playlist.m3u8 @@ -57,7 +57,7 @@ https://sportsitalia-samsungitaly.amagi.tv/playlist.m3u8 https://dhx-teletubbies-2-it.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",Televisa Telenovelas https://televisa-televisa-1-it.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="ThePetCollective.it",The Pet Collective +#EXTINF:-1 tvg-id="ThePetCollective.us@Italy",The Pet Collective https://the-pet-collective-international-it.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="TraceLatina.fr",Trace Latina [Geo-blocked] https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01131-tracetv-tracelatinait-samsungit/playlist.m3u8 diff --git a/streams/jp_primehome.m3u b/streams/jp_primehome.m3u index a3f57c0aaa..498f3260df 100644 --- a/streams/jp_primehome.m3u +++ b/streams/jp_primehome.m3u @@ -1,7 +1,7 @@ #EXTM3U #EXTINF:-1 tvg-id="JOAYDTV.jp",ABC (544p) http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx02&isp=4 -#EXTINF:-1 tvg-id="Animax.jp",Animax (544p) +#EXTINF:-1 tvg-id="",Animax (544p) http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs15&isp=4 #EXTINF:-1 tvg-id="BSAsahi.jp",BS Asahi (544p) http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs03&isp=4 diff --git a/streams/kh.m3u b/streams/kh.m3u index b412e59c7d..309f269f0d 100644 --- a/streams/kh.m3u +++ b/streams/kh.m3u @@ -1,16 +1,18 @@ #EXTM3U #EXTINF:-1 tvg-id="ApsaraTV11.kh",Apsara TV11 (720p) https://live.ams.com.kh/app/stream/playlist.m3u8 -#EXTINF:-1 tvg-id="BayonTV.kh",Bayon TV -https://live-evg2.tv360.metfone.com.kh/livebayontv/bayontvhd.stream/playlist.m3u8 #EXTINF:-1 tvg-id="BayonTV.kh",Bayon TV (720p) https://live.kh.malimarcdn.com/live/bayonhd.stream/playlist.m3u8 +#EXTINF:-1 tvg-id="BayonTV.kh",Bayon TV +https://live-evg2.tv360.metfone.com.kh/livebayontv/bayontvhd.stream/playlist.m3u8 #EXTINF:-1 tvg-id="BTVNews.kh",BTV News (720p) https://live-evg2.tv360.metfone.com.kh/livetest/bayontest.stream/playlist.m3u8 -#EXTINF:-1 tvg-id="CTV9.kh",CTV 9 -https://live-evg6.tv360.metfone.com.kh/CTV9HD@1.m3u8 +#EXTINF:-1 tvg-id="CTN.kh",CTN (480p) +http://43.252.18.195:5080/live/streams/ctntv.m3u8 #EXTINF:-1 tvg-id="CTV9.kh",CTV 9 (720p) https://live.kh.malimarcdn.com/live/tv9.stream/playlist.m3u8 +#EXTINF:-1 tvg-id="CTV9.kh",CTV 9 +https://live-evg6.tv360.metfone.com.kh/CTV9HD@1.m3u8 #EXTINF:-1 tvg-id="FreshNews.kh",Fresh News (720p) https://streaming.freshnewsasia.com/live/ngrp:myStream_all/playlist.m3u8 #EXTINF:-1 tvg-id="HangMeasHDTV.kh",Hang Meas HDTV (1080p) @@ -24,6 +26,8 @@ http://tv.cootel.com.kh:8077/streams/d/Komsan/playlist.m3u8 https://live-ali7.tv360.metfone.com.kh/live/myStream/playlist.m3u8 #EXTINF:-1 tvg-id="MSJTV.kh",MSJ TV (720p) http://124.248.165.18:1935/live/myStream.smil/playlist.m3u8 +#EXTINF:-1 tvg-id="MyTV.kh",My TV +http://43.252.18.195:5080/live/streams/mytv.m3u8 #EXTINF:-1 tvg-id="",Netlink TV (720p) https://netlink.netlinkbroadcaster.com/hls/test.m3u8 #EXTINF:-1 tvg-id="NTV.kh",NTV @@ -36,27 +40,23 @@ http://clive.malisresidences.com:1935/rhm_hdtv/_definst_/smil:RHMHDTV.smil/playl https://seatv.netlinkbroadcaster.com/hls/test.m3u8 #EXTINF:-1 tvg-id="",SEATV-Radio (720p) https://fmseatv.netlinkbroadcaster.com/hls/test.m3u8 -#EXTINF:-1 tvg-id="TownTV.kh",Town TV -https://live-evg13.tv360.metfone.com.kh/live/towntv.m3u8 #EXTINF:-1 tvg-id="TownTV.kh",Town TV (720p) https://live.kh.malimarcdn.com/live/towntv.stream/playlist.m3u8 -#EXTINF:-1 tvg-id="TV3.kh",TV 3 -http://206.189.93.160:1935/live/myStream_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="TownTV.kh",Town TV +https://live-evg13.tv360.metfone.com.kh/live/towntv.m3u8 #EXTINF:-1 tvg-id="TV3.kh",TV 3 (720p) https://edge6a.v2h-cdn.com/tv3cam/tv3cam.stream/playlist.m3u8 -#EXTINF:-1 tvg-id="TV5Cambodia.kh",TV5 Cambodia -http://live.happywatch99.com/livehd14/77bbe9df6a93cf229cd40f1400af00fa.sdp/playlist.m3u8 +#EXTINF:-1 tvg-id="TV3.kh",TV 3 +http://206.189.93.160:1935/live/myStream_720p/playlist.m3u8 #EXTINF:-1 tvg-id="TV5Cambodia.kh",TV5 Cambodia (1080p) https://es1-p1-netcdn.metfone.com.kh/netcdn-live-36/36/output/playlist.m3u8 #EXTINF:-1 tvg-id="TV5Cambodia.kh",TV5 Cambodia (720p) https://live-evg3.tv360.metfone.com.kh/live/tv5.m3u8 +#EXTINF:-1 tvg-id="TV5Cambodia.kh",TV5 Cambodia +http://live.happywatch99.com/livehd14/77bbe9df6a93cf229cd40f1400af00fa.sdp/playlist.m3u8 #EXTINF:-1 tvg-id="TVK.kh",TVK (720p) https://live.kh.malimarcdn.com/live/tvk.stream/playlist.m3u8 #EXTINF:-1 tvg-id="TVK2.kh",TVK 2 (720p) https://live.kh.malimarcdn.com/live/tvk2.stream/playlist.m3u8 #EXTINF:-1 tvg-id="WikiTV.kh",WIKI TV (720p) https://stream.wikitv.asia/live/ngrp:myStream_all/playlist.m3u8 -#EXTINF:-1 tvg-id="MyTV.kh",My TV -http://43.252.18.195:5080/live/streams/mytv.m3u8 -#EXTINF:-1 tvg-id="CTN.kh",CTN (480p) -http://43.252.18.195:5080/live/streams/ctntv.m3u8 diff --git a/streams/kr.m3u b/streams/kr.m3u index 96b6a77edb..f422ec9bfd 100644 --- a/streams/kr.m3u +++ b/streams/kr.m3u @@ -33,10 +33,10 @@ http://bbstv.clouducs.com:1935/bbstv-live/livestream/playlist.m3u8 https://btn.nowcdn.co.kr/btn/btnlive2m/playlist.m3u8 #EXTINF:-1 tvg-id="CGNTVSouthKorea.kr",CGNTV South Korea (1080p) https://du35ivadp6cxj.cloudfront.net/out/v1/81781d23cbbf490990b2aa9181d4ce19/CGNWebLiveKR.m3u8 -#EXTINF:-1 tvg-id="ChannelA.kr",Channel A [Geo-blocked] -http://channelalive.ktcdn.co.kr/chalivepc/_definst_/atv2/playlist.m3u8 #EXTINF:-1 tvg-id="ChannelA.kr",Channel A (360p) http://www.hwado.net/webtv/catv/52_440DDPPJ.php +#EXTINF:-1 tvg-id="ChannelA.kr",Channel A [Geo-blocked] +http://channelalive.ktcdn.co.kr/chalivepc/_definst_/atv2/playlist.m3u8 #EXTINF:-1 tvg-id="CJOnStyle.kr",CJ OnStyle (540p) https://live-ch1.cjonstyle.net/cjmalllive/stream2/playlist.m3u8 #EXTINF:-1 tvg-id="CJOnStylePlus.kr",CJ OnStyle Plus (540p) diff --git a/streams/kz.m3u b/streams/kz.m3u index e5e164eb2a..63ae6df50b 100644 --- a/streams/kz.m3u +++ b/streams/kz.m3u @@ -27,10 +27,12 @@ https://stream.qazcdn.net/jjtv/jjtv/playlist.m3u8 http://120.70.60.179:9901/tsfile/live/1000_1.m3u8?authid=0&key=txiptv&playlive=0 #EXTINF:-1 tvg-id="Kokshe.kz",Kókshe (720p) [Not 24/7] https://stream.kaztrk.kz/regional/kokshetautv/index.m3u8 -#EXTINF:-1 tvg-id="",Manas TV (1080p) +#EXTINF:-1 tvg-id="ManasTV.kg@SD",Manas TV (1080p) http://212.42.111.152:8080/hls/manas.m3u8 #EXTINF:-1 tvg-id="Mangystay.kz",Mańǵystaý (540p) [Not 24/7] https://stream.kaztrk.kz/regional/mangystautv/index.m3u8 +#EXTINF:-1 tvg-id="MuzzOne.kz",MuzzOne (1080p) +https://streams.qazcdn.net/muzzone/muzzone/playlist_dvr.m3u8 #EXTINF:-1 tvg-id="Ontustik.kz",Ontústik (360p) https://stream.kaztrk.kz/regional/shymkenttv/index.m3u8 #EXTINF:-1 tvg-id="Qazaqstan.kz",Qazaqstan TV (720p) [Not 24/7] @@ -61,5 +63,3 @@ https://tvcdn01.oktv.kz/tv/mtrk/playlist.m3u8 http://serv25.vintera.tv:8081/novoetv/nov_tv/playlist.m3u8 #EXTINF:-1 tvg-id="ChannelOneEurasia.kz",Первый канал Евразия (720p) https://1tvkz-stream.daitsuna.net/1tvkz/1tvkz/playlist.m3u8 -#EXTINF:-1 tvg-id="MuzzOne.kz",MuzzOne (1080p) -https://streams.qazcdn.net/muzzone/muzzone/playlist_dvr.m3u8 diff --git a/streams/lk.m3u b/streams/lk.m3u index a58517609a..fa270cecc7 100644 --- a/streams/lk.m3u +++ b/streams/lk.m3u @@ -3,21 +3,21 @@ https://tv.hiruhost.com:1936/8012/8012/playlist.m3u8 #EXTINF:-1 tvg-id="ImaiTV.lk",Imai TV (720p) https://rpn3.bozztv.com/ssh101/ssh101/imaitv/playlist.m3u8 +#EXTINF:-1 tvg-id="ITN.lk",ITN (1080p) +https://222103-hls.akamaized.net/668828a00bf80aa436254876/live_aabd3d003af211efadcf7986aa245789/rewind-3600.m3u8 #EXTINF:-1 tvg-id="MonaraTV.lk",Monara TV (720p) [Not 24/7] https://jk3lz8xklw79-hls-live.5centscdn.com/lpl/d0dbe915091d400bd8ee7f27f0791303.sdp/playlist.m3u8 #EXTINF:-1 tvg-id="Rupavahini.lk",Rupavahini (480p) http://dammikartmp.tulix.tv/slrc1/slrc1/playlist.m3u8 -#EXTINF:-1 tvg-id="SiyathaTV.lk",Siyatha TV -https://rtmp01.voaplus.com/hls/6x6ik312qk4grfxocfcv.m3u8 #EXTINF:-1 tvg-id="SiyathaTV.lk",Siyatha TV (720p) [Not 24/7] https://stvlk.live/live/eml079n7ui3ytg1c6x4/index.m3u8 +#EXTINF:-1 tvg-id="SiyathaTV.lk",Siyatha TV +https://rtmp01.voaplus.com/hls/6x6ik312qk4grfxocfcv.m3u8 #EXTINF:-1 tvg-id="Swarnavahini.lk",Swarnavahini (720p) https://jk3lz8xklw79-hls-live.5centscdn.com/live/6226f7cbe59e99a90b5cef6f94f966fd.sdp/playlist.m3u8 #EXTINF:-1 tvg-id="VasanthamTV.lk",Vasantham TV (720p) +https://222103-hls.akamaized.net/668828a00bf80aa436254876/live_2cdb4ef03c1311efadcf7986aa245789/rewind-3600.m3u8 +#EXTINF:-1 tvg-id="VasanthamTV.lk",Vasantham TV (720p) https://j78dp2pnlq5r-hls-live.comcities.net/ITNDigital/20a317b0496a4930b375290505e5d628.sdp/playlist_dvr.m3u8 #EXTINF:-1 tvg-id="VerbumTV.lk",Verbum TV (414p) [Not 24/7] https://verbumtv.livebox.co.in/verbumtvhls/live.m3u8 -#EXTINF:-1 tvg-id="VasanthamTV.lk",Vasantham TV (720p) -https://222103-hls.akamaized.net/668828a00bf80aa436254876/live_2cdb4ef03c1311efadcf7986aa245789/rewind-3600.m3u8 -#EXTINF:-1 tvg-id="ITN.lk",ITN (1080p) -https://222103-hls.akamaized.net/668828a00bf80aa436254876/live_aabd3d003af211efadcf7986aa245789/rewind-3600.m3u8 diff --git a/streams/ma.m3u b/streams/ma.m3u index fbe581a480..2236b5f1e8 100644 --- a/streams/ma.m3u +++ b/streams/ma.m3u @@ -1,9 +1,11 @@ #EXTM3U +#EXTINF:-1 tvg-id="2MMonde.ma",2M Monde (720p) +https://d3g87jnubafe6a.cloudfront.net/out/v1/1fa0fb3c8dec402994a6f7a7f6492b82/index.m3u8 #EXTINF:-1 tvg-id="2MMonde.ma" http-referrer="https://2m.ma" http-user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:134.0) Gecko/20100101 Firefox/134.0",2M Monde (360p) #EXTVLCOPT:http-referrer=https://2m.ma #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:134.0) Gecko/20100101 Firefox/134.0 https://cdn-globecast.akamaized.net/live/eds/2m_monde/hls_video_ts_tuhawxpiemz257adfc/2m_monde.m3u8 -#EXTINF:-1 tvg-id="AlAoulaInter.ma",Al Aoula International (480p) +#EXTINF:-1 tvg-id="",Al Aoula International (480p) https://cdn.live.easybroadcast.io/abr_corp/73_aloula_w1dqfwm/playlist_dvr.m3u8 #EXTINF:-1 tvg-id="LaayouneTV.ma",Al Aoula Laâyoune (480p) https://cdn.live.easybroadcast.io/abr_corp/73_laayoune_pgagr52/playlist_dvr.m3u8 @@ -37,7 +39,5 @@ https://streaming1.medi1tv.com/live/smil:medi1tv.smil/playlist.m3u8 https://streaming2.medi1tv.com/live/smil:medi1tv.smil/playlist.m3u8 #EXTINF:-1 tvg-id="TamazightTV.ma",Tamazight (480p) https://cdn.live.easybroadcast.io/abr_corp/73_tamazight_tccybxt/playlist_dvr.m3u8 -#EXTINF:-1 tvg-id="2MMonde.ma",2M Monde (720p) -https://d3g87jnubafe6a.cloudfront.net/out/v1/1fa0fb3c8dec402994a6f7a7f6492b82/index.m3u8 #EXTINF:-1 tvg-id="TeleMaroc.ma",Tele Maroc (720p) https://raw.githubusercontent.com/ipstreet312/freeiptv/master/ressources/kuw/telmar.m3u8 diff --git a/streams/mc.m3u b/streams/mc.m3u index 7377e229c9..bd32f44246 100644 --- a/streams/mc.m3u +++ b/streams/mc.m3u @@ -1,7 +1,7 @@ #EXTM3U +#EXTINF:-1 tvg-id="MonacoInfo.mc",Monaco Info (1080p) +https://webtv.monacoinfo.com/live/prod/index.m3u8 #EXTINF:-1 tvg-id="SuperyachtTV.mc",Superyacht TV (1080p) https://sy.wns.live/hls/stream.m3u8 #EXTINF:-1 tvg-id="TVMonaco.mc",TV Monaco (1080p) https://production-fast-mcrtv.content.okast.tv/channels/2116dc08-1959-465d-857f-3619daefb66b/b702b2b9-aebd-436c-be69-2118f56f3d86/2024/media.m3u8 -#EXTINF:-1 tvg-id="MonacoInfo.mc",Monaco Info (1080p) -https://webtv.monacoinfo.com/live/prod/index.m3u8 diff --git a/streams/md.m3u b/streams/md.m3u index 81bbc26c55..9a7e667132 100644 --- a/streams/md.m3u +++ b/streams/md.m3u @@ -22,9 +22,9 @@ http://62.233.57.226:8001/play/a00i #EXTINF:-1 tvg-id="Moldova1.md",Moldova 1 (1080p) https://v0.trm.md/static/streaming-playlists/hls/9b79338b-1870-4cd7-91d4-0f6ce5cac7ca/master.m3u8 #EXTINF:-1 tvg-id="Moldova2.md",Moldova 2 (1080p) -https://v0.trm.md/static/streaming-playlists/hls/d5fafab0-9c37-4746-9e7a-b2d6c0427015/master.m3u8 -#EXTINF:-1 tvg-id="Moldova2.md",Moldova 2 (1080p) http://62.233.57.226:8001/play/a00a +#EXTINF:-1 tvg-id="Moldova2.md",Moldova 2 (1080p) +https://v0.trm.md/static/streaming-playlists/hls/d5fafab0-9c37-4746-9e7a-b2d6c0427015/master.m3u8 #EXTINF:-1 tvg-id="MoldovaTV.md",Moldova TV (576p) [Not 24/7] http://89.38.8.130:39435 #EXTINF:-1 tvg-id="N4.md",N4 (1080p) diff --git a/streams/mt_smash_plus.m3u b/streams/mt_smashplus.m3u similarity index 96% rename from streams/mt_smash_plus.m3u rename to streams/mt_smashplus.m3u index e92ef5ab1b..5438006b26 100644 --- a/streams/mt_smash_plus.m3u +++ b/streams/mt_smashplus.m3u @@ -1,5 +1,5 @@ #EXTM3U -#EXTINF:-1 tvg-id="AlJazeeraEnglish.qa",Al Jazeera Live (English) [Geo-blocked] +#EXTINF:-1 tvg-id="",Al Jazeera Live (English) [Geo-blocked] http://80.79.6.221:25461/smash/public/30 #EXTINF:-1 tvg-id="AlmaTV.it",AlmaTV [Geo-blocked] http://80.79.6.221:25461/smash/public/27 diff --git a/streams/mx.m3u b/streams/mx.m3u index c07e521371..4c90621420 100644 --- a/streams/mx.m3u +++ b/streams/mx.m3u @@ -150,7 +150,7 @@ https://channel02-notusa.akamaized.net/hls/live/2023914/event01/index.m3u8 #EXTINF:-1 tvg-id="GikTVMX.mx" http-referrer="https://giktvmx.g3radio.mx",GikTVMx (480p) #EXTVLCOPT:http-referrer=https://giktvmx.g3radio.mx https://pistream.ddns.net/hls/stream.m3u8 -#EXTINF:-1 tvg-id="GoldenEdgePanregional.mx",Golden Edge Panregional (576p) +#EXTINF:-1 tvg-id="GoldenEdge.mx@Panregional",Golden Edge Panregional (576p) https://linear-407.frequency.stream/mt/studio/407/hls/master/playlist.m3u8 #EXTINF:-1 tvg-id="GoldenMultiplex.mx",Golden Multiplex (576p) https://linear-409.frequency.stream/mt/studio/409/hls/master/playlist.m3u8 @@ -188,9 +188,9 @@ https://5fa5de1a545ae.streamlock.net/8010/8010/playlist.m3u8 https://cloudvideo.servers10.com:8081/8128/index.m3u8 #EXTINF:-1 tvg-id="LasEstrellas.mx",Las Estrellas (1080p) https://channel01-onlymex.akamaized.net/hls/live/2022749/event01/index.m3u8 -#EXTINF:-1 tvg-id="LasEstrellasPlus1.mx",Las Estrellas +1 (1080p) +#EXTINF:-1 tvg-id="LasEstrellas.mx@Plus1",Las Estrellas +1 (1080p) https://linear-414.frequency.stream/mt/studio/414/hls/master/playlist.m3u8 -#EXTINF:-1 tvg-id="LasEstrellasPlus2.mx",Las Estrellas +2 (1080p) +#EXTINF:-1 tvg-id="LasEstrellas.mx@Plus2",Las Estrellas +2 (1080p) https://linear-415.frequency.stream/mt/studio/415/hls/master/playlist.m3u8 #EXTINF:-1 tvg-id="LoboTV.mx",Lobo TV (720p) https://5ca3e84a76d30.streamlock.net/tvlobo/videotvlobo/playlist.m3u8 @@ -366,10 +366,10 @@ https://d1sx1b16qowo88.cloudfront.net/out/v1/c278fcc434d1437eb31ff105c6b4a538/in https://5e50264bd6766.streamlock.net/telemetrika2/smil:telemetrika2.smil/playlist.m3u8 #EXTINF:-1 tvg-id="UMTV.mx",UMTV (1080p) [Not 24/7] https://60417ddeaf0d9.streamlock.net/montemorelos/videomontemorelos/playlist.m3u8 -#EXTINF:-1 tvg-id="VBMediaTV.mx",VB Media TV -https://stream8.mexiserver.com:19360/vbmediatv-1/vbmediatv-1.m3u8 #EXTINF:-1 tvg-id="VBMediaTV.mx",VB Media TV (1080p) https://capomo01-enitv.eninetworks.com/locales_vbmedia_publico/index.m3u8 +#EXTINF:-1 tvg-id="VBMediaTV.mx",VB Media TV +https://stream8.mexiserver.com:19360/vbmediatv-1/vbmediatv-1.m3u8 #EXTINF:-1 tvg-id="VeracruzMultimediosTV.mx",Veracruz Multimedios TV (720p) https://stream.oursnetworktv.com/latin/VeracruZMulTimedios/playlist.m3u8 #EXTINF:-1 tvg-id="VideaPlataforma.mx",Videa Plataforma (576p) [Not 24/7] diff --git a/streams/mx_pluto.m3u b/streams/mx_pluto.m3u index 0ece119fd1..530936b703 100644 --- a/streams/mx_pluto.m3u +++ b/streams/mx_pluto.m3u @@ -73,7 +73,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5c01df175 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f99a772c54853000797bf18/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId= #EXTINF:-1 tvg-id="PlutoTVMinutoParaGanar.us",Pluto TV Minuto Para Ganar (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e46e64dc73db400094b5f0b/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId= -#EXTINF:-1 tvg-id="PlutoTVMisterios.br",Pluto TV Misterios (480p) +#EXTINF:-1 tvg-id="PlutoTVMisterios.us@Mexico",Pluto TV Misterios (480p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dcde2f53449c50009b2b4dc/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId= #EXTINF:-1 tvg-id="PlutoTVMisteriosMedicos.us",Pluto TV Misterios Medicos (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f230e416b68ff00075b0139/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId= diff --git a/streams/my.m3u b/streams/my.m3u index 1c73198ba8..3980fed75f 100644 --- a/streams/my.m3u +++ b/streams/my.m3u @@ -1,4 +1,6 @@ #EXTM3U +#EXTINF:-1 tvg-id="8TV.my",8TV +https://tonton-live-switch-ssar.akamaized.net/stream-8tv/master.m3u8?bpkio_serviceid=6c0958d82a830a02ca0936d9cfab8311 #EXTINF:-1 tvg-id="AstroAwani.my",Astro Awani (720p) https://d2idp3hzkhjpih.cloudfront.net/out/v1/4b85d9c2bf97413eb0c9fd875599b837/index.m3u8 #EXTINF:-1 tvg-id="AwesomeTV.my",Awesome TV [Geo-blocked] @@ -14,6 +16,8 @@ http://210.210.155.35/dr9445/h/h04/index.m3u8 http://210.210.155.37/uq2663/h/h22/index.m3u8 #EXTINF:-1 tvg-id="MaahTV.my",Maah TV (720p) [Not 24/7] https://hls.maahtv.live/hls/stream.m3u8 +#EXTINF:-1 tvg-id="NTV7.my",NTV7 +https://tonton-live-switch-ssar.akamaized.net/stream-ntv7/master.m3u8?bpkio_serviceid=6c0958d82a830a02ca0936d9cfab8311 #EXTINF:-1 tvg-id="Okey.my" http-referrer="https://rtm-player.glueapi.io/",Okey [Geo-blocked] #EXTVLCOPT:http-referrer=https://rtm-player.glueapi.io/ https://d25tgymtnqzu8s.cloudfront.net/smil:okey/playlist.m3u8?id=3 @@ -25,15 +29,15 @@ https://d25tgymtnqzu8s.cloudfront.net/smil:negara/playlist.m3u8?id=8 #EXTINF:-1 tvg-id="RTMParlimenDewanRakyat.my" http-referrer="https://rtm-player.glueapi.io/",RTM Parlimen (Dewan Rakyat) [Geo-blocked] #EXTVLCOPT:http-referrer=https://rtm-player.glueapi.io/ https://d25tgymtnqzu8s.cloudfront.net/smil:rakyat/playlist.m3u8?id=7 -#EXTINF:-1 tvg-id="TV1.my",TV1 [Geo-blocked] -https://d25tgymtnqzu8s.cloudfront.net/smil:tv1/manifest.mpd -#EXTINF:-1 tvg-id="TV2.my",TV2 [Geo-blocked] -https://d25tgymtnqzu8s.cloudfront.net/smil:tv2/manifest.mpd #EXTINF:-1 tvg-id="SukanRTM.my",Sukan RTM [Geo-blocked] https://d25tgymtnqzu8s.cloudfront.net/smil:sukan/manifest.mpd +#EXTINF:-1 tvg-id="TV1.my",TV1 [Geo-blocked] +https://d25tgymtnqzu8s.cloudfront.net/smil:tv1/manifest.mpd #EXTINF:-1 tvg-id="TV1.my" http-referrer="https://rtm-player.glueapi.io/",TV1 [Geo-blocked] #EXTVLCOPT:http-referrer=https://rtm-player.glueapi.io/ https://d25tgymtnqzu8s.cloudfront.net/smil:tv1/playlist.m3u8?id=1 +#EXTINF:-1 tvg-id="TV2.my",TV2 [Geo-blocked] +https://d25tgymtnqzu8s.cloudfront.net/smil:tv2/manifest.mpd #EXTINF:-1 tvg-id="TV2.my" http-referrer="https://rtm-player.glueapi.io/",TV2 [Geo-blocked] #EXTVLCOPT:http-referrer=https://rtm-player.glueapi.io/ https://d25tgymtnqzu8s.cloudfront.net/smil:tv2/playlist.m3u8?id=2 @@ -44,9 +48,5 @@ https://tonton-live-switch-ssar.akamaized.net/stream-tv3/master.m3u8?bpkio_servi https://d25tgymtnqzu8s.cloudfront.net/smil:tv6/playlist.m3u8?id=6 #EXTINF:-1 tvg-id="TV9.my",TV9 https://tonton-live-switch-ssar.akamaized.net/stream-tv9/master.m3u8?bpkio_serviceid=6c0958d82a830a02ca0936d9cfab8311 -#EXTINF:-1 tvg-id="8TV.my",8TV -https://tonton-live-switch-ssar.akamaized.net/stream-8tv/master.m3u8?bpkio_serviceid=6c0958d82a830a02ca0936d9cfab8311 -#EXTINF:-1 tvg-id="NTV7.my",NTV7 -https://tonton-live-switch-ssar.akamaized.net/stream-ntv7/master.m3u8?bpkio_serviceid=6c0958d82a830a02ca0936d9cfab8311 #EXTINF:-1 tvg-id="TVIKIM.my",TVIKIM https://edge-sg1.vediostream.com/abr/tvikim/playlist.m3u8 diff --git a/streams/nl_samsung.m3u b/streams/nl_samsung.m3u index 05d82f32f5..6d7c913aa5 100644 --- a/streams/nl_samsung.m3u +++ b/streams/nl_samsung.m3u @@ -3,7 +3,7 @@ https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg00353-lionsgatestudio-arewethereyetnl-samsungnl/playlist.m3u8 #EXTINF:-1 tvg-id="BloombergQuicktake.us",Bloomberg Quicktake https://bloomberg-quicktake-1-nl.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="BloombergTVPlus.us",Bloomberg TV+ +#EXTINF:-1 tvg-id="",Bloomberg TV+ https://bloomberg-bloombergtv-3-nl.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="DiscoverFilm.uk",DiscoverFilm https://discoverfilm-discoverfilm-1-nl.samsung.wurl.tv/playlist.m3u8 @@ -27,21 +27,21 @@ https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01492-secomsasmediart-museumtv-eng- https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01255-secomcofites-my-myzen-samsungen-samsungnl/playlist.m3u8 #EXTINF:-1 tvg-id="",Radical Docs https://quintus-radicaldocs-1-nl.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Rakuten Action +#EXTINF:-1 tvg-id="RakutenTVActionMovies.es@Netherlands",Rakuten Action https://rakuten-action-8-nl.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Rakuten Comedy +#EXTINF:-1 tvg-id="RakutenTVComedyMovies.es@Netherlands",Rakuten Comedy https://rakuten-comedy-8-nl.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Rakuten Drama +#EXTINF:-1 tvg-id="RakutenTVDramaMovies.es@Netherlands",Rakuten Drama https://rakuten-drama-8-nl.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Rakuten Family +#EXTINF:-1 tvg-id="RakutenTVFamilyMovies.es@Netherlands",Rakuten Family https://rakuten-family-8-nl.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Rakuten Stories +#EXTINF:-1 tvg-id="RakutenTVRakutenStories.es@Netherlands",Rakuten Stories https://rakuten-spotlight-8-nl.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="ReutersTV.us",Reuters Now https://reuters-reutersnow-1-nl.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="SofyTV.ch",Sofy TV https://cdn-uw2-prod.tsv2.amagi.tv/linear/amg00535-largofilmsltdli-sofytvnl-samsungnl/playlist.m3u8 -#EXTINF:-1 tvg-id="Strongman.de",Strongman Champions League +#EXTINF:-1 tvg-id="StrongmanChampionsLeague.pl@SD",Strongman Champions League https://rightsboosterltd-scl-1-nl.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="TennisChannel.us",Tennis Channel https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01444-tennischannelth-tennischannelnl-samsungnl/playlist.m3u8 diff --git a/streams/nz.m3u b/streams/nz.m3u index ff50dfb0be..c14b67453c 100644 --- a/streams/nz.m3u +++ b/streams/nz.m3u @@ -1,5 +1,5 @@ #EXTM3U -#EXTINF:-1 tvg-id="BravoPlus1.nz",Bravo +1 +#EXTINF:-1 tvg-id="Bravo.nz@Plus1",Bravo +1 https://i.mjh.nz/.r/bravo-plus1.m3u8 #EXTINF:-1 tvg-id="Channel200.nz",Channel 200 (540p) https://d1jlnqid3sfc6m.cloudfront.net/out/v1/3fc2254c865a457c8d7fbbce227a2aae/index.m3u8 @@ -15,7 +15,7 @@ https://84e619480232400a842ce499d053458a.mediatailor.us-east-1.amazonaws.com/v1/ https://ptvlive.kordia.net.nz/out/v1/daf20b9a9ec5449dadd734e50ce52b74/index.m3u8 #EXTINF:-1 tvg-id="SkyOpen.nz",Sky Open (1080p) [Geo-blocked] https://primetv-prod.akamaized.net/v1/prime-freeview-aes128.m3u8 -#EXTINF:-1 tvg-id="SkyOpenPlus1.nz",Sky open +1 (576p) [Geo-blocked] +#EXTINF:-1 tvg-id="SkyOpen.nz@Plus1",Sky open +1 (576p) [Geo-blocked] https://linear-p.media.skyone.co.nz/primeplus1.clear.m3u8 #EXTINF:-1 tvg-id="TeReo.nz",Te Reo https://i.mjh.nz/.r/te-reo.m3u8 diff --git a/streams/nz_samsung.m3u b/streams/nz_samsung.m3u index 8e43dc02b0..f8254c16cc 100644 --- a/streams/nz_samsung.m3u +++ b/streams/nz_samsung.m3u @@ -11,7 +11,7 @@ https://bloomberg-bloomberg-2-nz.samsung.wurl.tv/playlist.m3u8 https://bountyfilms-bounty-1-nz.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",CineView https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg01076-lightningintern-rialto-samsungnz/playlist.m3u8 -#EXTINF:-1 tvg-id="ClubbingTV.fr",Clubbing TV +#EXTINF:-1 tvg-id="ClubbingTV.us@NewZealand",Clubbing TV https://clubbingtv-samsungnz.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",Drybar Comedy https://drybar-drybarcomedy-1-nz.samsung.wurl.tv/playlist.m3u8 @@ -21,7 +21,7 @@ https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00219-gunpowdersky-dustintlnz-sam https://euronews-euronews-world-1-nz.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="GBNews.uk",GB News https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg01076-lightningintern-gbnewsnz-samsungnz/playlist.m3u8 -#EXTINF:-1 tvg-id="",Gusto TV +#EXTINF:-1 tvg-id="GustoTV.ca@SD",Gusto TV https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg01077-gustoworldwidem-gustotvnz-samsungnz/playlist.m3u8 #EXTINF:-1 tvg-id="HorseCountryTV.uk",Horse and Country Free https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00810-horsecountrytvl-hncfreenz-samsungnz/playlist.m3u8 diff --git a/streams/pe.m3u b/streams/pe.m3u index 253bdd4150..c7c1559917 100644 --- a/streams/pe.m3u +++ b/streams/pe.m3u @@ -151,7 +151,9 @@ https://7.innovatestream.pe:19360/radionovastar/radionovastar.m3u8 https://7.innovatestream.pe:19360/oasisrtv/oasisrtv.m3u8 #EXTINF:-1 tvg-id="OKTeVe.pe",OK TeVe (720p) [Not 24/7] https://stream.plixitv.live/oktv/oktv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Onda Digital (720p) [Not 24/7] +#EXTINF:-1 tvg-id="ONDADIGITAL.pe",ONDA DIGITAL (720p) +https://tv.ondadigital.pe/ondadigital/index.m3u8 +#EXTINF:-1 tvg-id="ONDADIGITAL.pe@SD",Onda Digital (720p) [Not 24/7] https://tv.ondadigital.pe:1936/ondatv2/ondatv2/playlist.m3u8 #EXTINF:-1 tvg-id="OvacionTV.pe",Ovacion TV (720p) [Not 24/7] http://cdn2.ujjina.com:1935/iptvovacion1/liveovacion1tv/playlist.m3u8 @@ -303,5 +305,3 @@ https://live.obslivestream.com/wtv/index.m3u8 https://vdo.panelchs.com:3927/live/xtvcontrollive.m3u8 #EXTINF:-1 tvg-id="",X TV Zona Film https://vdo.panelchs.com:3769/live/vdo54575151live.m3u8 -#EXTINF:-1 tvg-id="ONDADIGITAL.pe",ONDA DIGITAL (720p) -https://tv.ondadigital.pe/ondadigital/index.m3u8 diff --git a/streams/pk.m3u b/streams/pk.m3u index 93bb1af544..4214b68126 100644 --- a/streams/pk.m3u +++ b/streams/pk.m3u @@ -5,7 +5,7 @@ http://92news.vdn.dstreamone.net/92newshd/92hd/playlist.m3u8 https://securecontributions.sechls01.visionip.tv/live/securecontributions-securecontributions-92_news-hsslive-25f-16x9-SD/chunklist.m3u8 #EXTINF:-1 tvg-id="AlEhsaanTV.pk",Al Ehsaan TV (720p) https://cdn.bmstudiopk.com/alehsaan/live/playlist.m3u8 -#EXTINF:-1 tvg-id="ARYDigitalUSA.us" http-referrer="https://live.arydigital.tv/",ARY Digital USA (720p) [Not 24/7] +#EXTINF:-1 tvg-id="ARYDigital.pk@USA" http-referrer="https://live.arydigital.tv/",ARY Digital USA (720p) [Not 24/7] #EXTVLCOPT:http-referrer=https://live.arydigital.tv/ https://6zklx4wryw9b-hls-live.5centscdn.com/arydigitalusa/498f1704b692c3ad4dbfdf5ba5d04536.sdp/playlist.m3u8 #EXTINF:-1 tvg-id="ARYMusik.pk" http-referrer="https://live.arydigital.tv/",ARY Musik (1080p) diff --git a/streams/pl.m3u b/streams/pl.m3u index 7cd563a6ff..cf594bdb6e 100644 --- a/streams/pl.m3u +++ b/streams/pl.m3u @@ -29,51 +29,51 @@ http://178.219.128.68:64889/ACTIFAMIHD http://185.236.229.62:9981/play/a04a #EXTINF:-1 tvg-id="AdventureTV.pl",Adventure TV (1080p) http://109.233.89.170/Adventure_HD/index.m3u8 -#EXTINF:-1 tvg-id="AFVFamily.pl",AFV Family (720p) +#EXTINF:-1 tvg-id="AFVFamily.us@Poland",AFV Family (720p) https://ec4a5bcc9d664b48985de6095931aaa7.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/RakutenTV-eu_AmericasFunniestHomeVideos/playlist.m3u8 #EXTINF:-1 tvg-id="AlfaTVP.pl",Alfa TVP (1080p) http://109.233.89.166/Alfa_TVP_HD/index.m3u8 #EXTINF:-1 tvg-id="AlfaTVP.pl",Alfa TVP (1080p) http://109.233.89.170/Alfa_TVP_HD/index.m3u8 -#EXTINF:-1 tvg-id="AMC.pl",AMC (1080p) +#EXTINF:-1 tvg-id="AMC.us",AMC (1080p) http://109.233.89.166/AMC_HD/index.m3u8 -#EXTINF:-1 tvg-id="AMC.pl",AMC (1080p) +#EXTINF:-1 tvg-id="AMCEurope.uk@Polnad",AMC (1080p) http://109.233.89.170/AMC_HD/index.m3u8 -#EXTINF:-1 tvg-id="AMC.pl",AMC (1080p) +#EXTINF:-1 tvg-id="AMCEurope.uk@Polnad",AMC (1080p) http://178.219.128.68:64889/AMCHD -#EXTINF:-1 tvg-id="AMC.pl",AMC (1080p) +#EXTINF:-1 tvg-id="AMCEurope.uk@Polnad",AMC (1080p) http://185.236.229.62:9981/play/a05g #EXTINF:-1 tvg-id="AntenaHD.pl",Antena HD (1080p) http://109.233.89.170/Antena_TV_HD/index.m3u8 -#EXTINF:-1 tvg-id="AXN.pl",AXN (1080p) +#EXTINF:-1 tvg-id="AXNCEE.es@Poland",AXN (1080p) http://178.219.128.68:64888/AXN -#EXTINF:-1 tvg-id="AXN.pl",AXN (1080p) +#EXTINF:-1 tvg-id="AXNCEE.es@Poland",AXN (1080p) http://185.236.229.62:9981/play/a07s -#EXTINF:-1 tvg-id="AXNBlack.pl",AXN Black (576p) +#EXTINF:-1 tvg-id="AXNBlack.us@Poland",AXN Black (576p) http://185.236.229.62:9981/play/a075 -#EXTINF:-1 tvg-id="AXNSpin.pl",AXN Spin (1080p) +#EXTINF:-1 tvg-id="AXNSpin.hu@Poland",AXN Spin (1080p) http://185.236.229.62:9981/play/a044 -#EXTINF:-1 tvg-id="AXNWhite.pl",AXN White (576p) +#EXTINF:-1 tvg-id="AXNWhite.us@Poland",AXN White (576p) http://185.236.229.62:9981/play/a074 -#EXTINF:-1 tvg-id="BBCBrit.pl",BBC Brit (1080p) +#EXTINF:-1 tvg-id="BBCBrit.uk@Poland",BBC Brit (1080p) http://109.233.89.170/BBC_Brit_HD/index.m3u8 -#EXTINF:-1 tvg-id="BBCBrit.pl",BBC Brit (1080p) +#EXTINF:-1 tvg-id="BBCBrit.uk@Poland",BBC Brit (1080p) http://178.219.128.68:64889/BBCBRITHD -#EXTINF:-1 tvg-id="BBCBrit.pl",BBC Brit (1080p) +#EXTINF:-1 tvg-id="BBCBrit.uk@Poland",BBC Brit (1080p) http://185.236.229.62:9981/play/a06r -#EXTINF:-1 tvg-id="BBCEarth.pl",BBC Earth (1080p) +#EXTINF:-1 tvg-id="BBCEarth.uk@Poland",BBC Earth (1080p) http://109.233.89.170/BBC_Earth_HD/index.m3u8 -#EXTINF:-1 tvg-id="BBCEarth.pl",BBC Earth (1080p) +#EXTINF:-1 tvg-id="BBCEarth.uk@Poland",BBC Earth (1080p) http://178.219.128.68:64888/BBCEARTHD -#EXTINF:-1 tvg-id="BBCEarth.pl",BBC Earth (1080p) +#EXTINF:-1 tvg-id="BBCEarth.uk@Poland",BBC Earth (1080p) http://178.219.128.68:64889/BBCEARTHD -#EXTINF:-1 tvg-id="BBCEarth.pl",BBC Earth (1080p) +#EXTINF:-1 tvg-id="BBCEarth.uk@Poland",BBC Earth (1080p) http://185.236.229.62:9981/play/a02o -#EXTINF:-1 tvg-id="BBCFirst.pl",BBC First (1080p) +#EXTINF:-1 tvg-id="BBCFirst.uk@Poland",BBC First (1080p) http://185.236.229.62:9981/play/a02n -#EXTINF:-1 tvg-id="BBCLifestyle.pl",BBC Lifestyle (1080p) +#EXTINF:-1 tvg-id="BBCLifestyle.uk@Poland",BBC Lifestyle (1080p) http://178.219.128.68:64888/BBCLIFEHD -#EXTINF:-1 tvg-id="BBCLifestyle.pl",BBC Lifestyle (1080p) +#EXTINF:-1 tvg-id="BBCLifestyle.uk@Poland",BBC Lifestyle (1080p) http://185.236.229.62:9981/play/a06t #EXTINF:-1 tvg-id="Bigtime.pl",Bigtime (720p) https://103f01c3ff79408e83c9212f8a374ecc.mediatailor.us-east-1.amazonaws.com/v1/master/0fb304b2320b25f067414d481a779b77db81760d/RakutenTV-eu_BjgtjmeDarmoweFilmy/playlist.m3u8 @@ -99,9 +99,9 @@ http://185.236.229.62:9981/play/a07w http://109.233.89.170/Da_Vinci_HD/index.m3u8 #EXTINF:-1 tvg-id="DaVinci.pl",Da Vinci (576p) http://185.236.229.62:9981/play/a024 -#EXTINF:-1 tvg-id="DAZNCombat.pl",DAZN Combat (1080p) +#EXTINF:-1 tvg-id="DAZNCombat.uk@Poland",DAZN Combat (1080p) https://dazn-combat-rakuten.amagi.tv/hls/amagi_hls_data_rakutenAA-dazn-combat-rakuten/CDN/master.m3u8 -#EXTINF:-1 tvg-id="DAZNWomensFootball.pl",DAZN Women's Football (1080p) +#EXTINF:-1 tvg-id="DAZNWomensFootball.uk@Poland",DAZN Women's Football (1080p) https://dazn-daznwomensfootball-rakuten.amagi.tv/hls/amagi_hls_data_rakutenAA-dazn-daznwomensfootball-rakuten/CDN/master.m3u8 #EXTINF:-1 tvg-id="DiscoPoloMusic.pl",Disco Polo Music (1080p) http://185.236.229.62:9981/play/a078 @@ -174,10 +174,14 @@ https://ddy6new.iosplayer.ru/ddy6/premium428/mono.m3u8 http://109.233.89.166/ELEVEN_SPORTS_4_HD/index.m3u8 #EXTINF:-1 tvg-id="ElevenSports4.pl",Eleven Sports 4 (1080p) http://109.233.89.170/ELEVEN_SPORTS_4_HD/index.m3u8 -#EXTINF:-1 tvg-id="EpicDrama.pl",Epic Drama (1080p) +#EXTINF:-1 tvg-id="EpicDrama.uk@Poland",Epic Drama (1080p) http://185.236.229.62:9981/play/a029 -#EXTINF:-1 tvg-id="EpicDrama.pl",Epic Drama (1080p) +#EXTINF:-1 tvg-id="EpicDrama.uk@Poland",Epic Drama (1080p) http://195.189.60.33:9010/play/a00e +#EXTINF:-1 tvg-id="EskaHitynaCzasie.pl",Eska Hity na Czasie (1080i) +https://s-pl-01.mediatool.tv/playout/espl-abr/index.m3u8 +#EXTINF:-1 tvg-id="EskaRockDobrzeRockuje.pl",Eska Rock Dobrze Rockuje (1080i) +https://s-pl-01.mediatool.tv/playout/erpl-abr/index.m3u8 #EXTINF:-1 tvg-id="EskaRockTV.pl",Eska Rock TV (1080p) http://178.219.128.68:64889/ESKAROCKTV #EXTINF:-1 tvg-id="EskaTV.pl",Eska TV (1080p) @@ -190,39 +194,41 @@ http://178.219.128.68:64888/ESKATVHD http://185.236.229.62:9981/play/a02f #EXTINF:-1 tvg-id="EskaTVExtra.pl",Eska TV Extra (1080p) http://178.219.128.68:64888/ESKATVEXTRHD +#EXTINF:-1 tvg-id="Euronews.pl",Euronews (720p) +https://euronews-live-pol-pl.fast.rakuten.tv/v1/master/0547f18649bd788bec7b67b746e47670f558b6b2/production-LiveChannel-6769/bitok/eyJzdGlkIjoiNDgyYjMzYzEtYmYwYi00NTIzLThlMGMtZGZmY2ZkNjYyMGU1IiwibWt0IjoicGwiLCJjaCI6Njc2OSwicHRmIjo1fQ==/26235/euronews-pl.m3u8 #EXTINF:-1 tvg-id="EWTNPoland.pl",EWTN Poland (1080p) https://cdn3.wowza.com/1/ZHdrMWt1NjlDSzFu/bzdDVG10/hls/live/playlist.m3u8 #EXTINF:-1 tvg-id="EzoTV.pl",Ezo TV (576p) [Not 24/7] http://live.ezotv.pl:1935/live/EZOTV/playlist.m3u8 -#EXTINF:-1 tvg-id="FailArmy.pl",Fail Army (720p) +#EXTINF:-1 tvg-id="FailArmy.us@Poland",Fail Army (720p) https://bd93cfed.wurl.com/master/f36d25e7e52f1ba8d7e56eb859c636563214f541/UmFrdXRlblRWLWV1X0ZhaWxBcm15X0hMUw/playlist.m3u8 #EXTINF:-1 tvg-id="FIFAPlus.pl",FIFA+ (720p) https://a62dad94.wurl.com/master/f36d25e7e52f1ba8d7e56eb859c636563214f541/UmFrdXRlblRWLWV1X0ZJRkFQbHVzRW5nbGlzaF9ITFM/playlist.m3u8 #EXTINF:-1 tvg-id="FightKlub.pl",Fight Klub (1080p) http://185.236.229.62:9981/play/a02l -#EXTINF:-1 tvg-id="FightBox.pl",FightBox (1080p) +#EXTINF:-1 tvg-id="FightBox.nl@Poland",FightBox (1080p) http://185.236.229.62:9981/play/a03n -#EXTINF:-1 tvg-id="FightBox.pl",FightBox (1080p) +#EXTINF:-1 tvg-id="FightBox.nl@Poland",FightBox (1080p) http://195.189.60.33:9002/play/a007 -#EXTINF:-1 tvg-id="FilmBoxAction.pl",FilmBox Action (576p) +#EXTINF:-1 tvg-id="FilmBoxAction.nl@Poland",FilmBox Action (576p) http://185.236.229.62:9981/play/a033 -#EXTINF:-1 tvg-id="FilmBoxAction.pl",FilmBox Action (576p) +#EXTINF:-1 tvg-id="FilmBoxAction.nl@Poland",FilmBox Action (576p) http://195.189.60.33:9004/play/a00g -#EXTINF:-1 tvg-id="FilmBoxArthouse.pl",FilmBox Arthouse (576p) +#EXTINF:-1 tvg-id="FilmBoxArthouse.nl@Poland",FilmBox Arthouse (576p) http://195.189.60.33:9010/play/a00a -#EXTINF:-1 tvg-id="FilmBoxExtra.pl",FilmBox Extra (1080p) +#EXTINF:-1 tvg-id="FilmBoxExtra.nl@Poland",FilmBox Extra (1080p) http://178.219.128.68:64888/FILMEXTRHD -#EXTINF:-1 tvg-id="FilmBoxExtra.pl",FilmBox Extra (1080p) +#EXTINF:-1 tvg-id="FilmBoxExtra.nl@Poland",FilmBox Extra (1080p) http://185.236.229.62:9981/play/a036 -#EXTINF:-1 tvg-id="FilmBoxFamily.pl",FilmBox Family (1080p) +#EXTINF:-1 tvg-id="FilmBoxFamily.nl@Poland",FilmBox Family (1080p) http://178.219.128.68:64888/FILMFAMI -#EXTINF:-1 tvg-id="FilmBoxFamily.pl",FilmBox Family (576p) +#EXTINF:-1 tvg-id="FilmBoxFamily.nl@Poland",FilmBox Family (576p) http://185.236.229.62:9981/play/a032 -#EXTINF:-1 tvg-id="FilmBoxFamily.pl",FilmBox Family (576p) +#EXTINF:-1 tvg-id="FilmBoxFamily.nl@Poland",FilmBox Family (576p) http://185.236.229.62:9981/play/a037 -#EXTINF:-1 tvg-id="FilmBoxPremiumHD.pl",FilmBox Premium HD (1080p) +#EXTINF:-1 tvg-id="FilmBoxPremium.nl@PolandHD",FilmBox Premium HD (1080p) http://178.219.128.68:64888/FILMPREMHD -#EXTINF:-1 tvg-id="FilmBoxPremiumHD.pl",FilmBox Premium HD (1080p) +#EXTINF:-1 tvg-id="FilmBoxPremium.nl@PolandHD",FilmBox Premium HD (1080p) http://185.236.229.62:9981/play/a02x #EXTINF:-1 tvg-id="FokusTV.pl",Fokus TV (1080p) http://178.219.128.68:64889/FOKUTV @@ -248,6 +254,10 @@ http://195.189.60.33:9002/play/a006 https://b6c7c7d1020a4588982ca7c2625f85d1.mediatailor.us-east-1.amazonaws.com/v1/master/0fb304b2320b25f067414d481a779b77db81760d/RakutenTV-eu_GrjngoWesterny/playlist.m3u8 #EXTINF:-1 tvg-id="HardKnocksFightingChampionship.pl",Hard Knocks Fighting Championship (720p) https://d39g1vxj2ef6in.cloudfront.net/v1/manifest/3fec3e5cac39a52b2132f9c66c83dae043dc17d4/prod-rakuten-stitched/2ee2b8d4-acc4-4296-9dc8-66f1ffd0fff8/5.m3u8 +#EXTINF:-1 tvg-id="HiDance.pl",HiDance (1080i) +https://s-pl-01.mediatool.tv/playout/hdpl-abr/index.m3u8 +#EXTINF:-1 tvg-id="HiMusic.pl",HiMusic (1080i) +https://s-pl-01.mediatool.tv/playout/hmpl-abr/index.m3u8 #EXTINF:-1 tvg-id="History.pl",History (1080p) http://109.233.89.166/History_HD/index.m3u8 #EXTINF:-1 tvg-id="History.pl",History (1080p) @@ -276,7 +286,7 @@ http://185.236.229.62:9981/play/a030 http://178.219.128.68:64888/KINOTV #EXTINF:-1 tvg-id="KinoTV.pl",Kino TV (1080p) http://185.236.229.62:9981/play/a031 -#EXTINF:-1 tvg-id="LoneStar.pl",Lone Star (720p) +#EXTINF:-1 tvg-id="LoneStar.us@Poland",Lone Star (720p) https://6b88cde9.wurl.com/master/f36d25e7e52f1ba8d7e56eb859c636563214f541/UmFrdXRlblRWLWV1X0xvbmVTdGFyX0hMUw/playlist.m3u8 #EXTINF:-1 tvg-id="Moconomy.pl",Moconomy (1080p) https://3ee905090d464be5a51478fd9c642e93.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/RakutenTV-pl_Moconomy/playlist.m3u8 @@ -290,6 +300,8 @@ http://185.236.229.62:9981/play/a02r http://109.233.89.166/MTV_Polska_HD/index.m3u8 #EXTINF:-1 tvg-id="MTV.pl",MTV (1080p) http://178.219.128.68:64888/MTVHD +#EXTINF:-1 tvg-id="MuratorTV.pl",Murator TV (1080i) +https://s-pl-01.mediatool.tv/playout/mupl-abr/index.m3u8 #EXTINF:-1 tvg-id="NatGeoPeople.pl",Nat Geo People http://185.236.229.62:9981/play/a06f #EXTINF:-1 tvg-id="NationalGeographic.pl",National Geographic (1080p) @@ -422,6 +434,8 @@ http://109.233.89.170/Polsat_News_Polityka/index.m3u8 http://178.219.128.68:64888/SUPEHD #EXTINF:-1 tvg-id="PolsatNewsPolityka.pl",Polsat News Polityka (1080p) http://185.236.229.62:9981/play/a07h +#EXTINF:-1 tvg-id="PolsatNewsPolityka.pl",Polsat News Polityka (1080p) [Geo-blocked] +https://lb2-e3-20.pluscdn.pl/lv/1511888/322/dash/52a9b70b/live.mpd #EXTINF:-1 tvg-id="PolsatPlay.pl",Polsat Play (1080p) http://109.233.89.166/Polsat_Play_HD/index.m3u8 #EXTINF:-1 tvg-id="PolsatPlay.pl",Polsat Play (1080p) @@ -484,13 +498,15 @@ http://185.236.229.62:9981/play/a07o http://178.219.128.68:64888/POLSVIASNATUHD #EXTINF:-1 tvg-id="PolsatViasatNature.pl",Polsat Viasat Nature (1080p) http://185.236.229.62:9981/play/a06g +#EXTINF:-1 tvg-id="PoradnikZdrowieTV.pl",Poradnik Zdrowie TV (1080i) +https://s-pl-01.mediatool.tv/playout/pzpl-abr/index.m3u8 #EXTINF:-1 tvg-id="Puls2.pl",Puls 2 (1080p) http://178.219.128.68:64889/PULS2HD #EXTINF:-1 tvg-id="Puls2.pl",Puls 2 (1080p) http://185.236.229.62:9981/play/a02y #EXTINF:-1 tvg-id="RadiowaCzworka.pl",Radio Czwórka (1080p) https://stream14.polskieradio.pl/pr4_video/video_pr4.stream/playlist.m3u8 -#EXTINF:-1 tvg-id="RakutenVIKI.pl",Rakuten VIKI (720p) +#EXTINF:-1 tvg-id="RakutenViki.es@Poland",Rakuten VIKI (720p) https://fd18f1cadd404894a31a3362c5f319bd.mediatailor.us-east-1.amazonaws.com/v1/master/04fd913bb278d8775298c26fdca9d9841f37601f/RakutenTV-eu_RakutenViki-1/playlist.m3u8 #EXTINF:-1 tvg-id="RedCarpetTV.pl",Red Carpet TV (1080p) http://185.236.229.62:9981/play/a02q @@ -504,6 +520,10 @@ http://109.233.89.166/Romance_TV_HD/index.m3u8 http://109.233.89.170/Romance_TV_HD/index.m3u8 #EXTINF:-1 tvg-id="RomanceTV.pl",Romance TV (1080p) http://185.236.229.62:9981/play/a05j +#EXTINF:-1 tvg-id="Royalworld.pl",Royalworld (720p) +https://ac76260b1102416c93f3d20958bfeb4b.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/RakutenTV-pl_Royalworld/playlist.m3u8 +#EXTINF:-1 tvg-id="SAYHi.pl",SAYHi (1080i) +https://s-pl-01.mediatool.tv/playout/shpl-abr/index.m3u8 #EXTINF:-1 tvg-id="SciFi.pl",Sci Fi (1080p) http://109.233.89.166/SciFi_HD/index.m3u8 #EXTINF:-1 tvg-id="SciFi.pl",Sci Fi (1080p) @@ -528,6 +548,8 @@ http://178.219.128.68:64889/STOPTV http://185.236.229.62:9981/play/a023 #EXTINF:-1 tvg-id="SundanceTV.pl",Sundance TV (1080p) http://185.236.229.62:9981/play/a03i +#EXTINF:-1 tvg-id="SuperExpressTV.pl",Super Express TV (1080i) +https://s-pl-01.mediatool.tv/playout/sepl-abr/index.m3u8 #EXTINF:-1 tvg-id="SuperPolsat.pl",Super Polsat (1080p) http://109.233.89.166/Super_Polsat_HD/index.m3u8 #EXTINF:-1 tvg-id="SuperPolsat.pl",Super Polsat (1080p) @@ -562,7 +584,7 @@ https://cdn01.sesja.pl/live_tvjaslo/live_tvjaslo.stream/playlist.m3u8 http://stream.herissons.cloud/hls/tvluban.m3u8 #EXTINF:-1 tvg-id="TelewizjaTorun.pl",Telewizja Toruń (1080p) [Not 24/7] http://217.173.176.107:1935/live/ngrp:tvk.stream_mobile/chunks.m3u8 -#EXTINF:-1 tvg-id="ThePetCollective.pl",The Pet Collective (720p) +#EXTINF:-1 tvg-id="ThePetCollective.us@Poland",The Pet Collective (720p) https://6ec8627d.wurl.com/master/f36d25e7e52f1ba8d7e56eb859c636563214f541/UmFrdXRlblRWLWV1X1RoZVBldENvbGxlY3RpdmVfSExT/playlist.m3u8 #EXTINF:-1 tvg-id="TNAWrestlingChannel.pl",TNA Wrestling Channel (720p) https://d39g1vxj2ef6in.cloudfront.net/v1/master/3fec3e5cac39a52b2132f9c66c83dae043dc17d4/prod-rakuten-stitched/master.m3u8?ads.xumo_channelId=88883039 @@ -570,6 +592,8 @@ https://d39g1vxj2ef6in.cloudfront.net/v1/master/3fec3e5cac39a52b2132f9c66c83dae0 https://amg17560-fcb-amg17560c1-rakuten-uk-4891.playouts.now.amagi.tv/playlist/amg17560-fcbarcelona-topbarcaenglish-rakutenuk/playlist.m3u8 #EXTINF:-1 tvg-id="TopMoviesPolska.pl",Top Movies Polska (720p) https://d14678b7277b4f21964f367309c8f3e2.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/RakutenTV-pl_TopMoviesPolska/playlist.m3u8 +#EXTINF:-1 tvg-id="TopMoviesPolska.pl",Top Movies Polska (1080i) +https://top-movies-rakuten-tv-pl.fast.rakuten.tv/v1/master/0547f18649bd788bec7b67b746e47670f558b6b2/production-LiveChannel-6059/master.m3u8 #EXTINF:-1 tvg-id="TrusoTV.pl",Truso TV (576p) [Not 24/7] https://stream.truso.tv/elblag/myStream_aac/playlist.m3u8 #EXTINF:-1 tvg-id="TV4.pl",TV4 (1080p) @@ -634,6 +658,8 @@ http://109.233.89.170/TVP1_HD/index.m3u8 http://178.219.128.68:64889/TVP1HD #EXTINF:-1 tvg-id="TVP1.pl",TVP1 (1080p) https://ec06-krk3.cache.orange.pl/dai4/org1/vb/104/tvp1hd/index.m3u8 +#EXTINF:-1 tvg-id="TVP1.pl",TVP1 (1080i) +http://nowatv.stream2.link:8080/live/64:1c:b0:a1:48:c1/tfAjswfz6H/172c116f-0e21-4c80-9146-327a2ee05918.ts #EXTINF:-1 tvg-id="TVP2.pl",TVP2 (1080p) http://109.233.89.166/TVP2_HD/index.m3u8 #EXTINF:-1 tvg-id="TVP2.pl",TVP2 (1080p) @@ -768,6 +794,8 @@ https://da9c49fa.wurl.com/master/f36d25e7e52f1ba8d7e56eb859c636563214f541/UmFrdX http://185.236.229.62:9981/play/a051 #EXTINF:-1 tvg-id="VOXMusicTV.pl",VOX Music TV (576p) http://109.233.89.166/VOX/index.m3u8 +#EXTINF:-1 tvg-id="VoxwRytmieHitow.pl",Vox w Rytmie Hitow (1080i) +https://s-pl-01.mediatool.tv/playout/vxpl-abr/index.m3u8 #EXTINF:-1 tvg-id="WPolscePL.pl",W Polsce PL (1080p) http://109.233.89.170/wPolsce.PL/index.m3u8 #EXTINF:-1 tvg-id="WPolscePL.pl",W Polsce PL (576p) @@ -778,7 +806,7 @@ http://185.236.229.62:9981/play/a022 https://9a81dd4ee3884d0dbcacafaf0d81327a.mediatailor.us-east-1.amazonaws.com/v1/master/04fd913bb278d8775298c26fdca9d9841f37601f/RakutenTV-eu_BilliardsTV/playlist.m3u8 #EXTINF:-1 tvg-id="WorldofFreesports.pl",World of Freesports (1080p) https://rakutenaa-mainstreammediafreesportsintl-rakuten-t7dc0.amagi.tv/playlist/rakutenAA-mainstreammediafreesportsintl-rakuten/playlist.m3u8 -#EXTINF:-1 tvg-id="WorldPokerTour.pl",World Poker Tour (1080p) +#EXTINF:-1 tvg-id="WorldPokerTour.us@Poland",World Poker Tour (1080p) https://d39g1vxj2ef6in.cloudfront.net/v1/manifest/3fec3e5cac39a52b2132f9c66c83dae043dc17d4/prod-rakuten-stitched/15d59f2f-80da-4448-9bce-775cc9f470f7/1.m3u8 #EXTINF:-1 tvg-id="WPTV.pl",WP TV (1080p) http://109.233.89.166/WP_HD/index.m3u8 @@ -800,31 +828,3 @@ http://109.233.89.170/Zoom_TV_HD/index.m3u8 http://178.219.128.68:64889/ZOOMTVHD #EXTINF:-1 tvg-id="ZoomTV.pl",Zoom TV (576p) http://185.236.229.62:9981/play/a02a -#EXTINF:-1 tvg-id="PolsatNewsPolityka.pl",Polsat News Polityka (1080p) [Geo-blocked] -https://lb2-e3-20.pluscdn.pl/lv/1511888/322/dash/52a9b70b/live.mpd -#EXTINF:-1 tvg-id="Royalworld.pl",Royalworld (720p) -https://ac76260b1102416c93f3d20958bfeb4b.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/RakutenTV-pl_Royalworld/playlist.m3u8 -#EXTINF:-1 tvg-id="Euronews.pl",Euronews (720p) -https://euronews-live-pol-pl.fast.rakuten.tv/v1/master/0547f18649bd788bec7b67b746e47670f558b6b2/production-LiveChannel-6769/bitok/eyJzdGlkIjoiNDgyYjMzYzEtYmYwYi00NTIzLThlMGMtZGZmY2ZkNjYyMGU1IiwibWt0IjoicGwiLCJjaCI6Njc2OSwicHRmIjo1fQ%3D%3D/26235/euronews-pl.m3u8 -#EXTINF:-1 tvg-id="TopMoviesPolska.pl",Top Movies Polska (1080i) -https://top-movies-rakuten-tv-pl.fast.rakuten.tv/v1/master/0547f18649bd788bec7b67b746e47670f558b6b2/production-LiveChannel-6059/master.m3u8 -#EXTINF:-1 tvg-id="HiDance.pl",HiDance (1080i) -https://s-pl-01.mediatool.tv/playout/hdpl-abr/index.m3u8 -#EXTINF:-1 tvg-id="HiMusic.pl",HiMusic (1080i) -https://s-pl-01.mediatool.tv/playout/hmpl-abr/index.m3u8 -#EXTINF:-1 tvg-id="SAYHi.pl",SAYHi (1080i) -https://s-pl-01.mediatool.tv/playout/shpl-abr/index.m3u8 -#EXTINF:-1 tvg-id="VoxwRytmieHitow.pl",Vox w Rytmie Hitow (1080i) -https://s-pl-01.mediatool.tv/playout/vxpl-abr/index.m3u8 -#EXTINF:-1 tvg-id="EskaRockDobrzeRockuje.pl",Eska Rock Dobrze Rockuje (1080i) -https://s-pl-01.mediatool.tv/playout/erpl-abr/index.m3u8 -#EXTINF:-1 tvg-id="EskaHitynaCzasie.pl",Eska Hity na Czasie (1080i) -https://s-pl-01.mediatool.tv/playout/espl-abr/index.m3u8 -#EXTINF:-1 tvg-id="PoradnikZdrowieTV.pl",Poradnik Zdrowie TV (1080i) -https://s-pl-01.mediatool.tv/playout/pzpl-abr/index.m3u8 -#EXTINF:-1 tvg-id="MuratorTV.pl",Murator TV (1080i) -https://s-pl-01.mediatool.tv/playout/mupl-abr/index.m3u8 -#EXTINF:-1 tvg-id="SuperExpressTV.pl",Super Express TV (1080i) -https://s-pl-01.mediatool.tv/playout/sepl-abr/index.m3u8 -#EXTINF:-1 tvg-id="TVP1.pl",TVP1 (1080i) -http://nowatv.stream2.link:8080/live/64%3A1c%3Ab0%3Aa1%3A48%3Ac1/tfAjswfz6H/172c116f-0e21-4c80-9146-327a2ee05918.ts diff --git a/streams/ps.m3u b/streams/ps.m3u index 9e19995140..5011cd8fb2 100644 --- a/streams/ps.m3u +++ b/streams/ps.m3u @@ -1,8 +1,8 @@ #EXTM3U -#EXTINF:-1 tvg-id="AjyalTV.ps",Ajyal TV -http://htvajyal.mada.ps:8888/ajyal/index.m3u8 #EXTINF:-1 tvg-id="AjyalTV.ps",Ajyal TV (720p) http://htvmada.mada.ps:8888/ajyal/index.m3u8 +#EXTINF:-1 tvg-id="AjyalTV.ps",Ajyal TV +http://htvajyal.mada.ps:8888/ajyal/index.m3u8 #EXTINF:-1 tvg-id="AlAqsaTV.ps",Al Aqsa Channel (416p) [Not 24/7] http://167.172.161.13/hls/feedspare/6udfi7v8a3eof6nlps6e9ovfrs65c7l7.m3u8 #EXTINF:-1 tvg-id="AlMadina.ps",Al Madina (720p) diff --git a/streams/qa.m3u b/streams/qa.m3u index aa7633e2f8..388aa0a65c 100644 --- a/streams/qa.m3u +++ b/streams/qa.m3u @@ -25,18 +25,18 @@ https://live-hls-apps-ajd-fa.getaj.net/AJD/index.m3u8 https://live-hls-apps-ajd-v3-fa.getaj.net/AJD/index.m3u8 #EXTINF:-1 tvg-id="AlJazeeraDocumentary.qa",Al Jazeera Documentary (1080p) [Geo-blocked] https://live-hls-web-ajd.getaj.net/AJD/index.m3u8 -#EXTINF:-1 tvg-id="AlJazeeraEnglish.qa",Al Jazeera English -https://d1cy85syyhvqz5.cloudfront.net/v1/master/7b67fbda7ab859400a821e9aa0deda20ab7ca3d2/aljazeeraLive/AJE/index.m3u8 -#EXTINF:-1 tvg-id="AlJazeeraEnglish.qa",Al Jazeera English (1080p) +#EXTINF:-1 tvg-id="AlJazeera.qa@English",Al Jazeera English (1080p) https://d35j504z0x2vu2.cloudfront.net/v1/master/0bc8e8376bd8417a1b6761138aa41c26c7309312/al-jazeera-english/playlist.m3u8 -#EXTINF:-1 tvg-id="AlJazeeraEnglish.qa",Al Jazeera English (1080p) +#EXTINF:-1 tvg-id="AlJazeera.qa@English",Al Jazeera English (1080p) https://live-hls-apps-aje-fa.getaj.net/AJE/index.m3u8 -#EXTINF:-1 tvg-id="AlJazeeraEnglish.qa",Al Jazeera English (1080p) +#EXTINF:-1 tvg-id="AlJazeera.qa@English",Al Jazeera English (1080p) https://live-hls-apps-aje-v3-fa.getaj.net/AJE/index.m3u8 -#EXTINF:-1 tvg-id="AlJazeeraEnglish.qa",Al Jazeera English (1080p) +#EXTINF:-1 tvg-id="AlJazeera.qa@English",Al Jazeera English (1080p) https://live-hls-v3-aje.getaj.net/AJE-V3/index.m3u8 -#EXTINF:-1 tvg-id="AlJazeeraEnglish.qa",Al Jazeera English (1080p) +#EXTINF:-1 tvg-id="AlJazeera.qa@English",Al Jazeera English (1080p) https://live-hls-web-aje.getaj.net/AJE/index.m3u8 +#EXTINF:-1 tvg-id="AlJazeera.qa@English",Al Jazeera English +https://d1cy85syyhvqz5.cloudfront.net/v1/master/7b67fbda7ab859400a821e9aa0deda20ab7ca3d2/aljazeeraLive/AJE/index.m3u8 #EXTINF:-1 tvg-id="AlJazeeraMubasher.qa",Al Jazeera Mubasher (1080p) https://live-hls-apps-ajm-fa.getaj.net/AJM/index.m3u8 #EXTINF:-1 tvg-id="AlJazeeraMubasher.qa",Al Jazeera Mubasher (1080p) @@ -77,11 +77,11 @@ https://liveakgr.alkassdigital.net/hls/live/2097037/Alkass6buzat/master.m3u8 https://liveakgr.alkassdigital.net/hls/live/2097037/Alkass3vak/master.m3u8 #EXTINF:-1 tvg-id="AlkassTwo.qa",Alkass Two (1080p) https://liveakgr.alkassdigital.net/hls/live/2097037/Alkass2hef/master.m3u8 -#EXTINF:-1 tvg-id="QatarTelevision.qa",Qatar Television (720p) -https://qatartv.akamaized.net/hls/live/2026573/qtv1/master.m3u8 -#EXTINF:-1 tvg-id="QatarTelevision2.qa",Qatar Television 2 (720p) -https://qatartv.akamaized.net/hls/live/2026574/qtv2/master.m3u8 -#EXTINF:-1 tvg-id="QatarTelevision2.qa",Qatar Television 2 (1080p) -https://live.kwikmotion.com/qtv2live/qtv2.smil/playlist.m3u8 #EXTINF:-1 tvg-id="QatarTelevision.qa",Qatar Television (1080p) https://live.kwikmotion.com/qtv1live/qtv1.smil/playlist.m3u8 +#EXTINF:-1 tvg-id="QatarTelevision.qa",Qatar Television (720p) +https://qatartv.akamaized.net/hls/live/2026573/qtv1/master.m3u8 +#EXTINF:-1 tvg-id="QatarTelevision2.qa",Qatar Television 2 (1080p) +https://live.kwikmotion.com/qtv2live/qtv2.smil/playlist.m3u8 +#EXTINF:-1 tvg-id="QatarTelevision2.qa",Qatar Television 2 (720p) +https://qatartv.akamaized.net/hls/live/2026574/qtv2/master.m3u8 diff --git a/streams/ru.m3u b/streams/ru.m3u index 6fd79cf094..92592c5add 100644 --- a/streams/ru.m3u +++ b/streams/ru.m3u @@ -99,7 +99,7 @@ http://igi-hls.cdnvideo.ru/igi/igi_tcode/playlist.m3u8 http://serv25.vintera.tv:8081/test/k16/playlist.m3u8 #EXTINF:-1 tvg-id="KabbalaTV.ru",Каббала ТВ (360p) [Not 24/7] https://edge2.uk.kab.tv/live/tvrus-rus-medium/playlist.m3u8 -#EXTINF:-1 tvg-id="KinopremyeraHD.ru",Кинопремьера HD +#EXTINF:-1 tvg-id="Kinopremyera.ru@HD",Кинопремьера HD http://45.159.74.13/Kinopremera/index.m3u8 #EXTINF:-1 tvg-id="RedLine.ru",Красная линия http://s55766.cdn.ngenix.net/s55766-media-origin/rline_high/index.m3u8 @@ -123,11 +123,11 @@ https://live.trkmillet.ru/millet/index.m3u8 http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv_2500/playlist.m3u8 #EXTINF:-1 tvg-id="Mir24.ru",Мир 24 (1080p) http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mir24_2500/playlist.m3u8 -#EXTINF:-1 tvg-id="MirPlus2.ru",Мир +2 (540p) [Not 24/7] +#EXTINF:-1 tvg-id="Mir.ru@Plus2",Мир +2 (540p) [Not 24/7] http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv2_2500/playlist.m3u8 -#EXTINF:-1 tvg-id="MirPlus4.ru",Мир +4 (540p) [Not 24/7] +#EXTINF:-1 tvg-id="Mir.ru@Plus4",Мир +4 (540p) [Not 24/7] http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv3_2500/playlist.m3u8 -#EXTINF:-1 tvg-id="MirPlus7.ru",Мир +7 (540p) +#EXTINF:-1 tvg-id="Mir.ru@Plus7",Мир +7 (540p) http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv7_2500/playlist.m3u8 #EXTINF:-1 tvg-id="MirBelogorya.ru",Мир Белагорья (720p) [Geo-blocked] http://mirbelogorya.ru:8080/mirbelogorya/index.m3u8 @@ -145,7 +145,7 @@ http://sirius.greenhosting.ru/MultimaniaRu/video.m3u8 https://live-tvhope.cdnvideo.ru/tvhope-pull/tvhope_1/playlist.m3u8 #EXTINF:-1 tvg-id="HopeChannelRussia.ru",Надежда (720p) https://tvhope.cdnvideo.ru/tvhope-pull/tvhope_1/playlist.m3u8 -#EXTINF:-1 tvg-id="NanoHD.ru",Нано ТВ HD +#EXTINF:-1 tvg-id="Nano.ru@HD",Нано ТВ HD http://s1.tv-nano.com/Nano_rec/index.m3u8 #EXTINF:-1 tvg-id="NVKSakha.ru",НВК Саха (1080p) [Not 24/7] https://live-saha.cdnvideo.ru/saha/saha/playlist.m3u8 @@ -159,14 +159,14 @@ https://live-ntm13.cdnvideo.ru/ntm13/smil:ntm13.smil/playlist.m3u8 https://peqk71plnjy.a.trbcdn.net/livemaster/w4kz7pki62_nts_tv/playlist.m3u8 #EXTINF:-1 tvg-id="OSN.ru",ОСН http://osnmedia.servicecdn.ru/streams/17603_88089/playlist.m3u8 -#EXTINF:-1 tvg-id="OstrosyuzhetnoyeHD.ru",Остросюжетное HD +#EXTINF:-1 tvg-id="Ostrosyuzhetnoye.ru@HD",Остросюжетное HD http://213.172.73.133:8081/nimble_live/9009_Остросюжетное_HD/playlist.m3u8 #EXTINF:-1 tvg-id="ChannelOne.ru",Первый канал https://edge1.1internet.tv/dash-live2/streams/1tv-dvr/1tvdash.mpd #EXTINF:-1 tvg-id="Pobeda.ru" http-referrer="https://pobeda.tv/",Победа (720p) #EXTVLCOPT:http-referrer=https://pobeda.tv/ https://pkvc-hls3.cdnvideo.ru/Pobeda/smil:Pobeda.smil/chunklist_b5128000_slru.m3u8 -#EXTINF:-1 tvg-id="PremialnoeHD.ru",Премиальное HD +#EXTINF:-1 tvg-id="Premialnoe.ru@HD",Премиальное HD http://213.172.73.133:8081/nimble_live/9008_Премиальное_HD/playlist.m3u8 #EXTINF:-1 tvg-id="Prima.ru",Прима (1080p) https://tele2dvrnat01-02.cdnvideo.ru/stream/NAT_Prima/hls/index.m3u8 diff --git a/streams/ru_bonustv.m3u b/streams/ru_bonustv.m3u index 6f8c646d39..d8c2da3fc6 100644 --- a/streams/ru_bonustv.m3u +++ b/streams/ru_bonustv.m3u @@ -1,19 +1,19 @@ #EXTM3U #EXTINF:-1 tvg-id="9Volna.ru",9 Волна (Черкесск) http://cdn-01.bonus-tv.ru/9volna/playlist.m3u8 -#EXTINF:-1 tvg-id="Channel12.ru",12 канал -https://12channel.bonus-tv.ru/cdn/12channel_blackout/playlist.m3u8 #EXTINF:-1 tvg-id="Channel12.ru",12 канал (1080p) https://12channel.bonus-tv.ru/cdn/12channel/playlist.m3u8 +#EXTINF:-1 tvg-id="Channel12.ru",12 канал +https://12channel.bonus-tv.ru/cdn/12channel_blackout/playlist.m3u8 #EXTINF:-1 tvg-id="",49 канал (Новосибирск) https://49channel.mediacdn.ru/live/cdn/49channel/playlist.m3u8 #EXTINF:-1 tvg-id="ArirangTV.kr",Arirang https://cdn-01.bonus-tv.ru/arirang_edge/playlist.m3u8 -#EXTINF:-1 tvg-id="",E! +#EXTINF:-1 tvg-id="",E https://cdn-01.bonus-tv.ru/gsl/playlist.m3u8 #EXTINF:-1 tvg-id="Leomax24.ru",Leomax 24 (1080p) https://tvshops.bonus-tv.ru/cdn/shop24/playlist.m3u8 -#EXTINF:-1 tvg-id="RTDocumentaryRussian.ru",RTД +#EXTINF:-1 tvg-id="RTDocumentary.ru@Russian",RTД https://cdn-01.bonus-tv.ru/rtdoc/playlist.m3u8 #EXTINF:-1 tvg-id="RT.ru",Russia Today https://cdn-01.bonus-tv.ru/RussiaToday/playlist.m3u8 diff --git a/streams/ru_ntv.m3u b/streams/ru_ntv.m3u index 1961932db1..217f51b76c 100644 --- a/streams/ru_ntv.m3u +++ b/streams/ru_ntv.m3u @@ -1,15 +1,15 @@ #EXTM3U #EXTINF:-1 tvg-id="UnknownRussia.ru",Неизвестная Россия https://cdn.ntv.ru/unknown_russia/playlist.m3u8 -#EXTINF:-1 tvg-id="",НТВ +1 +#EXTINF:-1 tvg-id="NTV.ru@Plus1",НТВ +1 https://cdn.ntv.ru/ntv1/playlist.m3u8 -#EXTINF:-1 tvg-id="",НТВ +2 +#EXTINF:-1 tvg-id="NTV.ru@Plus2",НТВ +2 https://cdn.ntv.ru/ntv2/playlist.m3u8 -#EXTINF:-1 tvg-id="",НТВ +4 +#EXTINF:-1 tvg-id="NTV.ru@Plus4",НТВ +4 https://cdn.ntv.ru/ntv4/playlist.m3u8 -#EXTINF:-1 tvg-id="",НТВ +7 +#EXTINF:-1 tvg-id="NTV.ru@Plus7",НТВ +7 https://cdn.ntv.ru/ntv7/playlist.m3u8 -#EXTINF:-1 tvg-id="NTVHD.ru",НТВ HD +#EXTINF:-1 tvg-id="NTV.ru@HD",НТВ HD https://cdn.ntv.ru/ntv0/playlist.m3u8 #EXTINF:-1 tvg-id="NTVLaw.ru",НТВ Право https://cdn.ntv.ru/th_pravo/playlist.m3u8 diff --git a/streams/ru_rt.m3u b/streams/ru_rt.m3u index bcc253a104..13c99839be 100644 --- a/streams/ru_rt.m3u +++ b/streams/ru_rt.m3u @@ -3,11 +3,11 @@ https://rt-arb.rttv.com/dvr/rtarab/playlist.m3u8 #EXTINF:-1 tvg-id="RTArabic.ru",RT Arabic (1080p) [Geo-blocked] https://rt-arb.rttv.com/live/rtarab/playlist.m3u8 -#EXTINF:-1 tvg-id="RTDocumentaryEnglish.ru",RT Documentary English (1080p) [Geo-blocked] +#EXTINF:-1 tvg-id="RTDocumentary.ru@English",RT Documentary English (1080p) [Geo-blocked] https://rt-rtd.rttv.com/dvr/rtdoc/playlist.m3u8 -#EXTINF:-1 tvg-id="RTDocumentaryEnglish.ru",RT Documentary English (1080p) [Geo-blocked] +#EXTINF:-1 tvg-id="RTDocumentary.ru@English",RT Documentary English (1080p) [Geo-blocked] https://rt-rtd.rttv.com/live/rtdoc/playlist.m3u8 -#EXTINF:-1 tvg-id="RTDocumentaryRussian.ru",RT Documentary Russian (1080p) +#EXTINF:-1 tvg-id="RTDocumentary.ru@Russian",RT Documentary Russian (1080p) https://hls.rt.com/hls/rtdru.m3u8 #EXTINF:-1 tvg-id="RTenEspanol.ru" http-referrer="https://odysee.com/",RT en Español (1080p) #EXTVLCOPT:http-referrer=https://odysee.com/ diff --git a/streams/ru_televizor-24.m3u b/streams/ru_televizor24.m3u similarity index 94% rename from streams/ru_televizor-24.m3u rename to streams/ru_televizor24.m3u index 18b2611bc7..c1b03e14a0 100644 --- a/streams/ru_televizor-24.m3u +++ b/streams/ru_televizor24.m3u @@ -1,8 +1,8 @@ #EXTM3U -#EXTINF:-1 tvg-id="RTDocumentaryRussian.ru" http-referrer="https://televizor24tochka.ru/",RT Documentary Russian +#EXTINF:-1 tvg-id="RTDocumentary.ru@Russian" http-referrer="https://televizor24tochka.ru/",RT Documentary Russian #EXTVLCOPT:http-referrer=https://televizor24tochka.ru/ https://streaming.skynetconnect.online/live/554.m3u8 -#EXTINF:-1 tvg-id="RTDocumentaryRussian.ru",RT Documentary Russian +#EXTINF:-1 tvg-id="RTDocumentary.ru@Russian",RT Documentary Russian https://streaming.televizor-24-tochka.ru/live/554.m3u8 #EXTINF:-1 tvg-id="Domkino.ru" http-referrer="https://televizor24tochka.ru/",Дом Кино #EXTVLCOPT:http-referrer=https://televizor24tochka.ru/ diff --git a/streams/ru_tvteleport.m3u b/streams/ru_tvteleport.m3u index 00cf084aa9..9b8e2f52ec 100644 --- a/streams/ru_tvteleport.m3u +++ b/streams/ru_tvteleport.m3u @@ -7,7 +7,7 @@ http://31.148.48.15/A2/index.m3u8 http://31.148.48.15/Ani/index.m3u8 #EXTINF:-1 tvg-id="BRIDGE.ru",Bridge http://31.148.48.15/Bridge_TV/index.m3u8 -#EXTINF:-1 tvg-id="NickelodeonCIS.ru",Nickelodeon +#EXTINF:-1 tvg-id="Nickelodeon.ru@SD",Nickelodeon http://31.148.48.15/Nickelodeon/index.m3u8 #EXTINF:-1 tvg-id="Vremya.ru",Время http://31.148.48.15/Vremya/index.m3u8 diff --git a/streams/sa.m3u b/streams/sa.m3u index 611f62218c..ad66a1fd0a 100644 --- a/streams/sa.m3u +++ b/streams/sa.m3u @@ -23,6 +23,8 @@ http://m.live.net.sa:1935/live/quran/gmswf.m3u8 http://m.live.net.sa:1935/live/quran/playlist.m3u8 #EXTINF:-1 tvg-id="AlQuranAlKareemTV.sa",Al Quran Al Kareem TV (360p) https://cdn-globecast.akamaized.net/live/eds/saudi_quran/hls_roku/index.m3u8 +#EXTINF:-1 tvg-id="AlResalah.sa",Al Resalah (1080p) +https://rotana.hibridcdn.net/rotana/risala_net-7Y83PP5adWixDF93/playlist.m3u8 #EXTINF:-1 tvg-id="AlRiyadhRadio.sa",Al Riyadh Radio (1080p) https://live.kwikmotion.com/sbrksariyadhradiolive/srpksariyadhradio/playlist.m3u8 #EXTINF:-1 tvg-id="AlSaudiya.sa",Al Saudiya (1080p) @@ -65,14 +67,16 @@ https://shls-live-enc.edgenextcdn.net/out/v1/948c54279b594944adde578c95f1d7d1/in https://shls-live-enc.edgenextcdn.net/out/v1/97427be47b79457b9ca245e22a8db23a/index.m3u8 #EXTINF:-1 tvg-id="BigTimePlus.sa",Big Time Plus (1080p) https://big-time-plus-enc.edgenextcdn.net/out/v1/c885383fb76943c98fa223e7fd08b125/index.m3u8 +#EXTINF:-1 tvg-id="Fairuz.sa",Fairuz (1080p) +https://shls-live-enc.edgenextcdn.net/out/v1/bba3ef00b71b470fa955d93a9ca8c277/index.m3u8 #EXTINF:-1 tvg-id="IqraaArabic.sa",Iqraa Arabic (1080p) [Not 24/7] https://playlist.fasttvcdn.com/pl/dlkqw1ftuvuuzkcb4pxdcg/Iqraafasttv3/playlist.m3u8 #EXTINF:-1 tvg-id="IqraaQuran.sa",Iqraa Quran (1080p) https://playlist.fasttvcdn.com/pl/dlkqw1ftuvuuzkcb4pxdcg/Iqraafasttv2/playlist.m3u8 #EXTINF:-1 tvg-id="JeddahRadio.sa",Jeddah Radio (1080p) https://live.kwikmotion.com/sbrksajeddahradiolive/srpksajeddahradio/playlist.m3u8 -#EXTINF:-1 tvg-id="RabehSaqer.sa",Rabeh Saqer (1080p) -https://shls-live-enc.edgenextcdn.net/out/v1/ea4275b6dc0840c198c17f6dc6f1ec49/index.m3u8 +#EXTINF:-1 tvg-id="LBC.sa",LBC (1080p) +https://rotana.hibridcdn.net/rotana/lbc_net-7Y83PP5adWixDF93/playlist.m3u8 #EXTINF:-1 tvg-id="MPlusHD.sa",M+ HD (1080p) https://d35j504z0x2vu2.cloudfront.net/v1/master/0bc8e8376bd8417a1b6761138aa41c26c7309312/m-plus/playlist.m3u8 #EXTINF:-1 tvg-id="MajidAlMohandis.sa",Majid Al Mohandis (1080p) @@ -101,6 +105,8 @@ https://d6izdil55uftn.cloudfront.net/out/v1/0a06d1d6377c47edbd48721ed724bd08/ind https://shls-panoramafm-prod-dub.shahid.net/out/v1/66262e420d824475aaae794dc2d69f14/index.m3u8 #EXTINF:-1 tvg-id="QuranRadio.sa",Quran Radio (1080p) https://live.kwikmotion.com/sbrksaquranradiolive/srpksaquranradio/playlist.m3u8 +#EXTINF:-1 tvg-id="RabehSaqer.sa",Rabeh Saqer (1080p) +https://shls-live-enc.edgenextcdn.net/out/v1/ea4275b6dc0840c198c17f6dc6f1ec49/index.m3u8 #EXTINF:-1 tvg-id="Ramez.sa",Ramez (1080p) https://shls-live-enc.edgenextcdn.net/out/v1/0ef83323c0374a1187c182645db2a45f/index.m3u8 #EXTINF:-1 tvg-id="RashidAlMajed.sa",Rashid AlMajed (1080p) @@ -109,10 +115,22 @@ https://dphwv2ufgnfsq.cloudfront.net/out/v1/59cd80dfe93a479eb8b4d79bc6f225ca/ind https://d35j504z0x2vu2.cloudfront.net/v1/master/0bc8e8376bd8417a1b6761138aa41c26c7309312/rotana-aflam-plus/playlist.m3u8 #EXTINF:-1 tvg-id="RotanaCinemaKSA.sa",Rotana Cinema KSA (1080p) https://bcovlive-a.akamaihd.net/9527a892aeaf43019fd9eeb77ad1516e/eu-central-1/6057955906001/playlist.m3u8 +#EXTINF:-1 tvg-id="RotanaCinemaKSA.sa",Rotana Cinema KSA (1080p) +https://rotana.hibridcdn.net/rotana/cinema_net-7Y83PP5adWixDF93/playlist.m3u8 #EXTINF:-1 tvg-id="RotanaClassic.sa",Rotana Classic (1080p) https://bcovlive-a.akamaihd.net/0debf5648e584e5fb795c3611c5c0252/eu-central-1/6057955906001/playlist.m3u8 +#EXTINF:-1 tvg-id="RotanaClassic.sa",Rotana Classic (1080p) +https://rotana.hibridcdn.net/rotana/classical_net-7Y83PP5adWixDF93/playlist.m3u8 +#EXTINF:-1 tvg-id="RotanaClip.sa",Rotana Clip (1080p) +https://rotana.hibridcdn.net/rotana/clip_net-7Y83PP5adWixDF93/playlist.m3u8 +#EXTINF:-1 tvg-id="RotanaComedy.sa",Rotana Comedy (1080p) +https://rotana.hibridcdn.net/rotana/comedy_net-7Y83PP5adWixDF93/playlist.m3u8 +#EXTINF:-1 tvg-id="RotanaDrama.sa",Rotana Drama (1080p) +https://rotana.hibridcdn.net/rotana/drama_net-7Y83PP5adWixDF93/playlist.m3u8 #EXTINF:-1 tvg-id="RotanaFMKSA.sa",Rotana FM KSA (720p) rtmp://live.restream.io/pull/play_320121_94512612fd0e084bd284 +#EXTINF:-1 tvg-id="RotanaKhalijia.sa",Rotana Khalijia (1080p) +https://rotana.hibridcdn.net/rotana/khaleejiya_net-7Y83PP5adWixDF93/playlist.m3u8 #EXTINF:-1 tvg-id="SaudiThaqafiyaTV.sa",Saudi Thaqafiya TV (1080p) https://thaqafeyyah-ak.akamaized.net/out/v1/f6851f68ada94f82ae6b64a441eb5ab1/index.m3u8 #EXTINF:-1 tvg-id="SaudiaRadio.sa",Saudia Radio (1080p) @@ -127,21 +145,3 @@ https://shls-live-enc.edgenextcdn.net/out/v1/90143f040feb40589d18c57863d9e829/in https://shls-live-mood-ak.akamaized.net/out/v1/90143f040feb40589d18c57863d9e829/index.m3u8 #EXTINF:-1 tvg-id="ThikrayatTV.sa",Thikrayat TV (1080p) https://al-ekhbaria-prod-dub.shahid.net/out/v1/ef87956651694f4ba2ccc16e852dbb95/index.m3u8 -#EXTINF:-1 tvg-id="AlResalah.sa",Al Resalah (1080p) -https://rotana.hibridcdn.net/rotana/risala_net-7Y83PP5adWixDF93/playlist.m3u8 -#EXTINF:-1 tvg-id="RotanaClip.sa",Rotana Clip (1080p) -https://rotana.hibridcdn.net/rotana/clip_net-7Y83PP5adWixDF93/playlist.m3u8 -#EXTINF:-1 tvg-id="RotanaClassic.sa",Rotana Classic (1080p) -https://rotana.hibridcdn.net/rotana/classical_net-7Y83PP5adWixDF93/playlist.m3u8 -#EXTINF:-1 tvg-id="RotanaComedy.sa",Rotana Comedy (1080p) -https://rotana.hibridcdn.net/rotana/comedy_net-7Y83PP5adWixDF93/playlist.m3u8 -#EXTINF:-1 tvg-id="RotanaDrama.sa",Rotana Drama (1080p) -https://rotana.hibridcdn.net/rotana/drama_net-7Y83PP5adWixDF93/playlist.m3u8 -#EXTINF:-1 tvg-id="RotanaKhalijia.sa",Rotana Khalijia (1080p) -https://rotana.hibridcdn.net/rotana/khaleejiya_net-7Y83PP5adWixDF93/playlist.m3u8 -#EXTINF:-1 tvg-id="LBC.sa",LBC (1080p) -https://rotana.hibridcdn.net/rotana/lbc_net-7Y83PP5adWixDF93/playlist.m3u8 -#EXTINF:-1 tvg-id="RotanaCinemaKSA.sa",Rotana Cinema KSA (1080p) -https://rotana.hibridcdn.net/rotana/cinema_net-7Y83PP5adWixDF93/playlist.m3u8 -#EXTINF:-1 tvg-id="Fairuz.sa",Fairuz (1080p) -https://shls-live-enc.edgenextcdn.net/out/v1/bba3ef00b71b470fa955d93a9ca8c277/index.m3u8 diff --git a/streams/se_samsung.m3u b/streams/se_samsung.m3u index e71d6d5036..07e77addd3 100644 --- a/streams/se_samsung.m3u +++ b/streams/se_samsung.m3u @@ -3,7 +3,7 @@ https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg00353-lionsgatestudio-arewethereyetse-samsungse/playlist.m3u8 #EXTINF:-1 tvg-id="BloombergQuicktake.us",Bloomberg Quicktake https://bloomberg-quicktake-1-se.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="BloombergTVPlus.us",Bloomberg TV+ +#EXTINF:-1 tvg-id="",Bloomberg TV+ https://bloomberg-bloombergtv-3-se.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="EuronewsEnglish.fr",Euronews English (720p) [Not 24/7] https://rakuten-euronews-1-se.samsung.wurl.tv/manifest/playlist.m3u8 @@ -17,7 +17,7 @@ https://spi-filmstream-1-se.samsung.wurl.tv/playlist.m3u8 https://brandusa-gousa-1-se.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="TheGuardian.uk",Guardian https://rakuten-guardian-1-se.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Gusto TV +#EXTINF:-1 tvg-id="GustoTV.ca@SD",Gusto TV https://gustotv-gustotv-2-se.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="MuseumTVFast.us",Museum TV Fast https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01492-secomsasmediart-museumtv-eng-samsungse/playlist.m3u8 @@ -27,21 +27,21 @@ https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01255-secomcofites-my-myzen-samsung https://jukin-peopleareawesome-2-se.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",Radical Docs https://quintus-radicaldocs-1-se.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Rakuten Action +#EXTINF:-1 tvg-id="RakutenTVActionMovies.es@Sweden",Rakuten Action https://rakuten-action-9-se.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Rakuten Comedy +#EXTINF:-1 tvg-id="RakutenTVComedyMovies.es@Sweden",Rakuten Comedy https://rakuten-comedy-9-se.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Rakuten Drama +#EXTINF:-1 tvg-id="RakutenTVDramaMovies.es@Sweden",Rakuten Drama https://rakuten-drama-9-se.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Rakuten Family +#EXTINF:-1 tvg-id="RakutenTVFamilyMovies.es@Sweden",Rakuten Family https://rakuten-family-9-se.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Rakuten Spotlight +#EXTINF:-1 tvg-id="RakutenTVSpotlight.es@Sweden",Rakuten Spotlight https://rakuten-spotlight-9-se.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Strongman Champions League +#EXTINF:-1 tvg-id="StrongmanChampionsLeague.pl@SD",Strongman Champions League https://rightsboosterltd-scl-1-se.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="Tastemade.us",Tastemade https://tmint-aus-samsungswedan.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="ThePetCollective.se",The Pet Collective Sweden +#EXTINF:-1 tvg-id="ThePetCollective.us@Sweden",The Pet Collective Sweden https://the-pet-collective-international-se.samsung.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="Travelxp.in",Travelxp https://travelxp-travelxp-1-se.samsung.wurl.tv/playlist.m3u8 diff --git a/streams/sg.m3u b/streams/sg.m3u index 94262568b0..40f1edbcd5 100644 --- a/streams/sg.m3u +++ b/streams/sg.m3u @@ -1,10 +1,10 @@ #EXTM3U +#EXTINF:-1 tvg-id="Channel5.sg",Channel 5 (720p) +https://tinyurl.com/2c3bacne #EXTINF:-1 tvg-id="Channel5.sg",Channel 5 [Geo-blocked] https://ddftztnzt6o79.cloudfront.net/hls/clr4ctv_okto/master.m3u8 #EXTINF:-1 tvg-id="Channel5.sg",Channel 5 [Geo-blocked] https://dlau142f16b92.cloudfront.net/hls/clr4ctv_ch5/master.m3u8 -#EXTINF:-1 tvg-id="Channel5.sg",Channel 5 (720p) -https://tinyurl.com/2c3bacne #EXTINF:-1 tvg-id="Channel8.sg",Channel 8 [Geo-blocked] https://d34e90s3s13i7n.cloudfront.net/hls/clr4ctv_ch8/master.m3u8 #EXTINF:-1 tvg-id="CNA.sg",CNA [Geo-blocked] diff --git a/streams/si_xploretv.m3u b/streams/si_xploretv.m3u index ffb87e8a54..0be1d4f6e7 100644 --- a/streams/si_xploretv.m3u +++ b/streams/si_xploretv.m3u @@ -1,5 +1,5 @@ #EXTM3U -#EXTINF:-1 tvg-id="HistoryHD.si",History Channel (1080p) +#EXTINF:-1 tvg-id="History.si@HD",History Channel (1080p) https://streamer12.xploretv.si/__cl/cg:prod/__c/A1_SI_HISTORYHD_ott/__op/dash-default/__dci/__f/index.m3u8?admin=xploreTv_test_user&redirect=true #EXTINF:-1 tvg-id="KanalA.si",Kanal A https://streamer01.xploretv.si/__cl/cg:prod/__c/A1_SI_AKANALHD_ott/__op/dash-default/__dci/__f/index.m3u8?admin=xploreTv_test_user&redirect=true diff --git a/streams/sx.m3u b/streams/sx.m3u index 83050b9556..d66f4b9b15 100644 --- a/streams/sx.m3u +++ b/streams/sx.m3u @@ -1,21 +1,21 @@ #EXTM3U #EXTINF:-1 tvg-id="981PearlFM.sx",98.1 Pearl FM (720p) https://live2.tensila.com/pearl-v-1.pearlfm/hls/live/mystream.m3u8 +#EXTINF:-1 tvg-id="",Nolan Nanton Productions (720p) [Not 24/7] +https://cdn.mycloudstream.io/hls/live/broadcast/wbxpvv7l/index.m3u8 #EXTINF:-1 tvg-id="SXMTVBroadcast.sx",SXM TV Broadcast (720p) https://5dcabf026b188.streamlock.net/Theodore/livestream/playlist.m3u8 #EXTINF:-1 tvg-id="TV15.sx",TV15 (720p) http://198.255.80.170/FTX9_SXM-TV/index.m3u8 #EXTINF:-1 tvg-id="TVCARiB.sx",TVCARiB (720p) [Not 24/7] https://cdn.mycloudstream.io/hls/live/broadcast/s6nitpvn/index.m3u8 +#EXTINF:-1 tvg-id="TVCARiBCinema.sx@SD",TVCARiB Cinema (720p) [Not 24/7] +https://cdn.mycloudstream.io/hls/live/broadcast/l3vslw4i/index.m3u8 #EXTINF:-1 tvg-id="TVCARiBGospel.sx",TVCARiB Gospel (480p) [Not 24/7] https://cdn.mycloudstream.io/hls/live/broadcast/wokrhjkd/index.m3u8 +#EXTINF:-1 tvg-id="TVCARiBKidsTeens.sx@SD",TVCARiB Kids & Teens (720p) [Not 24/7] +https://cdn.mycloudstream.io/hls/live/broadcast/nro19k2h/index.m3u8 #EXTINF:-1 tvg-id="TVCARiBLatino.sx",TVCARiB Latino (720p) [Not 24/7] https://cdn.mycloudstream.io/hls/live/broadcast/xn44vdc5/index.m3u8 -#EXTINF:-1 tvg-id="",TVCARiB Cinema (720p) [Not 24/7] -https://cdn.mycloudstream.io/hls/live/broadcast/l3vslw4i/index.m3u8 -#EXTINF:-1 tvg-id="",TVCARiB Kids & Teens (720p) [Not 24/7] -https://cdn.mycloudstream.io/hls/live/broadcast/nro19k2h/index.m3u8 #EXTINF:-1 tvg-id="",TVCARiB Radio (720p) [Not 24/7] https://cdn.mycloudstream.io/hls/live/broadcast/agf7yo9x/index.m3u8 -#EXTINF:-1 tvg-id="",Nolan Nanton Productions (720p) [Not 24/7] -https://cdn.mycloudstream.io/hls/live/broadcast/wbxpvv7l/index.m3u8 diff --git a/streams/th.m3u b/streams/th.m3u index d99f622e9b..c95c585bfe 100644 --- a/streams/th.m3u +++ b/streams/th.m3u @@ -17,10 +17,10 @@ http://news1.live14.com/stream/news1.m3u8 https://live.x2.co.th/live/bntv.m3u8 #EXTINF:-1 tvg-id="Channel5.th",Channel 5 (1080p) https://639bc5877c5fe.streamlock.net/tv5hdlive/tv5hdlive/playlist.m3u8 -#EXTINF:-1 tvg-id="Channel7.th",Channel 7 -http://streaming-hwc.ch7.com/livech7hd/HD.m3u8 #EXTINF:-1 tvg-id="Channel7.th",Channel 7 (1080p) http://streaming-hwc.ch7.com/livech7hd/HD_1080p.m3u8 +#EXTINF:-1 tvg-id="Channel7.th",Channel 7 +http://streaming-hwc.ch7.com/livech7hd/HD.m3u8 #EXTINF:-1 tvg-id="Channel8.th",Channel 8 (1080p) [Not 24/7] http://usa.login.in.th:1935/ch8/ch8/playlist.m3u8 #EXTINF:-1 tvg-id="Channel8.th",Channel 8 (720p) [Geo-blocked] @@ -73,7 +73,7 @@ https://streaming.monomax.me/Mono29LiveStream/ngrp:myStream_all/master.m3u8 https://nationtv-1jdcjo.cdn.byteark.com/fleetstream/nationtvlive/index.m3u8 #EXTINF:-1 tvg-id="NBT2HD.th",NBT 2HD (720p) https://cdn-edge-ott.prd.go.th/live_vlc/smil:c30f-97f7-c767-ca64-98aa/chunklist.m3u8 -#EXTINF:-1 tvg-id="NBT11Central.th",NBT 11 Central (720p) +#EXTINF:-1 tvg-id="NBT11.th@Central",NBT 11 Central (720p) https://cdn-edge-ott.prd.go.th/live_vlc/smil:01f1-8b4b-971e-aa35-d5fa.smil/playlist.m3u8?DVR= #EXTINF:-1 tvg-id="NBTWorld.th",NBT World (720p) https://cdn-edge-ott.prd.go.th/live_vlc/smil:2609-b4a6-64b3-1431-5e64/chunklist_w507269531_b2128000.m3u8 diff --git a/streams/th_v2h-cdn.m3u b/streams/th_v2hcdn.m3u similarity index 100% rename from streams/th_v2h-cdn.m3u rename to streams/th_v2hcdn.m3u diff --git a/streams/tr.m3u b/streams/tr.m3u index 25d22ce0b2..ed4d407c23 100644 --- a/streams/tr.m3u +++ b/streams/tr.m3u @@ -1,8 +1,6 @@ #EXTM3U #EXTINF:-1 tvg-id="4UTV.tr",4U TV (720p) https://hls.4utv.live/hls/stream.m3u8 -#EXTINF:-1 tvg-id="24TV.tr",24 TV -https://kanal24.blutv.com/blutv_kanal24_live/live.m3u8 #EXTINF:-1 tvg-id="24TV.tr",24 TV (1080p) http://185.234.111.229:8000/play/a059 #EXTINF:-1 tvg-id="24TV.tr" http-user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36",24 TV (1080p) @@ -10,44 +8,48 @@ http://185.234.111.229:8000/play/a059 https://mn-nl.mncdn.com/kanal24/smil:kanal24.smil/playlist.m3u8 #EXTINF:-1 tvg-id="24TV.tr",24 TV (576p) http://185.234.111.229:8000/play/a056 +#EXTINF:-1 tvg-id="24TV.tr",24 TV +https://kanal24.blutv.com/blutv_kanal24_live/live.m3u8 #EXTINF:-1 tvg-id="360.tr",360 (1080p) http://185.234.111.229:8000/play/a05a #EXTINF:-1 tvg-id="360.tr",360 (576p) http://185.234.111.229:8000/play/a057 #EXTINF:-1 tvg-id="360.tr",360 TV (720p) [Not 24/7] https://turkmedya-live.ercdn.net/tv360/tv360.m3u8 +#EXTINF:-1 tvg-id="A2TV.tr",A2TV (1080p) +http://185.234.111.229:8000/play/a01m #EXTINF:-1 tvg-id="A2TV.tr",A2TV https://c.fulltvizle.com/a2/index.m3u8 #EXTINF:-1 tvg-id="A2TV.tr",A2TV https://canlitvulusal.xyz/live/a2tv/index.m3u8 #EXTINF:-1 tvg-id="A2TV.tr",A2TV https://trkvz-live.daioncdn.net/a2tv/a2tv.m3u8 -#EXTINF:-1 tvg-id="A2TV.tr",A2TV (1080p) -http://185.234.111.229:8000/play/a01m +#EXTINF:-1 tvg-id="AHaber.tr",A Haber (576p) +http://185.234.111.229:8000/play/a019 #EXTINF:-1 tvg-id="AHaber.tr",A Haber https://c.fulltvizle.com/ahaber/index.m3u8 #EXTINF:-1 tvg-id="AHaber.tr",A Haber https://canlitvulusal.xyz/live/ahaber/index.m3u8 -#EXTINF:-1 tvg-id="AHaber.tr",A Haber (576p) -http://185.234.111.229:8000/play/a019 #EXTINF:-1 tvg-id="ANews.tr",A News (1080p) http://185.234.111.229:8000/play/a01k #EXTINF:-1 tvg-id="APara.tr",A Para (1080p) http://185.234.111.229:8000/play/a01l #EXTINF:-1 tvg-id="APara.tr",A Para (720p) https://canlitvulusal.xyz/live/apara/index.m3u8 -#EXTINF:-1 tvg-id="ASpor.tr",A Spor -https://trkvz-live.daioncdn.net/aspor/aspor.m3u8 #EXTINF:-1 tvg-id="ASpor.tr",A Spor (720p) https://tgn.bozztv.com/dvrfl05/gin-aspor/index.m3u8 #EXTINF:-1 tvg-id="ASpor.tr",A Spor (360p) [Not 24/7] https://c.fulltvizle.com/aspor/index.m3u8 +#EXTINF:-1 tvg-id="ASpor.tr",A Spor +https://trkvz-live.daioncdn.net/aspor/aspor.m3u8 #EXTINF:-1 tvg-id="ATurk.tr",A Türk Izmir (360p) https://vdo.digitalbox.xyz:3807/stream/play.m3u8 #EXTINF:-1 tvg-id="AnadoluAgency.tr",AA Live (720p) [Not 24/7] https://mtulqxgomrllive.mediatriple.net/mtulqxgomrllive/broadcast_59f9c0c785b88.smil/playlist.m3u8 #EXTINF:-1 tvg-id="AdaTV.cy",ADA TV (720p) https://yayin1.canlitv.day/live/kibrisadatv.stream/playlist.m3u8 +#EXTINF:-1 tvg-id="AfroturkTV.tr",Afroturk TV (1080p) +https://edge.socialsmart.tv/naturaltv/bant1/playlist.m3u8 #EXTINF:-1 tvg-id="AfyonTurkTV.tr",Afyon Türk TV (720p) https://tv.digitalbox.xyz:19360/afyonturktv/afyonturktv.m3u8 #EXTINF:-1 tvg-id="AgroTV.tr",Agro TV (1080p) @@ -72,12 +74,16 @@ https://live.al-zahratv.com/live/playlist.m3u8 https://api-tv3.yayin.com.tr/postatv/postatv/playlist.m3u8 #EXTINF:-1 tvg-id="AlmahriahTV.tr",Almahriah TV (576p) https://starmenajo.com/hls/almahriah/index.m3u8 +#EXTINF:-1 tvg-id="AltasTV.tr",Altas TV (1080p) +https://edge1.socialsmart.tv/altastv/bant1/playlist.m3u8 #EXTINF:-1 tvg-id="AnadoluDernekTV.tr",Anadolu Dernek TV (576p) http://185.234.111.229:8000/play/a020 #EXTINF:-1 tvg-id="AnadoluNetTV.tr",Anadolu Net TV (1080p) https://live.artidijitalmedya.com/artidijital_anadolunet/anadolunet/playlist.m3u8 #EXTINF:-1 tvg-id="ArasTV.tr",ARAS TV (576p) [Not 24/7] http://1.rtmp.org/tv217/yayin.stream/playlist.m3u8 +#EXTINF:-1 tvg-id="ATV.tr",ATV (720p) +https://rnttwmjcin.turknet.ercdn.net/lcpmvefbyo/atv/atv.m3u8 #EXTINF:-1 tvg-id="ATV.tr",ATV http://116.202.238.88/ATV_TR/tracks-v1a1/index.m3u8 #EXTINF:-1 tvg-id="ATV.tr",ATV @@ -86,8 +92,6 @@ https://c.fulltvizle.com/aytv/index.m3u8 https://trkvz-live.daioncdn.net/atv/atv.m3u8 #EXTINF:-1 tvg-id="ATV.tr",ATV https://yayin2.canlitv.fun/livetv/atv.stream/playlist.m3u8 -#EXTINF:-1 tvg-id="ATV.tr",ATV (720p) -https://rnttwmjcin.turknet.ercdn.net/lcpmvefbyo/atv/atv.m3u8 #EXTINF:-1 tvg-id="ATVAlanya.tr",ATV Alanya (720p) [Not 24/7] http://stream2.taksimbilisim.com:1935/alanyatv/alanyatv.smil/playlist.m3u8 #EXTINF:-1 tvg-id="ATVAvrupa.tr",ATV Avrupa (576p) @@ -118,12 +122,12 @@ https://yayin30.haber100.com/live/beykenttv/playlist.m3u8 https://live.artidijitalmedya.com/artidijital_birtv/birtv/playlist.m3u8 #EXTINF:-1 tvg-id="BizimevTV.tr",Bizimev TV (720p) https://mn-nl.mncdn.com/blutv_bizimev/bizimev_sd.smil/playlist.m3u8 -#EXTINF:-1 tvg-id="BloombergHT.tr",Bloomberg HT -https://bloomberght2dvr.blutv.com/blutv_bloomberght_dvr/live.m3u8 #EXTINF:-1 tvg-id="BloombergHT.tr",Bloomberg HT (720p) https://ciner.daioncdn.net/bloomberght/bloomberght.m3u8 #EXTINF:-1 tvg-id="BloombergHT.tr",Bloomberg HT (720p) [Not 24/7] https://tv.ensonhaber.com/bloomberght/bloomberght.m3u8 +#EXTINF:-1 tvg-id="BloombergHT.tr",Bloomberg HT +https://bloomberght2dvr.blutv.com/blutv_bloomberght_dvr/live.m3u8 #EXTINF:-1 tvg-id="BloombergHT.tr",BloombergHT (720p) https://ciner-live.daioncdn.net/bloomberght/bloomberght.m3u8 #EXTINF:-1 tvg-id="BRTV.tr",BRTV (720p) [Geo-blocked] @@ -140,6 +144,8 @@ https://cdn-bursatv.yayin.com.tr/bursatv/bursatv/playlist.m3u8 https://win1.yayin.com.tr/bursatv/bursatv/playlist.m3u8 #EXTINF:-1 tvg-id="CanTV.tr",Can TV (720p) http://canbroadcast.com:7000/canlican/tv.m3u8 +#EXTINF:-1 tvg-id="CanTV.tr",Can TV (720p) +https://livetv.canbroadcast.com:7443/canlican/tv.m3u8 #EXTINF:-1 tvg-id="CayTV.tr",Cay TV (720p) [Not 24/7] http://stream2.taksimbilisim.com:1935/caytv/bant1/CAYTV.m3u8 #EXTINF:-1 tvg-id="CekmekoyTV.tr",Cekmeköy TV (1080p) @@ -172,6 +178,8 @@ http://live.arkumedia.com:1935/dersim62tv/dersim62tv/playlist.m3u8 https://603c568fccdf5.streamlock.net/live/dhaweb1_C5efC/playlist.m3u8 #EXTINF:-1 tvg-id="DimTV.tr",DİM TV (720p) [Geo-blocked] https://live.artidijitalmedya.com/artidijital_dimtv/dimtv/playlist.m3u8 +#EXTINF:-1 tvg-id="DisneyJr.tr",Disney Jr. (1080p) [Geo-blocked] +https://saran-live.ercdn.net/disneyjunior/index.m3u8 #EXTINF:-1 tvg-id="DiyanetTV.tr",Diyanet TV (1080p) http://185.234.111.229:8000/play/a05j #EXTINF:-1 tvg-id="DiyanetTV.tr",Diyanet TV (1080p) @@ -196,15 +204,15 @@ http://185.234.111.229:8000/play/a06a https://tv.digitalbox.xyz:19360/edessatv/edessatv.m3u8 #EXTINF:-1 tvg-id="EkinTurk.tr",Ekin Turk (576p) http://185.234.111.229:8000/play/a025 -#EXTINF:-1 tvg-id="Ekoturk.tr",Ekoturk -https://ekoturk.blutv.com/blutv_ekoturk2/live.m3u8 #EXTINF:-1 tvg-id="Ekoturk.tr",Ekoturk (1080p) http://185.234.111.229:8000/play/a00w +#EXTINF:-1 tvg-id="Ekoturk.tr",Ekoturk +https://ekoturk.blutv.com/blutv_ekoturk2/live.m3u8 #EXTINF:-1 tvg-id="Ekoturk.tr",Ekotürk (720p) https://mn-nl.mncdn.com/blutv_ekoturk2/live.m3u8 #EXTINF:-1 tvg-id="ElmasTV.tr",Elmas TV (720p) [Not 24/7] https://5be5d840359c6.streamlock.net/elmas67tv/elmas67tv/chunklist.m3u8 -#EXTINF:-1 tvg-id="",Em TV (486p) +#EXTINF:-1 tvg-id="TvEM.tr@SD",Em TV (486p) https://cdn.yayin.com.tr/TVEM/TVEM/playlist.m3u8 #EXTINF:-1 tvg-id="ERTV.tr",Er TV (1080p) [Geo-blocked] https://live.artidijitalmedya.com/artidijital_ertv_new/ertv/playlist.m3u8 @@ -226,10 +234,14 @@ https://live.duhnet.tv/S2/HLS_LIVE/eurodnp/playlist.m3u8 http://185.234.111.229:8000/play/a01h #EXTINF:-1 tvg-id="EuroStar.tr",EuroStar TV (1080p) https://canlitvulusal.xyz/live/eurostar/index.m3u8 +#EXTINF:-1 tvg-id="FinansTurkTV.tr",Finans Turk TV (720p) +https://yayin30.haber100.com/live/finansturk/playlist.m3u8 #EXTINF:-1 tvg-id="FlashTV.tr",Flash TV (720p) https://mn-nl.mncdn.com/blutv_flashtv/live.m3u8 #EXTINF:-1 tvg-id="FortunaTV.tr",Fortuna TV https://edge1.socialsmart.tv/ftvturk/bant1/playlist.m3u8 +#EXTINF:-1 tvg-id="FX.tr",FX (1080p) [Geo-blocked] +https://saran-live.ercdn.net/fx/index.m3u8 #EXTINF:-1 tvg-id="GoncaTV.tr",Gonca TV (720p) https://edge1.socialsmart.tv/goncatv/bant1/playlist.m3u8 #EXTINF:-1 tvg-id="GrandCinema.tr",Grand Cinema @@ -250,14 +262,14 @@ https://mn-nl.mncdn.com/gzttv/gzttv/playlist.m3u8 https://cdn-haber61tv.yayin.com.tr/haber61tv/smil:haber61tv.smil/index.m3u8 #EXTINF:-1 tvg-id="Haber61TV.tr",Haber61 TV (720p) [Not 24/7] https://win8.yayin.com.tr/haber61tv/smil:haber61tv.smil/playlist.m3u8 -#EXTINF:-1 tvg-id="HaberGlobal.tr",Haber Global -https://haberglobaldvr.blutv.com/blutv_haberglobal_dvr/live.m3u8 #EXTINF:-1 tvg-id="HaberGlobal.tr",Haber Global (1080p) http://185.234.111.229:8000/play/a05x #EXTINF:-1 tvg-id="HaberGlobal.tr",Haber Global (720p) [Not 24/7] https://tv.ensonhaber.com/haberglobal/haberglobal.m3u8 #EXTINF:-1 tvg-id="HaberGlobal.tr",Haber Global (576p) http://185.234.111.229:8000/play/a05k +#EXTINF:-1 tvg-id="HaberGlobal.tr",Haber Global +https://haberglobaldvr.blutv.com/blutv_haberglobal_dvr/live.m3u8 #EXTINF:-1 tvg-id="HaberturkTV.tr",Habertürk TV (1080p) https://ciner-live.daioncdn.net/haberturktv/haberturktv.m3u8 #EXTINF:-1 tvg-id="HaberturkTV.tr",Habertürk TV (1080p) @@ -340,9 +352,9 @@ https://5be5d840359c6.streamlock.net/kanal34tv/kanal34tv/playlist.m3u8 https://vdo.digitalbox.xyz:3266/live/kanal34tvlive.m3u8 #EXTINF:-1 tvg-id="Kanal38.tr",Kanal 38 (540p) [Not 24/7] http://yayin3.canlitv.com:1935/live/kanal38/playlist.m3u8 -#EXTINF:-1 tvg-id="",KANAL 58 (1080p) [Not 24/7] +#EXTINF:-1 tvg-id="Kanal58.tr@SD",KANAL 58 (1080p) [Not 24/7] https://edge1.socialsmart.tv/kanal58/bant1/playlist.m3u8 -#EXTINF:-1 tvg-id="",KANAL 58 (720p) [Not 24/7] +#EXTINF:-1 tvg-id="Kanal58.tr@SD",KANAL 58 (720p) [Not 24/7] https://live.artidijitalmedya.com/artidijital_kanal58/kanal58/playlist.m3u8 #EXTINF:-1 tvg-id="Kanal58.tr",Kanal 58 (576p) http://185.234.111.229:8000/play/a053 @@ -410,6 +422,8 @@ https://krt.blutv.com/blutv_krt_live/live.m3u8 http://185.234.111.229:8000/play/a065 #EXTINF:-1 tvg-id="KudusTV.tr",Kudüs TV (480p) [Geo-blocked] https://yayin.kudustv.com/981680400/kudustv/playlist.m3u8 +#EXTINF:-1 tvg-id="LalegulTV.tr",Lalegul TV (1080p) +https://lbl.netmedya.net/hls/lalegultv.m3u8 #EXTINF:-1 tvg-id="LalegulTV.tr",Lalegül TV (720p) [Not 24/7] http://lalegultv.netmedya.net/hls/lalegultv.m3u8 #EXTINF:-1 tvg-id="LalegulTV.tr",Lalegül TV (720p) [Not 24/7] @@ -426,6 +440,8 @@ http://185.234.111.229:8000/play/a04x https://live.artidijitalmedya.com/artidijital_mavikaradeniz/mavikaradeniz/playlist.m3u8 #EXTINF:-1 tvg-id="MaviKaradenizTV.tr",MaviKaradeniz TV (576p) http://185.234.111.229:8000/play/a04p +#EXTINF:-1 tvg-id="MedMuzik.tr",Med Muzik (1080p) +http://54.36.110.140/live3/live3.m3u8 #EXTINF:-1 tvg-id="MedMuzik.tr",Med Muzik (720p) https://med-musik.icdndhcp.com/live3/live3.m3u8 #EXTINF:-1 tvg-id="MekameleenTV.tr",Mekameleen TV (1080p) @@ -438,16 +454,22 @@ http://185.234.111.229:8000/play/a04k https://live.artidijitalmedya.com/artidijital_mercantv/mercantv/playlist.m3u8 #EXTINF:-1 tvg-id="MilyonTV.tr",Milyon TV (720p) https://sosyoapp-live.cdnnew.com/sosyo/buraya-bir-isim-verin.m3u8 -#EXTINF:-1 tvg-id="MinikaCocuk.tr",Minika Cocuk -https://trkvz-live.daioncdn.net/minikago_cocuk/minikago_cocuk.m3u8 #EXTINF:-1 tvg-id="MinikaCocuk.tr",Minika Cocuk (480p) https://tgn.bozztv.com/dvrfl05/gin-minikacocuk/index.m3u8 -#EXTINF:-1 tvg-id="MinikaGo.tr",Minika Go -https://trkvz-live.daioncdn.net/minikago/minikago.m3u8 +#EXTINF:-1 tvg-id="MinikaCocuk.tr",Minika Cocuk +https://trkvz-live.daioncdn.net/minikago_cocuk/minikago_cocuk.m3u8 #EXTINF:-1 tvg-id="MinikaGo.tr",Minika Go (480p) https://tgn.bozztv.com/dvrfl05/gin-minikago/index.m3u8 +#EXTINF:-1 tvg-id="MinikaGo.tr",Minika Go +https://trkvz-live.daioncdn.net/minikago/minikago.m3u8 #EXTINF:-1 tvg-id="MTurkTV.tr",MTürk TV (1080p) https://edge1.socialsmart.tv/muglaturk/bant1/playlist.m3u8 +#EXTINF:-1 tvg-id="NationalGeographic.tr",National Geographic (1080p) [Geo-blocked] +https://saran-live.ercdn.net/natgeohd/index.m3u8 +#EXTINF:-1 tvg-id="NationalGeographicWild.tr",National Geographic Wild (1080p) [Geo-blocked] +https://saran-live.ercdn.net/natgeowild/index.m3u8 +#EXTINF:-1 tvg-id="NationalGeographicWild.tr",National Geographic Wild (720p) +https://tv.arectv29.sbs/live/natgeowild.m3u8 #EXTINF:-1 tvg-id="NationalGeographicWild.tr",National Geographic Wild https://tv.arectv13.sbs/live/natgeowild.m3u8 #EXTINF:-1 tvg-id="NaturalTV.tr",Natural TV (720p) [Not 24/7] @@ -553,14 +575,14 @@ https://canlitvulusal.xyz/live/showturk/index.m3u8 https://showturk.blutv.com/blutv_showturk2/live.m3u8 #EXTINF:-1 tvg-id="ShowTurk.tr",Show Türk (720p) [Not 24/7] https://mn-nl.mncdn.com/blutv_showturk2/live.m3u8 -#EXTINF:-1 tvg-id="ShowTV.tr",Show TV -http://nimplus3.bozztv.com/showtvturk/showtvturk/playlist.m3u8 -#EXTINF:-1 tvg-id="ShowTV.tr",Show TV -https://showtv.blutv.com/blutv_showtv_live/live.m3u8 #EXTINF:-1 tvg-id="ShowTV.tr",Show TV (1080p) https://ciner-live.daioncdn.net/showtv/showtv.m3u8 #EXTINF:-1 tvg-id="ShowTV.tr",Show TV (720p) [Not 24/7] https://tv.ensonhaber.com/tv/tr/showtv/index.m3u8 +#EXTINF:-1 tvg-id="ShowTV.tr",Show TV +http://nimplus3.bozztv.com/showtvturk/showtvturk/playlist.m3u8 +#EXTINF:-1 tvg-id="ShowTV.tr",Show TV +https://showtv.blutv.com/blutv_showtv_live/live.m3u8 #EXTINF:-1 tvg-id="SinopYildizTV.tr",Sinop Yildiz TV (360p) https://s01.vpis.io/sinopyildiz/sinopyildiz.m3u8 #EXTINF:-1 tvg-id="SozcuTV.tr",Sozcu TV (1080p) @@ -589,10 +611,10 @@ https://live.artidijitalmedya.com/artidijital_tatlisestv/tatlisestv/playlist.m3u https://duhnet.hipodrom.com/S2/HLS_LIVE/mislitaynp/playlist.m3u8 #EXTINF:-1 tvg-id="TBMMTV.tr",TBMM TV (720p) https://meclistv-live.ercdn.net/meclistv/meclistv.m3u8 -#EXTINF:-1 tvg-id="TekRumeliTV.tr",Tek Rumeli TV -http://185.234.111.229:8000/play/a014 #EXTINF:-1 tvg-id="TekRumeliTV.tr",Tek Rumeli TV (576p) https://edge1.socialsmart.tv/tekrumelitv/bant1/playlist.m3u8 +#EXTINF:-1 tvg-id="TekRumeliTV.tr",Tek Rumeli TV +http://185.234.111.229:8000/play/a014 #EXTINF:-1 tvg-id="Tele1.tr",Tele 1 (1080p) http://185.234.111.229:8000/play/a01y #EXTINF:-1 tvg-id="Tele1.tr",Tele 1 (1080p) @@ -639,10 +661,10 @@ http://185.234.111.229:8000/play/a00c https://trt.daioncdn.net/trt-1/master.m3u8?app=web #EXTINF:-1 tvg-id="TRT1.tr",TRT 1 (1080p) https://tv-trt1.medya.trt.com.tr/master.m3u8 -#EXTINF:-1 tvg-id="TRT2.tr",TRT 2 -https://trt2.blutv.com/blutv_trt2/live.m3u8 #EXTINF:-1 tvg-id="TRT2.tr",TRT 2 (720p) https://tv-trt2.medya.trt.com.tr/master.m3u8 +#EXTINF:-1 tvg-id="TRT2.tr",TRT 2 +https://trt2.blutv.com/blutv_trt2/live.m3u8 #EXTINF:-1 tvg-id="TRT3.tr",TRT 3 https://tv-trt3.live.trt.com.tr/master.m3u8 #EXTINF:-1 tvg-id="TRTArabi.tr",TRT Arabi (1080p) @@ -665,7 +687,7 @@ https://tv-trtdiyanetcocuk.medya.trt.com.tr/master.m3u8 https://tv-e-okul00.medya.trt.com.tr/master.m3u8 #EXTINF:-1 tvg-id="TRTEBALise.tr",TRT EBA Lise (720p) https://tv-e-okul02.medya.trt.com.tr/master.m3u8 -#EXTINF:-1 tvg-id="",TRT EBA Ortaokul (720p) +#EXTINF:-1 tvg-id="TRTEBA.tr@SD",TRT EBA Ortaokul (720p) https://tv-e-okul01.medya.trt.com.tr/master.m3u8 #EXTINF:-1 tvg-id="TRTHaber.tr",TRT Haber (1080p) http://185.234.111.229:8000/play/a00d @@ -685,10 +707,10 @@ http://185.234.111.229:8000/play/a00e https://tv-trtspor1.medya.trt.com.tr/master.m3u8 #EXTINF:-1 tvg-id="TRTSporYildiz.tr",TRT Spor Yildiz (1080p) [Geo-blocked] https://tv-trtspor2.medya.trt.com.tr/master.m3u8 -#EXTINF:-1 tvg-id="TRTTurk.tr",TRT Turk -https://trtturk.blutv.com/blutv_trtturk2/live.m3u8 #EXTINF:-1 tvg-id="TRTTurk.tr",TRT Turk (1080p) http://185.234.111.229:8000/play/a00h +#EXTINF:-1 tvg-id="TRTTurk.tr",TRT Turk +https://trtturk.blutv.com/blutv_trtturk2/live.m3u8 #EXTINF:-1 tvg-id="TRTTurk.tr",TRT Türk (720p) https://tv-trtturk.medya.trt.com.tr/master.m3u8 #EXTINF:-1 tvg-id="TRTWorld.tr",TRT World (1080p) @@ -719,7 +741,7 @@ https://tv8.daioncdn.net/tv8/tv8.m3u8?app=7ddc255a-ef47-4e81-ab14-c0e5f2949788&c https://tv8-live.daioncdn.net/tv8/tv8.m3u8 #EXTINF:-1 tvg-id="TV85.tr",TV 8.5 (720p) http://bozztv.com/gin-dvrfl05/gin-tv8_5/index.m3u8 -#EXTINF:-1 tvg-id="",TV8 International (1080p) +#EXTINF:-1 tvg-id="TV8int.tr@SD",TV8 International (1080p) http://185.234.111.229:8000/play/a01x #EXTINF:-1 tvg-id="24TV.tr",TV 24 (720p) https://turkmedya-live.ercdn.net/tv24/tv24.m3u8 @@ -747,14 +769,16 @@ https://b01c02nl.mediatriple.net/videoonlylive/mtdxkkitgbrckilive/broadcast_5ee2 https://live.artidijitalmedya.com/artidijital_tva/tva/playlist.m3u8 #EXTINF:-1 tvg-id="TVDen.tr",TV Den (576p) [Not 24/7] http://canli.tvden.com.tr/hls/live.m3u8 -#EXTINF:-1 tvg-id="",TV Em (486p) +#EXTINF:-1 tvg-id="TvEM.tr@SD",TV Em (486p) https://cdn-tvem.yayin.com.tr/TVEM/TVEM/playlist.m3u8 -#EXTINF:-1 tvg-id="",TV Em (486p) +#EXTINF:-1 tvg-id="TvEM.tr@SD",TV Em (486p) https://cdn.yayin.com.tr/TVEM/TVEM/chunklist.m3u8 #EXTINF:-1 tvg-id="TVNET.tr",TVnet (720p) https://mn-nl.mncdn.com/tvnet/tvnet/playlist.m3u8 #EXTINF:-1 tvg-id="TYTTurk.tr",TYT Turk (720p) https://cdn4.yayin.com.tr/tytturk/index.m3u8 +#EXTINF:-1 tvg-id="TYTTurk.tr",TYT Turk +https://cdn-tytturk.yayin.com.tr/tytturk/index.m3u8 #EXTINF:-1 tvg-id="UcanKusTV.tr",UçanKuş TV (720p) https://ucankus-live.cdnnew.com/ucankus/ucankus.m3u8 #EXTINF:-1 tvg-id="UlkeTV.tr",Ülke TV (720p) @@ -796,27 +820,3 @@ https://cdn-yildiz.yayin.com.tr/yildiz/yildiz/playlist.m3u8 https://stream.yol.tv:9443/medialive/yol.m3u8 #EXTINF:-1 tvg-id="ZarokTV.tr",Zarok TV (720p) https://zindikurmanci.zaroktv.com.tr/hls/stream.m3u8 -#EXTINF:-1 tvg-id="TYTTurk.tr",TYT Turk -https://cdn-tytturk.yayin.com.tr/tytturk/index.m3u8 -#EXTINF:-1 tvg-id="MedMuzik.tr",Med Muzik (1080p) -http://54.36.110.140/live3/live3.m3u8 -#EXTINF:-1 tvg-id="DisneyJr.tr",Disney Jr. (1080p) [Geo-blocked] -https://saran-live.ercdn.net/disneyjunior/index.m3u8 -#EXTINF:-1 tvg-id="NationalGeographic.tr",National Geographic (1080p) [Geo-blocked] -https://saran-live.ercdn.net/natgeohd/index.m3u8 -#EXTINF:-1 tvg-id="LalegulTV.tr",Lalegul TV (1080p) -https://lbl.netmedya.net/hls/lalegultv.m3u8 -#EXTINF:-1 tvg-id="FX.tr",FX (1080p) [Geo-blocked] -https://saran-live.ercdn.net/fx/index.m3u8 -#EXTINF:-1 tvg-id="CanTV.tr",Can TV (720p) -https://livetv.canbroadcast.com:7443/canlican/tv.m3u8 -#EXTINF:-1 tvg-id="AltasTV.tr",Altas TV (1080p) -https://edge1.socialsmart.tv/altastv/bant1/playlist.m3u8 -#EXTINF:-1 tvg-id="FinansTurkTV.tr",Finans Turk TV (720p) -https://yayin30.haber100.com/live/finansturk/playlist.m3u8 -#EXTINF:-1 tvg-id="AfroturkTV.tr",Afroturk TV (1080p) -https://edge.socialsmart.tv/naturaltv/bant1/playlist.m3u8 -#EXTINF:-1 tvg-id="NationalGeographicWild.tr",National Geographic Wild (1080p) [Geo-blocked] -https://saran-live.ercdn.net/natgeowild/index.m3u8 -#EXTINF:-1 tvg-id="NationalGeographicWild.tr",National Geographic Wild (720p) -https://tv.arectv29.sbs/live/natgeowild.m3u8 diff --git a/streams/ua.m3u b/streams/ua.m3u index 6ee285106c..4094143ceb 100644 --- a/streams/ua.m3u +++ b/streams/ua.m3u @@ -125,7 +125,7 @@ http://91.193.128.233:1935/live/otv.stream/playlist.m3u8 http://91.194.79.46:8081/stream1/channel1/playlist.m3u8 #EXTINF:-1 tvg-id="PervyygorodskoyOdessa.ua",Первый Городской (Одесса) (576p) http://91.194.79.46:8081/stream2/channel2/playlist.m3u8 -#EXTINF:-1 tvg-id="",Полтавское ТВ +#EXTINF:-1 tvg-id="PTV.ua@SD",Полтавское ТВ http://cdn10.live-tv.od.ua:8081/hrpl/hrpl-abr/playlist.m3u8 #EXTINF:-1 tvg-id="PravdaTUT.ua" http-user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:97.0) Gecko/20100101 Firefox/97.0",ПравдаТУТ (720p) #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:97.0) Gecko/20100101 Firefox/97.0 diff --git a/streams/uk_bbc.m3u b/streams/uk_bbc.m3u index be06ab8672..fc03c81deb 100644 --- a/streams/uk_bbc.m3u +++ b/streams/uk_bbc.m3u @@ -33,69 +33,69 @@ https://vs-hls-push-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_news_ch https://vs-cmaf-push-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_news_channel_hd/iptv_hd_abr_v1.mpd #EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD (720p) [Geo-blocked] https://vs-hls-push-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_news_channel_hd/t=3840/v=pv14/b=5070016/main.m3u8 -#EXTINF:-1 tvg-id="BBCOneChannelIslands.uk",BBC One Channel Islands (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@ChannelIslands",BBC One Channel Islands (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_channel_islands/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneEast.uk",BBC One East (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@East",BBC One East (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_east/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneEastMidlands.uk",BBC One East Midlands (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@EastMidlands",BBC One East Midlands (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_east_midlands/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneYorkshire.uk",BBC One East Yorkshire (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk",BBC One East Yorkshire (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_east_yorkshire/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneYorkshire.uk",BBC One East Yorkshire (540p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk",BBC One East Yorkshire (540p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_east_yorkshire/pc_hd_abr_v2.m3u8 -#EXTINF:-1 tvg-id="BBCOneLondon.uk",BBC One London (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@London",BBC One London (720p) [Geo-blocked] https://vs-cmaf-push-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_london/iptv_hd_abr_v1.mpd -#EXTINF:-1 tvg-id="BBCOneLondon.uk",BBC One London (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@London",BBC One London (720p) [Geo-blocked] https://vs-cmaf-push-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_london/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneLondon.uk",BBC One London (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@London",BBC One London (720p) [Geo-blocked] https://vs-hls-push-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_london/t=3840/v=pv14/b=5070016/main.m3u8 -#EXTINF:-1 tvg-id="BBCOneLondon.uk",BBC One London (540p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@London",BBC One London (540p) [Geo-blocked] https://vs-hls-push-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_london/mobile_wifi_main_sd_abr_v2.m3u8 -#EXTINF:-1 tvg-id="BBCOneNorthEastCumbria.uk",BBC One North East (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk",BBC One North East (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_north_east/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneNorthEastCumbria.uk",BBC One North East (540p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk",BBC One North East (540p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_north_east/pc_hd_abr_v2.m3u8 -#EXTINF:-1 tvg-id="BBCOneNorthWest.uk",BBC One North West (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk",BBC One North West (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_north_west/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneNorthernIreland.uk",BBC One Northern Ireland HD (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@NorthernIrelandHD",BBC One Northern Ireland HD (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_northern_ireland_hd/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneNorthernIreland.uk",BBC One Northern Ireland HD (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@NorthernIrelandHD",BBC One Northern Ireland HD (720p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_northern_ireland_hd/t=3840/v=pv14/b=5070016/main.m3u8 -#EXTINF:-1 tvg-id="BBCOneScotland.uk",BBC One Scotland (540p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@Scotland",BBC One Scotland (540p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_scotland_hd/pc_hd_abr_v2.m3u8 -#EXTINF:-1 tvg-id="BBCOneScotland.uk",BBC One Scotland HD (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@ScotlandHD",BBC One Scotland HD (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_scotland_hd/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneScotland.uk",BBC One Scotland HD (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@ScotlandHD",BBC One Scotland HD (720p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_scotland_hd/t=3840/v=pv14/b=5070016/main.m3u8 -#EXTINF:-1 tvg-id="BBCOneSouth.uk",BBC One South (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@South",BBC One South (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_south/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneSouth.uk",BBC One South (540p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@South",BBC One South (540p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_south/pc_hd_abr_v2.m3u8 -#EXTINF:-1 tvg-id="BBCOneSouthEast.uk",BBC One South East (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@SouthEast",BBC One South East (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_south_east/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneSouthEast.uk",BBC One South East (540p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@SouthEast",BBC One South East (540p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_south_east/pc_hd_abr_v2.m3u8 -#EXTINF:-1 tvg-id="BBCOneSouthWest.uk",BBC One South West (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@SouthWest",BBC One South West (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_south_west/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneSouthWest.uk",BBC One South West (540p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@SouthWest",BBC One South West (540p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_south_west/pc_hd_abr_v2.m3u8 -#EXTINF:-1 tvg-id="BBCOneWales.uk",BBC One Wales (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@Wales",BBC One Wales (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_wales_hd/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneWales.uk",BBC One Wales (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@Wales",BBC One Wales (720p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_wales_hd/t=3840/v=pv14/b=5070016/main.m3u8 -#EXTINF:-1 tvg-id="BBCOneWales.uk",BBC One Wales (540p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@Wales",BBC One Wales (540p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_wales_hd/pc_hd_abr_v2.m3u8 -#EXTINF:-1 tvg-id="BBCOneWest.uk",BBC One West (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@West",BBC One West (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_west/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneWest.uk",BBC One West (540p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@West",BBC One West (540p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_west/pc_hd_abr_v2.m3u8 -#EXTINF:-1 tvg-id="BBCOneWestMidlands.uk",BBC One West Midlands (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@WestMidlands",BBC One West Midlands (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_west_midlands/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneWestMidlands.uk",BBC One West Midlands (540p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@WestMidlands",BBC One West Midlands (540p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_west_midlands/pc_hd_abr_v2.m3u8 -#EXTINF:-1 tvg-id="BBCOneYorkshireLincolnshire.uk",BBC One Yorks (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@Yorkshire",BBC One Yorks (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_yorks/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCOneYorkshireLincolnshire.uk",BBC One Yorks (540p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCOne.uk@Yorkshire",BBC One Yorks (540p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_yorks/pc_hd_abr_v2.m3u8 #EXTINF:-1 tvg-id="BBCParliament.uk",BBC Parliament (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_parliament/iptv_hd_abr_v1.mpd @@ -109,7 +109,7 @@ https://vs-cmaf-pushb-ww.live.cf.md.bbci.co.uk/x=3/i=urn:bbc:pips:service:bbc_pe https://vs-cmaf-pushb-ww.live.cf.md.bbci.co.uk/x=3/i=urn:bbc:pips:service:bbc_persian_tv/pc_hd_abr_v2_cloudfrontms_live_http.mpd #EXTINF:-1 tvg-id="BBCPersian.uk",BBC Persian (720p) https://vs-hls-pushb-ww-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_persian_tv/t=3840/v=pv14/b=5070016/main.m3u8 -#EXTINF:-1 tvg-id="BBCRedButton1HD.uk",BBC RB 1 (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCRedButton1.uk@SD",BBC RB 1 (720p) [Geo-blocked] https://vs-cmaf-pushb-uk.live.cf.md.bbci.co.uk/x=4/i=urn:bbc:pips:service:red_button_one/iptv_hd_abr_v1.mpd #EXTINF:-1 tvg-id="BBCRedButton1.uk",BBC Red Button 1 (720p) [Geo-blocked] https://ve-cmaf-push-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:uk_bbc_stream_001/iptv_hd_abr_v1.mpd @@ -171,21 +171,21 @@ https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_three https://vs-cmaf-pushb-uk.live.fastly.md.bbci.co.uk/x=4/i=urn:bbc:pips:service:bbc_three_hd/iptv_hd_abr_v1.mpd #EXTINF:-1 tvg-id="BBCThree.uk",BBC Three HD (720p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_three_hd/t=3840/v=pv14/b=5070016/main.m3u8 -#EXTINF:-1 tvg-id="BBCTwoEngland.uk",BBC Two HD (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCTwo.uk@HD",BBC Two HD (720p) [Geo-blocked] https://vs-cmaf-push-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_two_hd/iptv_hd_abr_v1.mpd -#EXTINF:-1 tvg-id="BBCTwoEngland.uk",BBC Two HD (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCTwo.uk@HD",BBC Two HD (720p) [Geo-blocked] https://vs-cmaf-push-uk.live.fastly.md.bbci.co.uk/x=4/i=urn:bbc:pips:service:bbc_two_hd/pc_hd_abr_v2.mpd -#EXTINF:-1 tvg-id="BBCTwoEngland.uk",BBC Two HD (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCTwo.uk@HD",BBC Two HD (720p) [Geo-blocked] https://vs-hls-push-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_two_hd/t=3840/v=pv14/b=5070016/main.m3u8 -#EXTINF:-1 tvg-id="BBCTwoEngland.uk",BBC Two HD (540p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCTwo.uk@HD",BBC Two HD (540p) [Geo-blocked] https://vs-hls-push-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_two_hd/mobile_wifi_main_sd_abr_v2.m3u8 -#EXTINF:-1 tvg-id="BBCTwoNorthernIreland.uk",BBC Two Northen Ireland (540p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCTwo.uk@NorthernIreland",BBC Two Northen Ireland (540p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_two_northern_ireland_hd/pc_hd_abr_v2.m3u8 -#EXTINF:-1 tvg-id="BBCTwoNorthernIreland.uk",BBC Two Northern Ireland HD (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCTwo.uk@NorthernIrelandHD",BBC Two Northern Ireland HD (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_two_northern_ireland_hd/iptv_hd_abr_v1.mpd -#EXTINF:-1 tvg-id="BBCTwoNorthernIreland.uk",BBC Two Northern Ireland HD (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCTwo.uk@NorthernIrelandHD",BBC Two Northern Ireland HD (720p) [Geo-blocked] https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_two_northern_ireland_hd/t=3840/v=pv14/b=5070016/main.m3u8 -#EXTINF:-1 tvg-id="BBCTwoWales.uk",BBC Two Wales (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCTwo.uk@Wales",BBC Two Wales (720p) [Geo-blocked] https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_two_wales_digital/iptv_hd_abr_v1.mpd #EXTINF:-1 tvg-id="BBCUHD1.uk",BBC UHD 1 (2160p) [Geo-blocked] [Not 24/7] https://ve-uhd-push-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:uhd_stream_01/iptv_uhd_v1.mpd diff --git a/streams/uk_pluto.m3u b/streams/uk_pluto.m3u index d66cb47373..788a626e3f 100644 --- a/streams/uk_pluto.m3u +++ b/streams/uk_pluto.m3u @@ -1,5 +1,5 @@ #EXTM3U -#EXTINF:-1 tvg-id="PlutoTVAnimals.uk",Pluto TV Animals (England) (720p) +#EXTINF:-1 tvg-id="",Pluto TV Animals (England) (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ddf8ea0d000120009bcad83/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5ddf8ea0d000120009bcad83&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=550&terminate=false&userId= #EXTINF:-1 tvg-id="",Pluto TV Antiques Roadshow UK (720p) [Not 24/7] https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ce44810b421747ae467b7cd/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS @@ -9,7 +9,7 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ce44810b421747ae4 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5fb5844bf5514d0007945bda/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS #EXTINF:-1 tvg-id="",Pluto TV BBC Home (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5fb5836fe745b600070fc743/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVBiography.uk",Pluto TV Biography (720p) [Not 24/7] +#EXTINF:-1 tvg-id="PlutoTVBiography.us@UK",Pluto TV Biography (720p) [Not 24/7] https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d4af2a24f1c5ab2d298776b/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS #EXTINF:-1 tvg-id="PlutoTVBritishTV.us",Pluto TV British TV (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5b68a18823ecb93393cba2f1/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5b68a18823ecb93393cba2f1&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=154&terminate=false&userId= @@ -17,39 +17,39 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5b68a18823ecb93393 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5b68a18823ecb93393cba2f1/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS #EXTINF:-1 tvg-id="",Pluto TV Classic Movies (England) (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d134a74ca91eedee1630faa/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d134a74ca91eedee1630faa&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=903&terminate=false&userId= -#EXTINF:-1 tvg-id="PlutoTVClassicTV.uk",Pluto TV Classic TV (720p) +#EXTINF:-1 tvg-id="PlutoTVClassicTV.us@UK",Pluto TV Classic TV (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e46ae801f347500099d461a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=35f76fb0-e986-11eb-a0af-c3b401f46211&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2fac39a7-56bc-492e-ae1e-3f6fb6cef1bc -#EXTINF:-1 tvg-id="PlutoTVClassicTV.uk",Pluto TV Classic TV (720p) +#EXTINF:-1 tvg-id="PlutoTVClassicTV.us@UK",Pluto TV Classic TV (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d134a74ca91eedee1630faa/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVCrime.uk",Pluto TV Crime (England) (720p) [Not 24/7] +#EXTINF:-1 tvg-id="",Pluto TV Crime (England) (720p) [Not 24/7] https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ea18cd42ee5410007e349dc/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5ea18cd42ee5410007e349dc&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=200&terminate=false&userId= -#EXTINF:-1 tvg-id="PlutoTVFood.uk",Pluto TV Food (England) (720p) +#EXTINF:-1 tvg-id="",Pluto TV Food (England) (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ddf930548ff9b00090d5686/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5ddf930548ff9b00090d5686&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=500&terminate=false&userId= -#EXTINF:-1 tvg-id="PlutoTVMovies.uk",Pluto TV Movies (England) (684p) +#EXTINF:-1 tvg-id="",Pluto TV Movies (England) (684p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ad8d3a31b95267e225e4e09/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5ad8d3a31b95267e225e4e09&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=50&terminate=false&userId= -#EXTINF:-1 tvg-id="PlutoTVParanormal.uk",Pluto TV Paranormal (England) (720p) +#EXTINF:-1 tvg-id="",Pluto TV Paranormal (England) (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d4af2ffa9506ab29cf38c38/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d4af2ffa9506ab29cf38c38&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=216&terminate=false&userId= -#EXTINF:-1 tvg-id="PlutoTVRomance.uk",Pluto TV Romance (720p) +#EXTINF:-1 tvg-id="PlutoTVRomance.us@UK",Pluto TV Romance (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/60812fc8539963000707d1e1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c8bf321-e98a-11eb-a932-2f3c780ff9ff&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7ebb5004-1cd6-44bb-990a-082fdcdcba6d -#EXTINF:-1 tvg-id="PlutoTVRomance.uk",Pluto TV Romance (720p) +#EXTINF:-1 tvg-id="PlutoTVRomance.us@UK",Pluto TV Romance (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5dc287ce3086a20009f5024c/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVRomance.uk",Pluto TV Romance (720p) [Not 24/7] +#EXTINF:-1 tvg-id="PlutoTVRomance.us@UK",Pluto TV Romance (720p) [Not 24/7] https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5a66795ef91fef2c7031c599/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVRomance.uk",Pluto TV Romance (684p) +#EXTINF:-1 tvg-id="PlutoTVRomance.us@UK",Pluto TV Romance (684p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5a66795ef91fef2c7031c599/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5a66795ef91fef2c7031c599&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=70&terminate=false&userId= -#EXTINF:-1 tvg-id="PlutoTVRomance.uk",Pluto TV Romance (684p) +#EXTINF:-1 tvg-id="PlutoTVRomance.us@UK",Pluto TV Romance (684p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dc287ce3086a20009f5024c/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5dc287ce3086a20009f5024c&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=b2e82991-0585-11eb-8b9f-0242ac110002&terminate=false&userId= -#EXTINF:-1 tvg-id="PlutoTVSherlock.uk",Pluto TV Sherlock (720p) +#EXTINF:-1 tvg-id="PlutoTVSherlock.us@UK",Pluto TV Sherlock (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5dc2c00abfed110009d97243/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVSports.uk",Pluto TV Sports (720p) +#EXTINF:-1 tvg-id="PlutoTVSports.us@UK",Pluto TV Sports (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/6081310e48d3200007afaf3b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c8bf322-e98a-11eb-a932-2f3c780ff9ff&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0727f4fb-ea0b-4814-bb58-fdf3c4534220 -#EXTINF:-1 tvg-id="PlutoTVSports.uk",Pluto TV Sports (720p) +#EXTINF:-1 tvg-id="PlutoTVSports.us@UK",Pluto TV Sports (720p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/56340779a738201b4ccfeac9/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=56340779a738201b4ccfeac9&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=725&terminate=false&userId= -#EXTINF:-1 tvg-id="PlutoTVSports.uk",Pluto TV Sports (720p) +#EXTINF:-1 tvg-id="PlutoTVSports.us@UK",Pluto TV Sports (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/56340779a738201b4ccfeac9/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVStandUp.uk",Pluto TV Stand Up (720p) +#EXTINF:-1 tvg-id="PlutoTVStandUp.us@UK",Pluto TV Stand Up (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d135e29a52c94dfe543c5d3/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVStandUp.uk",Pluto TV Stand Up (720p) +#EXTINF:-1 tvg-id="PlutoTVStandUp.us@UK",Pluto TV Stand Up (720p) https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5637d31f319573e26b64040b/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS -#EXTINF:-1 tvg-id="PlutoTVStandUp.uk",Pluto TV Stand Up (360p) +#EXTINF:-1 tvg-id="PlutoTVStandUp.us@UK",Pluto TV Stand Up (360p) https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5637d31f319573e26b64040b/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5637d31f319573e26b64040b&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=468&terminate=false&userId= diff --git a/streams/uk_samsung.m3u b/streams/uk_samsung.m3u index 5465dd8e31..fc6a06f48e 100644 --- a/streams/uk_samsung.m3u +++ b/streams/uk_samsung.m3u @@ -1,11 +1,11 @@ #EXTM3U #EXTINF:-1 tvg-id="BeanoTV.uk",Beano TV (720p) https://beanostudios-beanotv-1-gb.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="BloombergTVPlus.us",Bloomberg TV+ UHD (2160p) +#EXTINF:-1 tvg-id="",Bloomberg TV+ UHD (2160p) https://bloomberg-bloombergtv-1-gb.samsung.wurl.tv/manifest/playlist.m3u8 -#EXTINF:-1 tvg-id="BloombergTVPlus.us",Bloomberg TV+ UHD (2160p) +#EXTINF:-1 tvg-id="",Bloomberg TV+ UHD (2160p) https://bloomberg-bloombergtv-1-gb.samsung.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="ClubbingTV.fr",Clubbing TV (720p) +#EXTINF:-1 tvg-id="ClubbingTV.us@UK",Clubbing TV (720p) https://clubbingtv-samsunguk.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",Comedy Channel (1080p) https://uksono1-samsunguk.amagi.tv/playlist.m3u8 @@ -15,13 +15,13 @@ https://edgesport-samsunguk.amagi.tv/playlist.m3u8 https://62d77612985e4978b5cec13c47c897b5.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Samsung-gb_EuroNewsLive-1/playlist.m3u8 #EXTINF:-1 tvg-id="FashionTelevision.uk",Fashion TV (England) (1080p) [Not 24/7] https://fashiontv-fashiontv-1-gb.samsung.wurl.tv/manifest/playlist.m3u8 -#EXTINF:-1 tvg-id="",Gusto TV (720p) +#EXTINF:-1 tvg-id="GustoTV.ca@SD",Gusto TV (720p) https://gustotv-samsung-gb.samsung.wurl.tv/manifest/playlist.m3u8 #EXTINF:-1 tvg-id="HorseCountryTV.uk",Horse and Country (720p) https://hncfree-samsung-uk.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="InsightTV.nl",Insight TV (720p) https://insighttv-samsung-uk.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",InWild (720p) +#EXTINF:-1 tvg-id="InWild.it@SD",InWild (720p) https://inwild-samsung-uk.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="InWonder.nl",InWonder (720p) https://inwonder-samsung-uk.amagi.tv/playlist.m3u8 diff --git a/streams/us.m3u b/streams/us.m3u index a154846345..fdb648a824 100644 --- a/streams/us.m3u +++ b/streams/us.m3u @@ -43,10 +43,10 @@ https://castus-vod-dev.s3.amazonaws.com/vod_clients/akaku/live/ch1/video.m3u8 https://castus-vod-dev.s3.amazonaws.com/vod_clients/akaku/live/ch2/video.m3u8 #EXTINF:-1 tvg-id="Akaku55.us",Akaku 55 (Hawaii) (1080p) https://castus-vod-dev.s3.amazonaws.com/vod_clients/akaku/live/ch3/video.m3u8 -#EXTINF:-1 tvg-id="AKCTV.us",AKC TV -https://install.akctvcontrol.com/speed/broadcast/138/desktop-playlist.m3u8 #EXTINF:-1 tvg-id="AKCTV.us",AKC TV (1080p) https://broadcast.blivenyc.com/speed/broadcast/22/desktop-playlist.m3u8 +#EXTINF:-1 tvg-id="AKCTV.us",AKC TV +https://install.akctvcontrol.com/speed/broadcast/138/desktop-playlist.m3u8 #EXTINF:-1 tvg-id="AKCTVMeettheBreeds.us",AKC TV Meet The Breeds https://install.akctvcontrol.com/speed/broadcast/139/desktop-playlist.m3u8 #EXTINF:-1 tvg-id="AKCTVPuppies.us",AKC TV Puppies 24/7 @@ -105,10 +105,10 @@ https://streamer1.connectto.com/AMGA_WEB_1202/playlist.m3u8 https://hls.avang.live/hls/stream.m3u8 #EXTINF:-1 tvg-id="AWEEncore.us",AWE Encore (720p) [Geo-blocked] https://a-cdn.herringnetwork.com/affiliate/awee/playlist.m3u8 -#EXTINF:-1 tvg-id="AXSTVNOW.us",AXS TV NOW -https://dikcfc9915kp8.cloudfront.net/hls/1080p/playlist.m3u8 #EXTINF:-1 tvg-id="AXSTVNOW.us",AXS TV NOW (1080p) https://dikcfc9915kp8.cloudfront.net/hls/main.m3u8 +#EXTINF:-1 tvg-id="AXSTVNOW.us",AXS TV NOW +https://dikcfc9915kp8.cloudfront.net/hls/1080p/playlist.m3u8 #EXTINF:-1 tvg-id="BabySharkTV.us",Baby Shark TV (720p) https://c0c65b821b3542c3a4dca92702f59944.mediatailor.us-east-1.amazonaws.com/v1/master/04fd913bb278d8775298c26fdca9d9841f37601f/RakutenTV-eu_BabySharkTV/playlist.m3u8 #EXTINF:-1 tvg-id="BanningCityTV.us",Banning CityTV (Banning CA) (1080p) @@ -131,7 +131,7 @@ http://media4.tripsmarter.com:1935/LiveTV/BTVHD/playlist.m3u8 https://5ed325193d4e1.streamlock.net:444/LiveTV/BTVHD/playlist.m3u8 #EXTINF:-1 tvg-id="BEKNews.us",BEK TV News (720p) https://cdn3.wowza.com/5/ZWQ1K2NYTmpFbGsr/BEK-WOWZA-1/smil:BEKPRIMEeast.smil/playlist.m3u8 -#EXTINF:-1 tvg-id="BEKSportsWest.us",BEK TV Sports West (720p) +#EXTINF:-1 tvg-id="",BEK TV Sports West (720p) https://cdn3.wowza.com/5/ZWQ1K2NYTmpFbGsr/BEK-WOWZA-1/smil:BEKPRIMEW.smil/playlist.m3u8 #EXTINF:-1 tvg-id="BetterHealthTV.us",Better Health TV (480p) https://tgn.bozztv.com/betterlife/betterhealth/betterhealth/index.m3u8 @@ -151,11 +151,11 @@ https://d7ec4f6950ed4c6d946e497bd44db7ef.mediatailor.us-east-1.amazonaws.com/v1/ https://bloomberg.com/media-manifest/streams/qt.m3u8 #EXTINF:-1 tvg-id="BloombergTV.us",Bloomberg TV US (720p) https://bloomberg.com/media-manifest/streams/us.m3u8 -#EXTINF:-1 tvg-id="BloombergTVLiveEvent.us",Bloomberg TV US Live Event (720p) +#EXTINF:-1 tvg-id="BloombergTV.us@LiveEvent",Bloomberg TV US Live Event (720p) https://bloomberg.com/media-manifest/streams/us-event.m3u8 -#EXTINF:-1 tvg-id="BloombergTVPoliticsLiveEvent.us",Bloomberg TV US Politics Live Event (720p) +#EXTINF:-1 tvg-id="BloombergTV.us@PoliticsLiveEvent",Bloomberg TV US Politics Live Event (720p) https://bloomberg.com/media-manifest/streams/politics.m3u8 -#EXTINF:-1 tvg-id="BloombergTVPlus.us",Bloomberg TV+ (1080p) +#EXTINF:-1 tvg-id="BloombergTV.us@Plus",Bloomberg TV+ (1080p) https://bloomberg.com/media-manifest/streams/phoenix-us.m3u8 #EXTINF:-1 tvg-id="BATVGovernmentTV.us",Bloomfield Access Government TV (480p) https://reflect-batv.cablecast.tv/live-3/live/live.m3u8 @@ -303,15 +303,15 @@ https://livecdn.live247stream.com/eternallife/tv/playlist.m3u8 https://qvc-amd-live.akamaized.net/hls/live/2034113/lsqvc6us/master.m3u8 #EXTINF:-1 tvg-id="EVTVMiami.us",EVTV Miami (720p) [Not 24/7] https://streannliveevtv.cachefly.net/Protected/sp=1;dirmatch=true/3be25dc13406bf70ff0208230e6fa803b88b95013fad257c025e481e2be3e214/evtv1/evtv1/playlist.m3u8 -#EXTINF:-1 tvg-id="EWTNAfricaAsia.us",EWTN Africa Asia (720p) +#EXTINF:-1 tvg-id="EWTN.us@AfricaAsia",EWTN Africa Asia (720p) https://cdn3.wowza.com/1/ZVBYYXFLLzE0c3NC/Qk1FMURC/hls/live/playlist.m3u8 -#EXTINF:-1 tvg-id="EWTNAsiaPacific.us",EWTN Asia-Pacific (720p) [Not 24/7] +#EXTINF:-1 tvg-id="EWTN.us@AsiaPacific",EWTN Asia-Pacific (720p) [Not 24/7] https://cdn3.wowza.com/1/QmVNUVhTNTZSS3Uz/YWQ0aHpi/hls/live/playlist.m3u8 -#EXTINF:-1 tvg-id="EWTNEspanaLatinAmerica.us",EWTN el Canal Católico (720p) [Not 24/7] +#EXTINF:-1 tvg-id="",EWTN el Canal Católico (720p) [Not 24/7] https://cdn3.wowza.com/1/SmVrQmZCUXZhVDgz/b3J3MFJv/hls/live/playlist.m3u8 -#EXTINF:-1 tvg-id="EWTNEstadosUnidos.us",EWTN Estados Unidos (Spanish) (720p) +#EXTINF:-1 tvg-id="EWTN.us@UnitedStates",EWTN Estados Unidos (Spanish) (720p) https://cdn3.wowza.com/1/TUI5dU5ucnUxdGFD/ZFlVeGRl/hls/live/playlist.m3u8 -#EXTINF:-1 tvg-id="EWTNEurope.us",EWTN Europe (720p) [Not 24/7] +#EXTINF:-1 tvg-id="EWTN.us@Europe",EWTN Europe (720p) [Not 24/7] https://cdn3.wowza.com/1/T2NXeHF6UGlGbHY3/WFluRldQ/hls/live/playlist.m3u8 #EXTINF:-1 tvg-id="EWTN.us",EWTN United States (720p) https://cdn3.wowza.com/1/QjRzVXJtVml5SUVx/WGJRSWxz/hls/live/playlist.m3u8 @@ -365,7 +365,7 @@ https://6f972d29.wurl.com/master/f36d25e7e52f1ba8d7e56eb859c636563214f541/UmFrdX https://go2thls.wns.live/hls/stream.m3u8 #EXTINF:-1 tvg-id="",Golden Boy https://goldenboy.duckhunting.playout.vju.tv/DuckhuntingTV_GoldenBoy/main.m3u8 -#EXTINF:-1 tvg-id="GoldenPanregional.mx",Golden TV (240p) [Not 24/7] +#EXTINF:-1 tvg-id="",Golden TV (240p) [Not 24/7] https://bozztv.com/gusa/gusa-goldentv/index.m3u8 #EXTINF:-1 tvg-id="GoodLife45.us",GoodLife 45 (720p) [Not 24/7] https://2-fss-2.streamhoster.com/pl_118/201450-1248872-1/playlist.m3u8 @@ -401,7 +401,7 @@ https://jstre.am/live/jsl:0sUSK6VA7GT.m3u8 https://qvc-amd-live.akamaized.net/hls/live/2034113/lshsn1us/master.m3u8 #EXTINF:-1 tvg-id="HSN2.us",HSN2 https://qvc-amd-live.akamaized.net/hls/live/2034113/lshsn2us/master.m3u8 -#EXTINF:-1 tvg-id="HSNWest.us",HSN West +#EXTINF:-1 tvg-id="HSN.us@West",HSN West https://qvc-amd-live.akamaized.net/hls/live/2034113/lshsn1uswest/master.m3u8 #EXTINF:-1 tvg-id="HumraazTV.us",Humraaz TV [Not 24/7] https://cdn61.liveonlineservices.com/hls/humraaz.m3u8 @@ -417,7 +417,7 @@ https://freespeech.akamaized.net/hls/live/2024573/live2/playlist.m3u8 https://freespeech.akamaized.net/hls/live/2016873/live3/playlist.m3u8 #EXTINF:-1 tvg-id="",InfoWars War Room With Owen Shroyer (1080p) https://freespeech.akamaized.net/hls/live/2024574/live4/playlist.m3u8 -#EXTINF:-1 tvg-id="",IraneFarda TV (576p) +#EXTINF:-1 tvg-id="IraneFardaTV.uk@SD",IraneFarda TV (576p) https://hls.iranfarda.live/hls/stream.m3u8 #EXTINF:-1 tvg-id="ItsSupernaturalNetwork.us",It's Supernatural! Network (ISN Network) (1080p) https://content.uplynk.com/channel/fbc0f835332e476397b12216f9042f78.m3u8 @@ -431,7 +431,7 @@ https://uni8rtmp.tulix.tv/shalomtv-pc/smil:shalomtv.smil/master.m3u8 https://app.viloud.tv/hls/channel/07c8b76fa3a98409d527cede85852d55.m3u8 #EXTINF:-1 tvg-id="JewelryTV.us",Jewelry Television (720p) https://content.jwplatform.com/live/broadcast/oe7UD7Ag.m3u8 -#EXTINF:-1 tvg-id="",Jewelry Television Espanol (720p) +#EXTINF:-1 tvg-id="JewelryTV.us@Spanish",Jewelry Television Espanol (720p) https://82934cf9c8696bd2.mediapackage.us-east-1.amazonaws.com/out/v1/72b5a55e4c35445f9e742871aa0aefa2/index.m3u8 #EXTINF:-1 tvg-id="JewelryTV2.us",Jewelry TV 2 (720p) https://content.jwplatform.com/live/broadcast/RW3cCwlw.m3u8 @@ -489,6 +489,8 @@ https://streamyes.alsolnet.com/quebuenaatlanta/live/index.m3u8 https://linear-344.frequency.stream/dist/vix/344/hls/master/playlist.m3u8 #EXTINF:-1 tvg-id="LacrosseTV.us",Lacrosse TV (720p) https://1840769862.rsc.cdn77.org/FTF/LSN_SCTE.m3u8 +#EXTINF:-1 tvg-id="Laff.us",Laff (480p) +http://72.46.118.193/Laff/index.m3u8 #EXTINF:-1 tvg-id="LaoThaiTV.us",Lao-Thai TV (720p) https://livefta.malimarcdn.com/ftaedge00/laothaius.sdp/playlist.m3u8 #EXTINF:-1 tvg-id="LatinZone.us",Latin Zone TV (720p) @@ -527,17 +529,17 @@ https://5a8308add0b31.streamlock.net/logoschannel.com/logostv.smil/playlist.m3u8 https://597f64b67707a.streamlock.net/logoschannel.com/logostv.smil/playlist.m3u8 #EXTINF:-1 tvg-id="LogosTVEnglish.us",Logos TV English (1080p) [Not 24/7] https://5aafcc5de91f1.streamlock.net/logoschannel.com/logoseng/playlist.m3u8 -#EXTINF:-1 tvg-id="LoneStarNetwork.us",Lone Star Network (720p) +#EXTINF:-1 tvg-id="",Lone Star Network (720p) https://6b88cde9.wurl.com/manifest/f36d25e7e52f1ba8d7e56eb859c636563214f541/UmFrdXRlblRWLWV1X0xvbmVTdGFyX0hMUw/ec788187-7d6a-4887-aeb7-cbe7214a3dc7/2.m3u8 #EXTINF:-1 tvg-id="Loupe4K.us",Loupe 4K (2160p) https://d2dw21aq0j0l5c.cloudfront.net/playlist.m3u8 -#EXTINF:-1 tvg-id="",LoveWorld USA (720p) +#EXTINF:-1 tvg-id="LoveWorldUSA.ng@SD",LoveWorld USA (720p) https://cdn3.wowza.com/5/RGtVZkFxL3FOQkxX/LWU/ngrp:lwu.stream_all/playlist.m3u8 #EXTINF:-1 tvg-id="MadDogandMerrill.us",Mad Dog and Merrill (540p) [Not 24/7] https://bozztv.com/gusa/gusa-mwg/index.m3u8 #EXTINF:-1 tvg-id="MajestadTV.us",Majestad Televisión (480p) [Not 24/7] https://livetv.305streamhd.com:3667/live/majestadtvlive.m3u8 -#EXTINF:-1 tvg-id="",MAV Select CANADA +#EXTINF:-1 tvg-id="MAVTVSelect.us@Canada",MAV Select CANADA https://d70mb4nkspm3g.cloudfront.net/v1/master/3722c60a815c199d9c0ef36c5b73da68a62b09d1/cc-vvwqo3j029lz0/playlist.m3u8 #EXTINF:-1 tvg-id="MAVTVSelect.us",MAV Select USA https://d3h07n6l1exhds.cloudfront.net/v1/master/3722c60a815c199d9c0ef36c5b73da68a62b09d1/cc-0z2yyo4dxctc7/playlist.m3u8 @@ -609,21 +611,21 @@ https://content.uplynk.com/channel/1f93c13275024afb9e0ead299624073d.m3u8 https://content.uplynk.com/channel/4bb4901b934c4e029fd4c1abfc766c37.m3u8 #EXTINF:-1 tvg-id="NickPlutoTV.us",Nick Pluto TV (720p) https://jmp2.uk/plu-62bdb6a83c6e37000726823b.m3u8 -#EXTINF:-1 tvg-id="NicktoonsEast.us",NickToons (720p) +#EXTINF:-1 tvg-id="Nicktoons.us@East",NickToons (720p) http://143.244.60.30/NICKTOONS/index.m3u8 -#EXTINF:-1 tvg-id="",Novelas +#EXTINF:-1 tvg-id="PlutoTVNovelas.us@SD",Novelas https://dai.google.com/linear/hls/event/4VaHBXfJSYihkeo7w_T0Qw/master.m3u8 #EXTINF:-1 tvg-id="Novelisima.us",Novelisima https://dai.google.com/linear/hls/event/sFuxwI37R9KMTs-KywMcBg/master.m3u8 #EXTINF:-1 tvg-id="NRBTV.us",NRB TV (480p) https://uni6rtmp.tulix.tv/nrbnetwork/myStream.sdp/playlist.m3u8 -#EXTINF:-1 tvg-id="NTDTVEast.us",NTD TV (New Tang Dynasty Television) +#EXTINF:-1 tvg-id="NTDTV.us@East",NTD TV (New Tang Dynasty Television) http://cnhls.ntdtv.com/cn/live400/playlist.m3u8 -#EXTINF:-1 tvg-id="NTDTVEast.us",NTD TV East (New Tang Dynasty Television) +#EXTINF:-1 tvg-id="NTDTV.us@East",NTD TV East (New Tang Dynasty Television) https://ntd02.akamaized.net/NTDA/index.m3u8 -#EXTINF:-1 tvg-id="",NTD TV UK (New Tang Dynasty Television) +#EXTINF:-1 tvg-id="NTDTV.us@UK",NTD TV UK (New Tang Dynasty Television) https://ntd02.akamaized.net/NTD-UK/index.m3u8 -#EXTINF:-1 tvg-id="NTDTVWest.us",NTD TV West (New Tang Dynasty Television) +#EXTINF:-1 tvg-id="NTDTV.us@West",NTD TV West (New Tang Dynasty Television) https://ntd02.akamaized.net/NTD-West/index.m3u8 #EXTINF:-1 tvg-id="KBPXLD3.us",Nudu https://d1p0bzoad08w6e.cloudfront.net/encode/nudu.m3u8 @@ -663,7 +665,7 @@ https://qvc-amd-live.akamaized.net/hls/live/2034113/lsqvc1us/master.m3u8 https://qvc-amd-live.akamaized.net/hls/live/2034113/lsqvc2us/master.m3u8 #EXTINF:-1 tvg-id="QVC3.us",QVC 3 (1080p) https://qvc-amd-live.akamaized.net/hls/live/2034113/lsqvc3us/master.m3u8 -#EXTINF:-1 tvg-id="",QVC West +#EXTINF:-1 tvg-id="QVC.us@West",QVC West https://qvc-amd-live.akamaized.net/hls/live/2034113/lsqvc1uswest/master.m3u8 #EXTINF:-1 tvg-id="RJTV.us",Radio Javan TV (1080p) http://74.115.215.41/live/smil:rjtv.smil/playlist.m3u8 @@ -729,7 +731,7 @@ https://rakutenaa-tm-intl-aus-rakuten-eu-n1gtg.amagi.tv/playlist/rakutenAA-tm-in https://tastemadessai.akamaized.net/amagi_hls_data_tastemade-tastemade/CDN/playlist.m3u8 #EXTINF:-1 tvg-id="TBD.us",TBD (1080p) https://fast-channels.sinclairstoryline.com/TBD/index.m3u8 -#EXTINF:-1 tvg-id="TBNEast.us",TBN East (720p) +#EXTINF:-1 tvg-id="TBN.us@East",TBN East (720p) https://d7ge95bb03xsu.cloudfront.net/out/v1/0c95a89614194912834019fc37d741ef/tbn-freecast.m3u8 #EXTINF:-1 tvg-id="TBNPacific.us",TBN Pacific https://broadcast.tbnpacific.org.au:4430/stream/TBNPacificTV/playlist.m3u8 @@ -743,7 +745,7 @@ https://tv2.fastcast4u.com:3238/live/radiotelebostonlive.m3u8 https://content.uplynk.com/channel/b6a96ed39d694ae1b738faa98cf7dd3f.m3u8 #EXTINF:-1 tvg-id="TelemundoInternacional.us",Telemundo Internacional (480p) http://190.2.212.209:8050/play/a0oa -#EXTINF:-1 tvg-id="TelemundoWest.us",Telemundo West (720p) +#EXTINF:-1 tvg-id="Telemundo.us@West",Telemundo West (720p) https://content.uplynk.com/channel/b6a96ed39d694ae1b738faa98cf7dd3f.m3u8?delay=10800 #EXTINF:-1 tvg-id="TennisChannel.us",Tennis Channel (1080p) https://cdn-uw2-prod.tsv2.amagi.tv/linear/amg01444-tennischannelth-tennischnlintl-lggb/playlist.m3u8 @@ -757,7 +759,7 @@ https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=74 https://cf-live29e5f8c.lwcdn.com/live/fallback/014dc067-4922-4168-bdcd-5278589269ed/playlist.m3u8 #EXTINF:-1 tvg-id="TheCountryNetwork.us",The Country Network (1080p) https://amg00600-amg00600c1-thecountrynetwork-us-5497.playouts.now.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",The Cycling Channel +#EXTINF:-1 tvg-id="TheCyclingChannel.at@SD",The Cycling Channel https://cyclingtv.playout.vju.tv/cyclingtv/main.m3u8 #EXTINF:-1 tvg-id="TheDesignNetwork.us",The Design Network (1080p) https://amg00441-amg00441c1-rakuten-us-6050.playouts.now.amagi.tv/playlist/amg00441-thedesignnetworkllcfast-thedesignnetwork-rakutenus/playlist.m3u8 @@ -797,7 +799,7 @@ https://d3mwqwqfak7y2q.cloudfront.net/v1/master/3722c60a815c199d9c0ef36c5b73da68 https://todayhls.wns.live/hls/stream.m3u8 #EXTINF:-1 tvg-id="ToonGoggles.us",Toon Goggles (720p) https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=37 -#EXTINF:-1 tvg-id="ToonamiAftermathEast.us",Toonami Aftermath East (480p) +#EXTINF:-1 tvg-id="ToonamiAftermath.us@East",Toonami Aftermath East (480p) http://api.toonamiaftermath.com:3000/est/playlist.m3u8 #EXTINF:-1 tvg-id="",Toonami Aftermath Movies (540p) http://api.toonamiaftermath.com:3000/movies/playlist.m3u8 @@ -813,10 +815,10 @@ https://app.viloud.tv/hls/channel/0d984388834adac967a4ec4e69bc8271.m3u8 https://server80.servistreaming.com:3074/hybrid/play.m3u8 #EXTINF:-1 tvg-id="TSTV.us",TSTV (720p) https://tstv-stream.tsm.utexas.edu/hls/livestream_hi/index.m3u8 -#EXTINF:-1 tvg-id="TUDN.us",TUDN -https://dai.google.com/linear/hls/event/LKaz-eTgQvawHshATl-Qdw/master.m3u8 #EXTINF:-1 tvg-id="TUDN.us",TUDN (1080p) https://tkx.mp.lura.live/rest/v2/mcp/video/adstkZj0NvKqzB6e?anvack=NVQrq6a3oZfdBzkefWT1rvdRCoj9XOyx&token=eyJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJOVlFycTZhM29aZmRCemtlZldUMXJ2ZFJDb2o5WE95eCIsImV4cCI6MTY1NjE5ODE4NSwiYWRfcGFycyI6eyJkZnAiOnsiaXVfdmFsdWVfZnJvbV9wYWdlIjoiL3VuZGVmaW5lZC9yZC51bml2aXNpb25fdmlkZW9fZGVwb3J0ZXMvZGFpIiwidXJsIjoiaHR0cHM6Ly93d3cudHVkbi5jb20vdHVkbi1saXZlc3RyZWFtLTI0LTciLCJwbGF5ZXJfd2lkdGgiOiI3NTMiLCJwbGF5ZXJfaGVpZ2h0IjoiNDI0IiwicHAiOiJEZXNrdG9wQml0UmF0ZXMiLCJtdnBkIjoidGVtcF9wYXNzIn19LCJ2aWQiOiJhZHN0a1pqME52S3F6QjZlIiwidXNlcl9wYXJzIjp7InByZWZlcnJlZF9jZG4iOnsibmFtZSI6ImFrYW1haSIsImZvcmNlIjp0cnVlfX19.Y9JMF-b_SUsCZ3WMkjU1cmNkiHvT7lmvYLsVbCx-Dhg +#EXTINF:-1 tvg-id="TUDN.us",TUDN +https://dai.google.com/linear/hls/event/LKaz-eTgQvawHshATl-Qdw/master.m3u8 #EXTINF:-1 tvg-id="TUTV.us",TUTV https://livestream.telvue.com/templeuni1/f7b44cfafd5c52223d5498196c8a2e7b.sdp/playlist.m3u8 #EXTINF:-1 tvg-id="TVSBowlingNetwork.us",TVS Bowling Network (720p) @@ -1008,5 +1010,3 @@ https://fastmedia-yu-gi-oh-1-gb.xiaomi.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="ZoomNews.us" http-referrer="https://zoomnews.info/",Zoom TV Kurdish (720p) #EXTVLCOPT:http-referrer=https://zoomnews.info/ https://live.zoomnews.info/live/Zoom_playlist.m3u8 -#EXTINF:-1 tvg-id="Laff.us",Laff (480p) -http://72.46.118.193/Laff/index.m3u8 diff --git a/streams/us_30a.m3u b/streams/us_30a.m3u index 86d5ffd3d4..aeeca6b593 100644 --- a/streams/us_30a.m3u +++ b/streams/us_30a.m3u @@ -5,10 +5,10 @@ https://30a-tv.com/darcizzle.m3u8 https://30a-tv.com/gh.m3u8 #EXTINF:-1 tvg-id="30AGolfKingdom.us",30A Golf Kingdom https://30a-tv.com/feeds/vidaa/golf.m3u8 -#EXTINF:-1 tvg-id="30AInvestmentPitch.us",30A Investment Pitch -https://www.30a-tv.com/InvPit.m3u8 #EXTINF:-1 tvg-id="30AInvestmentPitch.us",30A Investment Pitch (720p) https://30a-tv.com/feeds/xodglobal/30atv.m3u8 +#EXTINF:-1 tvg-id="30AInvestmentPitch.us",30A Investment Pitch +https://www.30a-tv.com/InvPit.m3u8 #EXTINF:-1 tvg-id="30ALionelNation.us",30A Lionel Nation TV https://30a-tv.com/ln.m3u8 #EXTINF:-1 tvg-id="30ALoomeredTV.us",30A Loomered TV diff --git a/streams/us_cineversetv.m3u b/streams/us_cineversetv.m3u index 5e08edbd7a..04a1fe4577 100644 --- a/streams/us_cineversetv.m3u +++ b/streams/us_cineversetv.m3u @@ -11,7 +11,7 @@ https://amg00432-circletvfast-amg00432c1-cineverse-us-1112.playouts.now.amagi.tv https://cdn-uw2-prod.tsv2.amagi.tv/linear/amg01201-cinedigmenterta-comedydynamics-cineverse/playlist.m3u8 #EXTINF:-1 tvg-id="",Crime Hunters https://amg01201-cinedigmenterta-crimehunters-cineverse-cnqvb.amagi.tv/playlist/amg01201-cinedigmenterta-crimehunters-cineverse/playlist.m3u8 -#EXTINF:-1 tvg-id="DogWhisperer.uk",Dog Whisperer with Cesar Millan [Geo-blocked] +#EXTINF:-1 tvg-id="",Dog Whisperer with Cesar Millan [Geo-blocked] https://amg01201-amg01201c30-cineverse-us-3100.playouts.now.amagi.tv/playlist/amg01201-cinedigmentertainment-dogwhispererwithcesarmilan-cineverseus/playlist.m3u8 #EXTINF:-1 tvg-id="DoveChannel.us",Dove Channel https://amg01201-cinedigmenterta-dove-cineverse-1fck5.amagi.tv/playlist/amg01201-cinedigmenterta-dove-cineverse/playlist.m3u8 diff --git a/streams/us_firetv.m3u b/streams/us_firetv.m3u index d46e731ab8..3c202893d0 100644 --- a/streams/us_firetv.m3u +++ b/streams/us_firetv.m3u @@ -3,11 +3,11 @@ https://raycom-accdn-firetv.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="AntiquesRoadTrip.us",Antiques Road Trip (1080p) [Geo-blocked] https://amg02333-pbs-amg02333c9-firetv-us-4249.playouts.now.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",BBC Earth (1080p) [Geo-blocked] +#EXTINF:-1 tvg-id="BBCEarth.uk@US",BBC Earth (1080p) [Geo-blocked] https://amg00793-amg00793c6-firetv-us-4067.playouts.now.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",BBC Top Gear (1080p) [Geo-blocked] https://amg00793-amg00793c5-firetv-us-4068.playouts.now.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",BeIN Sports XTRA (1080p) +#EXTINF:-1 tvg-id="beINSPORTSXTRA.us@SD",BeIN Sports XTRA (1080p) https://bein-beinxtrasports-firetv.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="BYUTV.us",BYU TV (1080p) [Geo-blocked] https://amg02604-byutv-amg02604c2-firetv-us-4981.playouts.now.amagi.tv/playlist.m3u8 @@ -81,7 +81,7 @@ https://amg02333-pbs-amg02333c6-firetv-us-4236.playouts.now.amagi.tv/playlist.m3 https://amg00461-eone-amg00461c2-firetv-us-5210.playouts.now.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="SportsGrid.us",SportsGrid https://amg00315-sportsgrid-firetv.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="TennisChannelPlus2.us",T2 Tennis Channel (1080p) +#EXTINF:-1 tvg-id="",T2 Tennis Channel (1080p) https://ttc-tennischannelus-firetv.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",Team USA (1080p) https://amg01416-amg01416c4-firetv-us-4522.playouts.now.amagi.tv/playlist.m3u8 diff --git a/streams/us_klowdtv.m3u b/streams/us_klowdtv.m3u index 9a8e1b6442..8db715f93e 100644 --- a/streams/us_klowdtv.m3u +++ b/streams/us_klowdtv.m3u @@ -27,13 +27,13 @@ https://circle-klowdtv.amagi.tv/playlist.m3u8 https://a-cdn.klowdtv.com/live2/diyatv_720p/playlist.m3u8 #EXTINF:-1 tvg-id="EuronewsEnglish.fr",Euronews English (720p) https://a-cdn.klowdtv.com/live3/euronews_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="France24English.fr",France 24 (720p) +#EXTINF:-1 tvg-id="France24.fr@English",France 24 (720p) https://a-cdn.klowdtv.com/live2/france24_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="France24Espanol.fr",France 24 Espanol (720p) +#EXTINF:-1 tvg-id="France24.fr@Spanish",France 24 Espanol (720p) https://a-cdn.klowdtv.com/live2/france24sp_720p/playlist.m3u8 #EXTINF:-1 tvg-id="FunRoads.us",Fun Roads TV (720p) https://a-cdn.klowdtv.com/live3/funroads_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="GameShowNetworkEast.us",Game Show Network East (720p) [Not 24/7] +#EXTINF:-1 tvg-id="GameShowNetwork.us@East",Game Show Network East (720p) [Not 24/7] https://a-cdn.klowdtv.com/live2/gsn_720p/playlist.m3u8 #EXTINF:-1 tvg-id="GamePlus.ca",Game+ (720p) https://a-cdn.klowdtv.com/live2/fntsy_720p/playlist.m3u8 @@ -55,7 +55,7 @@ https://amg01540-apexmedia-amg01540c2-klowdtv-us-1989.playouts.now.amagi.tv/play https://a-cdn.klowdtv.com/live2/infowars_720p/playlist.m3u8 #EXTINF:-1 tvg-id="JewishLifeTelevision.us",Jewish Life Television (720p) https://cdn.herringnetwork.com/80A4DFF/n1.herringnetwork.com/live3/jltv_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="",LATV (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="LATV.us@SD",LATV (720p) [Geo-blocked] https://amg00779-latv-amg00779c1-klowdtv-us-2135.playouts.now.amagi.tv/playlist/amg00779-latvnetworkllc-latv-klowdtvus/playlist.m3u8 #EXTINF:-1 tvg-id="LawCrime.us",Law & Crime (720p) https://a-cdn.klowdtv.com/live3/law_720p/playlist.m3u8 diff --git a/streams/us_moveonjoy.m3u b/streams/us_moveonjoy.m3u index 372984acf1..6b5d8d7c37 100644 --- a/streams/us_moveonjoy.m3u +++ b/streams/us_moveonjoy.m3u @@ -3,19 +3,19 @@ http://fl1.moveonjoy.com/ABC_EAST/index.m3u8 #EXTINF:-1 tvg-id="ACCNetwork.us",ACCN (720p) http://fl2.moveonjoy.com/ACC_NETWORK/index.m3u8 -#EXTINF:-1 tvg-id="AMCEast.us",AMC East (1080p) +#EXTINF:-1 tvg-id="AMC.us@East",AMC East (1080p) http://fl5.moveonjoy.com/AMC_NETWORK/index.m3u8 #EXTINF:-1 tvg-id="Aspire.us",Aspire http://fl3.moveonjoy.com/Aspire/index.m3u8 -#EXTINF:-1 tvg-id="BBCAmericaEast.us",BBC America East +#EXTINF:-1 tvg-id="BBCAmerica.us@East",BBC America East http://fl2.moveonjoy.com/BBC_AMERICA/index.m3u8 -#EXTINF:-1 tvg-id="BBCNewsNorthAmerica.uk",BBC News North America +#EXTINF:-1 tvg-id="BBCNews.uk@NorthAmerica",BBC News North America http://fl2.moveonjoy.com/BBC_WORLD_NEWS/index.m3u8 -#EXTINF:-1 tvg-id="BETEast.us",BET East +#EXTINF:-1 tvg-id="BET.us@East",BET East http://fl2.moveonjoy.com/BET_EAST/index.m3u8 #EXTINF:-1 tvg-id="BETGospel.us",BET Gospel http://fl2.moveonjoy.com/BET_GOSPEL/index.m3u8 -#EXTINF:-1 tvg-id="BETHerEast.us",BET Her East +#EXTINF:-1 tvg-id="BETHer.us@East",BET Her East http://fl2.moveonjoy.com/BET_HER/index.m3u8 #EXTINF:-1 tvg-id="BETJams.us",BET Jams http://fl3.moveonjoy.com/BET_Jams/index.m3u8 @@ -27,25 +27,25 @@ http://fl3.moveonjoy.com/BIG_TEN_NETWORK/index.m3u8 http://fl2.moveonjoy.com/BLOOMBERG/index.m3u8 #EXTINF:-1 tvg-id="Bounce.us",Bounce http://fl3.moveonjoy.com/BOUNCE_TV/index.m3u8 -#EXTINF:-1 tvg-id="BravoEast.us",Bravo East +#EXTINF:-1 tvg-id="Bravo.us@East",Bravo East http://fl2.moveonjoy.com/BRAVO/index.m3u8 #EXTINF:-1 tvg-id="Buzzr.us",Buzzr http://fl3.moveonjoy.com/Buzzr/index.m3u8 #EXTINF:-1 tvg-id="CSPAN.us",C-SPAN http://fl2.moveonjoy.com/C-SPAN/index.m3u8 -#EXTINF:-1 tvg-id="CBSEast.us",CBS East (720p) +#EXTINF:-1 tvg-id="CBS.us@East",CBS East (720p) http://fl3.moveonjoy.com/CBS_News/index.m3u8 #EXTINF:-1 tvg-id="CBSSportsNetworkUSA.us",CBS Sports Network USA http://fl2.moveonjoy.com/CBS_SPORTS_NETWORK/index.m3u8 #EXTINF:-1 tvg-id="CleoTV.us",Cleo TV (720p) http://fl3.moveonjoy.com/Cleo_TV/index.m3u8 -#EXTINF:-1 tvg-id="CMTEast.us",CMT East +#EXTINF:-1 tvg-id="CMT.us@East",CMT East http://fl3.moveonjoy.com/CMT/index.m3u8 #EXTINF:-1 tvg-id="CNBC.us",CNBC http://fl2.moveonjoy.com/CNBC/index.m3u8 #EXTINF:-1 tvg-id="CNBC.us",CNBC http://fl5.moveonjoy.com/CNBC/index.m3u8 -#EXTINF:-1 tvg-id="ComedyCentralEast.us",Comedy Central East (720p) +#EXTINF:-1 tvg-id="ComedyCentral.us@East",Comedy Central East (720p) http://fl3.moveonjoy.com/Comedy_Central/index.m3u8 #EXTINF:-1 tvg-id="Comet.us",Comet (720p) http://fl3.moveonjoy.com/COMET/index.m3u8 @@ -63,11 +63,11 @@ http://fl3.moveonjoy.com/CRAVE_3/index.m3u8 http://fl2.moveonjoy.com/CRAVE_4/index.m3u8 #EXTINF:-1 tvg-id="CuriosityStream.us",CuriosityStream (720p) http://fl3.moveonjoy.com/Curiosity_Stream/index.m3u8 -#EXTINF:-1 tvg-id="DisneyJuniorEast.us",Disney Junior East +#EXTINF:-1 tvg-id="DisneyJunior.us@East",Disney Junior East http://fl2.moveonjoy.com/DISNEY_JR/index.m3u8 -#EXTINF:-1 tvg-id="DisneyXDWest.us",Disney XD West (720p) +#EXTINF:-1 tvg-id="DisneyXD.us@West",Disney XD West (720p) http://fl2.moveonjoy.com/DISNEY_XD/index.m3u8 -#EXTINF:-1 tvg-id="EEast.us",E! East +#EXTINF:-1 tvg-id="E.us@East",E! East http://fl2.moveonjoy.com/E_ENTERTAINMENT_TELEVISION/index.m3u8 #EXTINF:-1 tvg-id="ESPNU.us",ESPN U (720p) http://fl2.moveonjoy.com/ESPN_U/index.m3u8 @@ -77,19 +77,19 @@ http://fl2.moveonjoy.com/ESPN_NEWS/index.m3u8 http://fl2.moveonjoy.com/FOX_Business_Network/index.m3u8 #EXTINF:-1 tvg-id="FoxSoul.us",Fox Soul http://fl1.moveonjoy.com/FOX_SOUL/index.m3u8 -#EXTINF:-1 tvg-id="FoxSports1.us",Fox Sports 1 +#EXTINF:-1 tvg-id="FoxSports1.cl@SD",Fox Sports 1 http://fl2.moveonjoy.com/FOX_Sports_1/index.m3u8 -#EXTINF:-1 tvg-id="FreeformEast.us",Free form East +#EXTINF:-1 tvg-id="Freeform.us@East",Free form East http://fl2.moveonjoy.com/FREE_FORM/index.m3u8 -#EXTINF:-1 tvg-id="FuseEast.us",Fuse East (720p) +#EXTINF:-1 tvg-id="Fuse.us@East",Fuse East (720p) http://fl2.moveonjoy.com/FUSE/index.m3u8 -#EXTINF:-1 tvg-id="FXEast.us",FX East +#EXTINF:-1 tvg-id="FX.us@East",FX East http://fl2.moveonjoy.com/FX/index.m3u8 -#EXTINF:-1 tvg-id="FXMEast.us",FXM East +#EXTINF:-1 tvg-id="FXM.us@East",FXM East http://fl2.moveonjoy.com/FX_MOVIE/index.m3u8 -#EXTINF:-1 tvg-id="FXXEast.us",FXX East +#EXTINF:-1 tvg-id="FXX.us@East",FXX East http://fl2.moveonjoy.com/FXX/index.m3u8 -#EXTINF:-1 tvg-id="FYIEast.us",FYI East +#EXTINF:-1 tvg-id="FYI.us@East",FYI East http://fl2.moveonjoy.com/FYI/index.m3u8 #EXTINF:-1 tvg-id="GetTV.us",GetTV (480p) http://fl2.moveonjoy.com/GET_TV/index.m3u8 @@ -97,31 +97,31 @@ http://fl2.moveonjoy.com/GET_TV/index.m3u8 http://fl2.moveonjoy.com/GOLF_CHANNEL/index.m3u8 #EXTINF:-1 tvg-id="Grit.us",Grit http://fl2.moveonjoy.com/GRIT_TV/index.m3u8 -#EXTINF:-1 tvg-id="HallmarkChannelEast.us",Hallmark Channel East +#EXTINF:-1 tvg-id="HallmarkChannel.us@East",Hallmark Channel East http://fl2.moveonjoy.com/HALLMARK_CHANNEL/index.m3u8 #EXTINF:-1 tvg-id="HallmarkDrama.us",Hallmark Drama (720p) http://fl2.moveonjoy.com/HALLMARK_DRAMA/index.m3u8 -#EXTINF:-1 tvg-id="HallmarkMoviesMysteriesEast.us",Hallmark Movies Mysteries East +#EXTINF:-1 tvg-id="HallmarkMoviesMysteries.us@East",Hallmark Movies Mysteries East http://fl2.moveonjoy.com/HALLMARK_MOVIES_MYSTERIES/index.m3u8 #EXTINF:-1 tvg-id="HSN.us",HSN http://fl2.moveonjoy.com/HSN/index.m3u8 #EXTINF:-1 tvg-id="INSP.us",INSP http://fl2.moveonjoy.com/INSP/index.m3u8 -#EXTINF:-1 tvg-id="IONPlusEast.us",ION Plus East (720p) +#EXTINF:-1 tvg-id="IONPlus.us@East",ION Plus East (720p) http://fl3.moveonjoy.com/ION_Plus/index.m3u8 -#EXTINF:-1 tvg-id="IONTVEast.us",ION TV East +#EXTINF:-1 tvg-id="IONTV.us@East",ION TV East http://fl2.moveonjoy.com/ION_TV/index.m3u8 #EXTINF:-1 tvg-id="KSATDT2.us",KSAT-DT2 (720p) http://fl2.moveonjoy.com/ME_TV/index.m3u8 -#EXTINF:-1 tvg-id="LifetimeEast.us",Lifetime East +#EXTINF:-1 tvg-id="Lifetime.us@East",Lifetime East http://fl2.moveonjoy.com/LIFETIME/index.m3u8 -#EXTINF:-1 tvg-id="LifetimeMoviesEast.us",Lifetime Movies East +#EXTINF:-1 tvg-id="LifetimeMovies.us@East",Lifetime Movies East http://fl2.moveonjoy.com/LIFETIME_MOVIE_NETWORK/index.m3u8 #EXTINF:-1 tvg-id="LoveNature.ca",Love Nature http://fl1.moveonjoy.com/LOVE_NATURE/index.m3u8 #EXTINF:-1 tvg-id="MAVTV.us",MAV TV (720p) http://fl2.moveonjoy.com/MAV_TV/index.m3u8 -#EXTINF:-1 tvg-id="MGMPlusEast.us",MGM+ East +#EXTINF:-1 tvg-id="MGMPlus.us@East",MGM+ East http://fl2.moveonjoy.com/EPIX/index.m3u8 #EXTINF:-1 tvg-id="MGMPlusMarquee.us",MGM+ Marquee http://fl2.moveonjoy.com/EPIX_DRIVE_IN/index.m3u8 @@ -129,29 +129,29 @@ http://fl2.moveonjoy.com/EPIX_DRIVE_IN/index.m3u8 http://fl2.moveonjoy.com/MLB_NETWORK/index.m3u8 #EXTINF:-1 tvg-id="MSG.us",MSG http://fl3.moveonjoy.com/MSG/index.m3u8 -#EXTINF:-1 tvg-id="MTV2East.us",MTV2 (720p) +#EXTINF:-1 tvg-id="MTV2.us@East",MTV2 (720p) https://fl5.moveonjoy.com/MTV_2/index.m3u8 -#EXTINF:-1 tvg-id="MTV2East.us",MTV2 East +#EXTINF:-1 tvg-id="MTV2.us@East",MTV2 East http://fl2.moveonjoy.com/MTV_2/index.m3u8 -#EXTINF:-1 tvg-id="MTVClassicEast.us",MTV Classic (360p) +#EXTINF:-1 tvg-id="MTVClassic.us@East",MTV Classic (360p) https://fl5.moveonjoy.com/MTV_CLASSIC/index.m3u8 -#EXTINF:-1 tvg-id="MTVClassicEast.us",MTV Classic East (720p) +#EXTINF:-1 tvg-id="MTVClassic.us@East",MTV Classic East (720p) https://fl2.moveonjoy.com/MTV_CLASSIC/index.m3u8 -#EXTINF:-1 tvg-id="MTVEast.us",MTV East +#EXTINF:-1 tvg-id="MTV.us@East",MTV East http://fl2.moveonjoy.com/MTV/index.m3u8 -#EXTINF:-1 tvg-id="MTVLive.us",MTV Live -http://fl2.moveonjoy.com/MTV_LIVE/index.m3u8 #EXTINF:-1 tvg-id="MTVLive.us",MTV Live (720p) https://fl5.moveonjoy.com/MTV_LIVE/index.m3u8 -#EXTINF:-1 tvg-id="MTVU.us",MTVU -http://fl2.moveonjoy.com/MTV_U/index.m3u8 +#EXTINF:-1 tvg-id="MTVLive.us",MTV Live +http://fl2.moveonjoy.com/MTV_LIVE/index.m3u8 #EXTINF:-1 tvg-id="MTVU.us",mtvU (480p) https://fl5.moveonjoy.com/MTV_U/index.m3u8 +#EXTINF:-1 tvg-id="MTVU.us",MTVU +http://fl2.moveonjoy.com/MTV_U/index.m3u8 #EXTINF:-1 tvg-id="Much.ca",Much (720p) http://fl1.moveonjoy.com/MUCH/index.m3u8 -#EXTINF:-1 tvg-id="NationalGeographicEast.us",National Geographic East +#EXTINF:-1 tvg-id="NationalGeographic.us@East",National Geographic East http://fl2.moveonjoy.com/National_Geographic/index.m3u8 -#EXTINF:-1 tvg-id="NationalGeographicWildEast.us",National Geographic Wild East +#EXTINF:-1 tvg-id="NationalGeographicWild.us@East",National Geographic Wild East http://fl2.moveonjoy.com/Nat_Geo_Wild/index.m3u8 #EXTINF:-1 tvg-id="NBATV.us",NBA TV http://fl2.moveonjoy.com/NBA_TV/index.m3u8 @@ -163,29 +163,29 @@ http://fl2.moveonjoy.com/NFL_NETWORK/index.m3u8 http://fl1.moveonjoy.com/NFL_RedZone/index.m3u8 #EXTINF:-1 tvg-id="NHLNetwork.us",NHL Network (720p) http://fl2.moveonjoy.com/NHL_NETWORK/index.m3u8 -#EXTINF:-1 tvg-id="NickJrEast.us",Nick Jr East +#EXTINF:-1 tvg-id="NickJr.us@East",Nick Jr East http://fl2.moveonjoy.com/NICK_JR/index.m3u8 -#EXTINF:-1 tvg-id="NickJrEast.us",Nick Jr. East (720p) +#EXTINF:-1 tvg-id="NickJr.us@East",Nick Jr. East (720p) https://fl5.moveonjoy.com/NICK_JR/index.m3u8 #EXTINF:-1 tvg-id="NickMusic.us",Nick Music (720p) http://fl2.moveonjoy.com/NICK_MUSIC/index.m3u8 #EXTINF:-1 tvg-id="NickMusic.us",Nick Music (480p) http://fl5.moveonjoy.com/NICK_MUSIC/index.m3u8 -#EXTINF:-1 tvg-id="NickelodeonEast.us",Nickelodeon East +#EXTINF:-1 tvg-id="Nickelodeon.us@East",Nickelodeon East http://fl1.moveonjoy.com/NICKELODEON/index.m3u8 -#EXTINF:-1 tvg-id="NicktoonsEast.us",Nicktoons East +#EXTINF:-1 tvg-id="Nicktoons.us@East",Nicktoons East http://fl1.moveonjoy.com/NICKTOONS/index.m3u8 #EXTINF:-1 tvg-id="OutdoorChannel.us",Outdoor Channel http://fl2.moveonjoy.com/OUTDOOR_CHANNEL/index.m3u8 -#EXTINF:-1 tvg-id="OuterMaxEast.us",OuterMax East (720p) +#EXTINF:-1 tvg-id="OuterMax.us@East",OuterMax East (720p) http://fl2.moveonjoy.com/OUTER_MAX/index.m3u8 #EXTINF:-1 tvg-id="OutsideTV.us",Outside TV http://fl2.moveonjoy.com/OUTSIDE_TV/index.m3u8 #EXTINF:-1 tvg-id="Ovation.us",Ovation (1080p) http://fl3.moveonjoy.com/Ovation/index.m3u8 -#EXTINF:-1 tvg-id="OxygenEast.us",Oxygen East +#EXTINF:-1 tvg-id="Oxygen.us@East",Oxygen East http://fl2.moveonjoy.com/OXYGEN/index.m3u8 -#EXTINF:-1 tvg-id="ParamountNetworkEast.us",Paramount Network East +#EXTINF:-1 tvg-id="ParamountNetwork.us@East",Paramount Network East http://fl2.moveonjoy.com/PARAMOUNT_NETWORK/index.m3u8 #EXTINF:-1 tvg-id="PursuitChannel.us",Pursuit Channel (720p) http://fl3.moveonjoy.com/Pursuit_Channel/index.m3u8 @@ -195,17 +195,17 @@ http://fl2.moveonjoy.com/QVC/index.m3u8 http://fl2.moveonjoy.com/REELZ/index.m3u8 #EXTINF:-1 tvg-id="Revolt.us",Revolt http://fl2.moveonjoy.com/REVOLT/index.m3u8 -#EXTINF:-1 tvg-id="Showtime2East.us",Showtime 2 East +#EXTINF:-1 tvg-id="Showtime2.us@East",Showtime 2 East http://fl2.moveonjoy.com/SHOWTIME_2/index.m3u8 -#EXTINF:-1 tvg-id="ShowtimeEast.us",Showtime East +#EXTINF:-1 tvg-id="Showtime.us@East",Showtime East http://fl2.moveonjoy.com/SHOWTIME/index.m3u8 -#EXTINF:-1 tvg-id="ShowtimeNextEast.us",Showtime Next East +#EXTINF:-1 tvg-id="ShowtimeNext.us@East",Showtime Next East http://fl2.moveonjoy.com/SHOWTIME_NEXT/index.m3u8 -#EXTINF:-1 tvg-id="ShowtimeWest.us",Showtime West (1080p) +#EXTINF:-1 tvg-id="Showtime.us@West",Showtime West (1080p) http://fl2.moveonjoy.com/SHOWTIME_WEST/index.m3u8 -#EXTINF:-1 tvg-id="ShowtimeWomenEast.us",Showtime Women East +#EXTINF:-1 tvg-id="ShowtimeWomen.us@East",Showtime Women East http://fl2.moveonjoy.com/SHOWTIME_WOMEN/index.m3u8 -#EXTINF:-1 tvg-id="SmithsonianChannelEast.us",Smithsonian Channel East +#EXTINF:-1 tvg-id="SmithsonianChannel.us@East",Smithsonian Channel East http://fl2.moveonjoy.com/SMITHSONIAN_CHANNEL/index.m3u8 #EXTINF:-1 tvg-id="SportsmanChannel.us",Sportsman Channel http://fl2.moveonjoy.com/SPORTSMAN_CHANNEL/index.m3u8 @@ -213,15 +213,15 @@ http://fl2.moveonjoy.com/SPORTSMAN_CHANNEL/index.m3u8 http://fl2.moveonjoy.com/SNY/index.m3u8 #EXTINF:-1 tvg-id="StartTV.us",Start TV http://fl3.moveonjoy.com/Start_Tv/index.m3u8 -#EXTINF:-1 tvg-id="StarzEast.us",Starz East +#EXTINF:-1 tvg-id="Starz.us@East",Starz East http://fl2.moveonjoy.com/STARZ/index.m3u8 -#EXTINF:-1 tvg-id="StarzEncoreClassicEast.us",Starz Encore Classic East +#EXTINF:-1 tvg-id="StarzEncoreClassic.us@East",Starz Encore Classic East http://fl5.moveonjoy.com/STARZ_ENCORE_CLASSIC/index.m3u8 -#EXTINF:-1 tvg-id="StarzWest.us",Starz West +#EXTINF:-1 tvg-id="Starz.us@West",Starz West http://fl2.moveonjoy.com/STARZ_WEST/index.m3u8 -#EXTINF:-1 tvg-id="SundanceTVEast.us",Sundance TV East +#EXTINF:-1 tvg-id="SundanceTV.us@East",Sundance TV East http://fl2.moveonjoy.com/SUNDANCE/index.m3u8 -#EXTINF:-1 tvg-id="SyfyEast.us",Syfy East +#EXTINF:-1 tvg-id="Syfy.us@East",Syfy East http://fl2.moveonjoy.com/SYFY/index.m3u8 #EXTINF:-1 tvg-id="TennisChannel.us",Tennis Channel http://fl2.moveonjoy.com/TENNIS_CHANNEL/index.m3u8 @@ -235,21 +235,21 @@ http://fl5.moveonjoy.com/TSN_3/index.m3u8 http://fl5.moveonjoy.com/TSN_4/index.m3u8 #EXTINF:-1 tvg-id="TSN5.ca",TSN5 http://fl5.moveonjoy.com/TSN_5/index.m3u8 -#EXTINF:-1 tvg-id="TVLandEast.us",TV Land East +#EXTINF:-1 tvg-id="TVLand.us@East",TV Land East http://fl2.moveonjoy.com/TV_Land/index.m3u8 #EXTINF:-1 tvg-id="TVOne.us",TV One http://fl2.moveonjoy.com/TV_ONE/index.m3u8 #EXTINF:-1 tvg-id="UpTV.us",Up TV (1080p) http://fl3.moveonjoy.com/Up_Tv/index.m3u8 -#EXTINF:-1 tvg-id="USANetworkEast.us",USA Network East (720p) +#EXTINF:-1 tvg-id="USANetwork.us@East",USA Network East (720p) http://fl2.moveonjoy.com/USA_Network/index.m3u8 -#EXTINF:-1 tvg-id="VH1East.us",VH1 East +#EXTINF:-1 tvg-id="VH1.us@East",VH1 East http://fl2.moveonjoy.com/VH1/index.m3u8 #EXTINF:-1 tvg-id="VICETV.us",VICE TV (720p) http://fl2.moveonjoy.com/VICELAND/index.m3u8 -#EXTINF:-1 tvg-id="WNetworkEast.ca",W Network (720p) +#EXTINF:-1 tvg-id="WNetwork.ca@East",W Network (720p) http://fl2.moveonjoy.com/W_NETWORK/index.m3u8 -#EXTINF:-1 tvg-id="WeTVEast.us",We TV East +#EXTINF:-1 tvg-id="WeTV.us@East",We TV East http://fl1.moveonjoy.com/WE_TV/index.m3u8 #EXTINF:-1 tvg-id="WGNDT1.us",WGN-DT1 (720p) http://fl2.moveonjoy.com/WGN/index.m3u8 diff --git a/streams/us_pbs.m3u b/streams/us_pbs.m3u index 8d9bd91c38..cc33f76a54 100644 --- a/streams/us_pbs.m3u +++ b/streams/us_pbs.m3u @@ -23,9 +23,9 @@ https://livestream.pbskids.org/out/v1/c707b9310f2848de849b336f9914adbc/pst.m3u8 https://kuondt.lls.pbs.org/out/v1/91d8b5ffc5c1453c8a621508a07749a6/index.m3u8 #EXTINF:-1 tvg-id="WMPTDT1.us",PBS MPT Baltimore MD (WMPB) (1080p) https://2-fss-2.streamhoster.com/pl_138/amlst:201814-1291584/playlist.m3u8 -#EXTINF:-1 tvg-id="PBSEast.us",PBS National East (1080p) [Geo-blocked] +#EXTINF:-1 tvg-id="PBS.us@East",PBS National East (1080p) [Geo-blocked] https://pbs.lls.cdn.pbs.org/est/index.m3u8 -#EXTINF:-1 tvg-id="PBSWest.us",PBS National West (1080p) [Geo-blocked] +#EXTINF:-1 tvg-id="PBS.us@East",PBS National West (1080p) [Geo-blocked] https://pbs.lls.cdn.pbs.org/pst/index.m3u8 #EXTINF:-1 tvg-id="WNJTDT1.us",PBS New Jersey NJ (WNJT) (1080p) [Not 24/7] https://wnjtdt.lls.pbs.org/out/v1/e62efd8d4f92403996425fc389df0ffd/index.m3u8 diff --git a/streams/us_pluto.m3u b/streams/us_pluto.m3u index 8cc55665eb..ae92a133b4 100644 --- a/streams/us_pluto.m3u +++ b/streams/us_pluto.m3u @@ -55,13 +55,13 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60a3d889a5b3690008dc7fe8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c26ce96-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=257eaf62-d268-45a0-8abf-fe20817952f9 #EXTINF:-1 tvg-id="Baywatch.us",Baywatch http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d815eb889bca2ce7b746fdd/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c26ce97-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f25ee872-2318-41f5-9217-d8d7a6edc084 -#EXTINF:-1 tvg-id="",BBC Earth +#EXTINF:-1 tvg-id="BBCEarth.uk@US",BBC Earth http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/656535fc2c46f30008870fae/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c26ce98-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=73fe2b3e-3885-4bd2-874c-cc5f2153e555 #EXTINF:-1 tvg-id="BBCFood.us",BBC Food http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5fb5844bf5514d0007945bda/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c26f5a0-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c628f2e9-ff30-4bd0-9ff6-99fb1649f628 #EXTINF:-1 tvg-id="BBCHomeGarden.us",BBC Home & Garden http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5fb5836fe745b600070fc743/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c26f5a1-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=844b6663-bad2-462b-9aef-d0f33d5dfaa0 -#EXTINF:-1 tvg-id="",BBC News +#EXTINF:-1 tvg-id="BBCNews.uk@NorthAmerica",BBC News http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65d92a8c8b24c80008e285c0/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c26f5a2-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9f1a48db-9022-43d1-bb25-ba665285192f #EXTINF:-1 tvg-id="BebecitoBumysusamigos.us",Bebecito Bum y sus amigos http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60493283ffc52f000710edae/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c26f5a3-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=85e80dc7-d7c2-49ee-b346-20b976b1db9b @@ -75,7 +75,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60f760bbdf090700075d7bfe/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c26f5a7-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2ffa3ab8-f961-4798-abdc-ca98d4ae0e8c #EXTINF:-1 tvg-id="BestofTheDrewBarrymoreShow.us",Best of The Drew Barrymore Show http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/61858ac0491af10007f8ce4f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c271cb0-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2c352ba7-2c2d-46fb-8d20-825228d05244 -#EXTINF:-1 tvg-id="BETHerEast.us",BET Her +#EXTINF:-1 tvg-id="BETHer.us@East",BET Her http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d51e6949ab8e2b35bdcaa9f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c271cb1-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=11b0b672-bcc1-4276-a5bb-e260ed6b89f4 #EXTINF:-1 tvg-id="BETPlutoTV.us",BET Pluto TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ca670f6593a5d78f0e85aed/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c271cb2-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9e4dfe90-0228-4bbb-b7cd-1e422a0e7cbb @@ -165,7 +165,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f513564e4622a0007c578c0/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c27b8f6-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5cedbdba-6871-4161-a12d-d20faa66e6b8 #EXTINF:-1 tvg-id="CineAdrenalina.us",Cine Adrenalina http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d8d164d92e97a5e107638d2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c27b8f7-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4d042878-a4ee-480d-8f14-ebbfb96388e9 -#EXTINF:-1 tvg-id="",Cine Clásico +#EXTINF:-1 tvg-id="PlutoTVCineClasico.us@US",Cine Clásico http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64b9671cdac71b0008f371df/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c27b8f8-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=28fb2aae-fcc1-4b39-a190-1ac70222ae41 #EXTINF:-1 tvg-id="CinePremiere.us",Cine Premiere http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5cf968040ab7d8f181e6a68b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c27e000-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a7f04239-fee6-40d2-9e5e-6893a6d330ec @@ -265,7 +265,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5cf0622da00ca1e2f6fac712/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c28a355-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=73f1f3b5-9aab-48b7-b385-cc16a962802a #EXTINF:-1 tvg-id="",ET http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5dc0c78281eddb0009a02d5e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c28a356-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ac04a8b1-db8e-4c72-806c-5f1d1413c614 -#EXTINF:-1 tvg-id="",Euronews +#EXTINF:-1 tvg-id="EuronewsEnglish.fr@SD",Euronews http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60492dcf1c9b6a00089f41df/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c28a357-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=fa72d986-0119-4efe-aab7-e87e09aafd24 #EXTINF:-1 tvg-id="FailArmy.us",FailArmy http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/554158e864526b29254ff105/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c28a358-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c35f867b-7463-4560-8d61-09b18127126b @@ -295,7 +295,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/56171fafada51f8004c4b40f/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c28f171-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1acb41ce-ae24-4bbc-bf7d-831de72589e8 #EXTINF:-1 tvg-id="",Formula 1 Channel http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65c69ee3d77d450008c80438/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c28f172-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=922e06a8-1ba6-4236-9931-06d471735996 -#EXTINF:-1 tvg-id="FoxSports.us",Fox Sports +#EXTINF:-1 tvg-id="",Fox Sports http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5a74b8e1e22a61737979c6bf/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c28f173-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=46a3b8ff-5a4a-4952-bb4d-9461224acd54 #EXTINF:-1 tvg-id="FunnyAF.us",Funny AF http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/580e87ff497c73ba2f321dd3/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c28f174-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=bbaba395-2ecd-414c-971c-2d705e4b67d5 @@ -303,7 +303,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/58 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e54187aae660e00093561d6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c28f175-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9ee0129e-a216-405f-b055-21379b2d05c4 #EXTINF:-1 tvg-id="GarfieldandFriends.us",Garfield and Friends http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60faf9ddfcc1f200070a5932/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c28f176-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=68c3c9ce-0e68-43fa-ade2-43491d9d88e2 -#EXTINF:-1 tvg-id="",Ghost Hunters +#EXTINF:-1 tvg-id="GhostHunters.us@US",Ghost Hunters http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64e561a4354251000823a0e0/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c28f177-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=15d446c5-1e1e-4ecb-8d96-6d0b45104d20 #EXTINF:-1 tvg-id="GloryKickboxing.us",Glory Kickboxing http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5417a212ff9fba68282fbf5e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c28f178-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=df3ca9c7-d700-4719-be3f-74dd169206f8 @@ -325,7 +325,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/628e685ba3811100070551a8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c291886-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=58dbb587-5d0d-412d-ae10-107ee9caac5a #EXTINF:-1 tvg-id="HappyDays.us",Happy Days http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f7794162a4559000781fc12/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c291887-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=79cd5eee-7461-4328-a396-7f65a3e5736f -#EXTINF:-1 tvg-id="HeartlandEastern.us",Heartland +#EXTINF:-1 tvg-id="Heartland.us@Web",Heartland http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/61f07513227feb00073ee6bc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c291888-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4c0b4f02-0b37-467a-87a8-5f605cce8cba #EXTINF:-1 tvg-id="HellsKitchenenespanol.us",Hell's Kitchen en español http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60492b2794116800073e32dc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c293f90-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=12baeda8-54dc-41d3-965e-6fd5c80400b1 @@ -347,7 +347,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/56 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60807fd5db701400078219c2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c293f98-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ebedec3d-689a-4150-a2fd-4e2e34eb982c #EXTINF:-1 tvg-id="Investiga.us",Investiga http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5cf96b8f4f1ca3f0629f4bf1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c293f99-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=28f850bd-0f1c-4ede-b97c-ebd1d9a28126 -#EXTINF:-1 tvg-id="IONTVEast.us",ION +#EXTINF:-1 tvg-id="IONTV.us@East",ION http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65453f30085df200085883d8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c293f9a-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e7cc513a-0132-4e4f-85f1-bb3cb90423fd #EXTINF:-1 tvg-id="IronChef.us",Iron Chef http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6148c756ce8091000748d113/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2966a0-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0631b4f5-34e8-4fb8-b19f-04e5c118a18f @@ -413,7 +413,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e66968a70f34c0007d050be/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c29dbd3-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0f1d3baf-2f1b-47d7-9966-3e92a98f1c8a #EXTINF:-1 tvg-id="",Modern Marvels Presented by HISTORY http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65775d29dfed030008cb3db2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c29dbd4-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1ed6ccc7-6463-4bcb-ac69-b4dfa479016d -#EXTINF:-1 tvg-id="",Monster Jam +#EXTINF:-1 tvg-id="MonsterJam.pl@US",Monster Jam http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65c69b683ba51e00084534a3/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c29dbd5-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=414e0846-04a7-4d68-9f4e-a8c0750c4959 #EXTINF:-1 tvg-id="",More True Crime http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6532e6a9bdf3cf000887ab29/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c29dbd6-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7af25055-d39c-4f5a-b06f-b3a755e8b993 @@ -451,7 +451,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5c http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d14fdb8ca91eedee1633117/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2a29f3-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f1066e5a-9a82-4a1b-a025-868c083394e4 #EXTINF:-1 tvg-id="MundoGeek.us",Mundo Geek http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6051201a0aa8a70007c24a2a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2a29f4-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7fc7013e-e998-4f7a-8d41-f74aa6395d00 -#EXTINF:-1 tvg-id="",Mundo Paranormal +#EXTINF:-1 tvg-id="MundoParanormal.us@SD",Mundo Paranormal http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60492a9bbca75b0007b1bfd5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2a29f5-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7e541b5d-5f75-4470-916b-52c849de9cff #EXTINF:-1 tvg-id="MundoViajero.us",Mundo Viajero http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60511efd71ec430007f50d97/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2a29f6-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e048dd46-54cc-485e-b0d7-5ee578a0a861 @@ -459,7 +459,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6549337183595c000815ad05/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2a29f7-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8b79f9ba-6021-48dd-b1ca-e60b7396018c #EXTINF:-1 tvg-id="Naruto.us",Naruto http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5da0c85bd2c9c10009370984/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2a29f8-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=bbd39836-427d-4099-82bb-28b34f88aa35 -#EXTINF:-1 tvg-id="",Naturescape +#EXTINF:-1 tvg-id="StingrayNaturescape.ca@SD",Naturescape http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5812bd9f249444e05d09cc4e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2a29f9-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2ac7255b-3bb1-4cd4-80c9-afb0bcb127dd #EXTINF:-1 tvg-id="",NBC New York News http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65790c72cbd0d60008fac4d0/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2a5100-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1590d16f-7216-4de9-80e8-cd9f77d26da8 @@ -513,7 +513,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/656538bb635c3c0008695660/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2a9f25-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=45e6a446-ffdc-462d-8390-f228e5abc25c #EXTINF:-1 tvg-id="PerryMason.us",Perry Mason http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6197086891ddd4000739941a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2a9f26-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ca24aed8-2923-4a88-ade9-1f918964f008 -#EXTINF:-1 tvg-id="",PFL MMA +#EXTINF:-1 tvg-id="PFLMMA.pl@SD",PFL MMA http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6334a574605f140007e233c4/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2a9f27-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9e7c1ca7-ed35-4230-ab56-f8dbc86b0af4 #EXTINF:-1 tvg-id="PGATour.us",PGA Tour http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5de94dacb394a300099fa22a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2ac630-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6c2b7359-0375-4f34-996b-4fb9429ead78 @@ -549,7 +549,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5b http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5b4e92e4694c027be6ecece1/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2aed44-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=01b9b883-5344-4e99-81f9-dc1d9942ca58 #EXTINF:-1 tvg-id="PlutoTVFantastic.us",Pluto TV Fantastic http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5b64a245a202b3337f09e51d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2aed45-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=46d9eb84-1a99-477f-99be-7f761b922cd2 -#EXTINF:-1 tvg-id="",Pluto TV Food +#EXTINF:-1 tvg-id="PlutoTVFood.us@US",Pluto TV Food http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5877ac8cb791f4eb4a140d81/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2aed46-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f50f5a35-cd22-4046-9c5b-355b6f701720 #EXTINF:-1 tvg-id="PlutoTVGameShows.us",Pluto TV Game Shows http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6036e7c385749f00075dbd3b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2aed47-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=33f00d08-5ecc-4756-847e-6afcf19395bc @@ -637,7 +637,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/54 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5cf96b1c4f1ca3f0629f4bf0/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2b8987-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1202ea23-d955-4016-bac1-563ea6638683 #EXTINF:-1 tvg-id="SeriesconN.us",Series con Ñ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60fb3087fbbc120007fc46be/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2b8988-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8d10604b-577d-49d0-a6bc-03b028c6758f -#EXTINF:-1 tvg-id="",Shades of Black +#EXTINF:-1 tvg-id="ShadesofBlack.pl@SD",Shades of Black http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6176fddda3a6160007f60433/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2b8989-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b8d60fb4-d128-4175-8836-50e32236c59d #EXTINF:-1 tvg-id="",Shout! TV http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/55a6a3275616b6240c26f393/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2bb090-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=404cd788-0921-444d-9eeb-2ae676a6a291 @@ -679,7 +679,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f24662bebe0f0000767de32/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2bd7a9-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=933590b4-25e8-478c-814f-49d93fd452c3 #EXTINF:-1 tvg-id="Survivor.us",Survivor http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f21e7b24744c60007c1f6fc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2bfeb0-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d8ecd073-183e-48e4-a98b-a1be120de05a -#EXTINF:-1 tvg-id="TBNEast.us",TBN +#EXTINF:-1 tvg-id="TBN.us@East",TBN http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d486b2eeddd9576d66f9066/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2bfeb1-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=a3bb369c-6039-4656-a79d-8e87112a8232 #EXTINF:-1 tvg-id="TeamSpirit.us",Team Spirit http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60f9ebb06f0b3d000746fbdb/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2bfeb2-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2b8fbc7f-29d9-4732-92d1-24f50c0be761 @@ -717,7 +717,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5aea40b35126c2157123aa64/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c25c9-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5a0d0a98-404f-4ed2-acb8-799b2abcc5c6 #EXTINF:-1 tvg-id="ThePetCollective.us",The Pet Collective http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5bb1ad55268cae539bcedb08/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c25ca-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6749e678-2300-468b-be2b-97803988d783 -#EXTINF:-1 tvg-id="",The Price Is Right +#EXTINF:-1 tvg-id="PlutoTVThePriceisRight.us@SD",The Price Is Right http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/643f035d5a0cd50008361534/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c4cd0-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d06b772a-7763-4458-af84-caf22f5c8c15 #EXTINF:-1 tvg-id="ThePriceIsRightTheBarkerEra.us",The Price Is Right: The Barker Era http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f7791b8372da90007fd45e6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c4cd1-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b11caad2-6afe-44b5-8ca3-9e98672f6a0f @@ -729,7 +729,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fa8176b9884200074ef5ae/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c4cd4-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ff963292-6aa2-4806-857d-39ad6f5f0e4a #EXTINF:-1 tvg-id="TheWeatherChannelenEspanol.us",The Weather Channel en Español http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/627ae4fcf001df00074d6e5b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c4cd5-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=df13c2c6-8880-4f3d-b7b6-a18acfcb3069 -#EXTINF:-1 tvg-id="",TheGrio +#EXTINF:-1 tvg-id="TheGrioTV.us@SD",TheGrio http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f1efad04320070007dbb60b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c4cd6-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f172462b-904d-4db7-9ec4-3b737f9c18c2 #EXTINF:-1 tvg-id="ThisOldHouse.us",This Old House http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d51e791b7dba3b2ae990ab2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c4cd7-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9483c3b5-d057-42f4-8da0-57c5bf2344ab @@ -737,7 +737,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ef3977e5d773400077de284/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c4cd8-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=783c6417-7359-42c8-af71-bebb9ae0e7b6 #EXTINF:-1 tvg-id="TinyHouseNation.us",Tiny House Nation http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/601a0342dcf4370007566891/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c73e0-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0a0ef5b5-f75d-47fa-bb72-ec1385ec6916 -#EXTINF:-1 tvg-id="",TNA Wrestling +#EXTINF:-1 tvg-id="TNAWrestlingChannel.pl@SD",TNA Wrestling http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/59b722526996084038c01e1b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c73e1-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=596b4a39-235b-4286-a850-487ab239028b #EXTINF:-1 tvg-id="TODAYAllDay.us",TODAY All Day http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d695f7db53adf96b78e7ce3/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c73e2-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4b9a9385-79d0-48ba-8524-7334c82add93 @@ -745,7 +745,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5c3f8f12a93c2d61b9990a4e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c73e3-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8a88f013-2601-41bd-9070-75701edcf852 #EXTINF:-1 tvg-id="",Top Chef Vault http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/654931d753fc97000838fe55/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c73e4-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=01a50af3-92cf-49d7-92ee-22593884ed54 -#EXTINF:-1 tvg-id="",Top Gear +#EXTINF:-1 tvg-id="TopGear.uk@SD",Top Gear http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/636adc255bcf470007d6e0e2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c73e5-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=53184ebc-5f69-44c0-bf0c-94707d648913 #EXTINF:-1 tvg-id="",Top Rank Classics http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64d160f53c785e0008df525e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c73e6-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8ce20713-803b-4c36-b6c9-1026b5b6d0e4 @@ -773,7 +773,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/656542ae4261ca00082154a8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c9af7-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1a08a4dc-ccfb-49ce-83dc-ee4040567b55 #EXTINF:-1 tvg-id="",Universal Action http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/654933e253fc970008390114/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c9af8-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f4af3fb3-c7bd-419b-a2e3-da5c4363586a -#EXTINF:-1 tvg-id="UniversalCrimeEast.us",Universal Crime +#EXTINF:-1 tvg-id="UniversalCrime.us@East",Universal Crime http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6549341853fc9700083901ac/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2cc200-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f8ea05b6-c631-4463-8491-a4394e906d3c #EXTINF:-1 tvg-id="",Universal Monsters http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a9b20f0c7ff50008d3a3b6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2cc201-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=7d2a2bb4-c275-4221-a998-d1a0bf52b786 @@ -813,11 +813,11 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/61 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/61d4c2817a823d00070ba53e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2ce918-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=90c1dbc6-366d-4ba4-913a-7ff94babe33e #EXTINF:-1 tvg-id="VevoTrueSchoolHipHop.us",Vevo True School Hip-Hop http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/663d36fa41af640008c083f6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2d1020-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ba4f413c-9ae3-416b-b96f-d617f19cfbd8 -#EXTINF:-1 tvg-id="",VH1 Hip Hop Family +#EXTINF:-1 tvg-id="PlutoTVVH1HipHopFamily.us@SD",VH1 Hip Hop Family http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d71561df6f2e6d0b6493bf5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2d1021-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e1d0f143-568e-4ded-ab2f-4285d4a8ae11 #EXTINF:-1 tvg-id="",VH1 Hip Hop Family 2 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f7789c1d210fd0007a92182/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2d1022-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=21d1c419-f5c5-44cf-8bd1-7d41c018202e -#EXTINF:-1 tvg-id="",VH1 I Love Reality +#EXTINF:-1 tvg-id="PlutoTVVH1ILoveReality.us@SD",VH1 I Love Reality http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d7154fa8326b6ce4ec31f2e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2d1023-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0f21eb55-d525-4fad-8ebe-028203d6d0ec #EXTINF:-1 tvg-id="VoyagerDocumentaries.us",Voyager Documentaries http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/589aa03df9ba56a84197a560/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2d1024-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e7ab6188-0ea8-4038-b8e2-2865d3dcabd9 diff --git a/streams/us_samsung.m3u b/streams/us_samsung.m3u index d3ee5b96d2..f3492761bb 100644 --- a/streams/us_samsung.m3u +++ b/streams/us_samsung.m3u @@ -3,7 +3,7 @@ https://d85lu9l3axp7b.cloudfront.net/v1/master/3722c60a815c199d9c0ef36c5b73da68a62b09d1/cc-49b4g6287mnav/playlist.m3u8 #EXTINF:-1 tvg-id="BloombergQuicktake.us",Bloomberg Quicktake (1080p) https://ab1455372fed47d8a88264bab4831d5c.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Samsung_QuickTake-1/playlist.m3u8 -#EXTINF:-1 tvg-id="BloombergTVPlus.us",Bloomberg TV+ UHD (2160p) +#EXTINF:-1 tvg-id="",Bloomberg TV+ UHD (2160p) https://bloomberg-bloombergtv-1-us.samsung.wurl.tv/manifest/playlist.m3u8 #EXTINF:-1 tvg-id="bonappetit.us",bon appétit (1080p) https://bonappetit-samsung.amagi.tv/playlist.m3u8 @@ -41,13 +41,13 @@ https://insighttv-samsung-us.amagi.tv/playlist.m3u8 https://introuble-samsung.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="InWonder.nl",InWonder (720p) https://inwonder-samsung-us.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="IONTVEast.us",ION +#EXTINF:-1 tvg-id="IONTV.us@East",ION https://d1mumb5jst6zw0.cloudfront.net/v1/master/3722c60a815c199d9c0ef36c5b73da68a62b09d1/cc-rqzc6u2smk8dg/ion.m3u8 -#EXTINF:-1 tvg-id="IONPlusEast.us",ION Plus +#EXTINF:-1 tvg-id="IONPlus.us@East",ION Plus https://d2olmevnzmviuu.cloudfront.net/v1/master/3722c60a815c199d9c0ef36c5b73da68a62b09d1/cc-drh5os33njrnt/ion_plus.m3u8 #EXTINF:-1 tvg-id="Loupe4K.us",Loupe 4K https://d2dw21aq0j0l5c.cloudfront.net/v1/master/3722c60a815c199d9c0ef36c5b73da68a62b09d1/LoupeArt-prod/playlist.m3u8 -#EXTINF:-1 tvg-id="LoveNature4K.ca",Love Nature 4K +#EXTINF:-1 tvg-id="LoveNature.ca@4K",Love Nature 4K https://d18dyiwu97wm6q.cloudfront.net/v1/master/3722c60a815c199d9c0ef36c5b73da68a62b09d1/LoveNature4K2-prod/playlist.m3u8 #EXTINF:-1 tvg-id="MidnightPulp.us",Midnight Pulp (720p) https://d3knca0xtk4ya9.cloudfront.net/v1/master/3722c60a815c199d9c0ef36c5b73da68a62b09d1/cc-1sxenfkl27gw6/playlist.m3u8 diff --git a/streams/us_stirr.m3u b/streams/us_stirr.m3u index b06f1ab89b..2bcf634dcc 100644 --- a/streams/us_stirr.m3u +++ b/streams/us_stirr.m3u @@ -11,7 +11,7 @@ https://linear-863.frequency.stream/dist/stirr/863/hls/master/playlist.m3u8 https://d3htp73xsa9p15.cloudfront.net/scheduler/scheduleMaster/445.m3u8 #EXTINF:-1 tvg-id="",Channel Fight (1080p) https://d15wqvt0xm15k4.cloudfront.net/scheduler/scheduleMaster/266.m3u8 -#EXTINF:-1 tvg-id="",Chive TV (1080p) +#EXTINF:-1 tvg-id="ChiveTV.us@SD",Chive TV (1080p) https://linear-941.frequency.stream/dist/stirr/941/hls/master/playlist.m3u8 #EXTINF:-1 tvg-id="",Craftsy (1080p) https://linear-492.frequency.stream/dist/stirr/492/hls/master/playlist.m3u8 @@ -57,7 +57,7 @@ https://jlt-jltv-stirr.otteravision.com/jlt/jltv/jltv.m3u8 https://cdn.lawandcrime.net/rewind/playlist.m3u8 #EXTINF:-1 tvg-id="",My Money (1080p) https://d3bqd6nz14unwy.cloudfront.net/scheduler/scheduleMaster/468.m3u8 -#EXTINF:-1 tvg-id="NTDTVEast.us",NTD TV (1080p) +#EXTINF:-1 tvg-id="NTDTV.us@East",NTD TV (1080p) https://amg17596-ntdtv-amg17596c1-stirr-us-4738.playouts.now.amagi.tv/ntd.m3u8 #EXTINF:-1 tvg-id="",Omstars (1080p) https://d1too6m5v9oyet.cloudfront.net/scheduler/scheduleMaster/281.m3u8 @@ -71,13 +71,13 @@ https://d30au7974f7qoa.cloudfront.net/scheduler/scheduleMaster/419.m3u8 https://d2njbreu8qyfxo.cloudfront.net/scheduler/scheduleMaster/216.m3u8 #EXTINF:-1 tvg-id="PopstarTV.us",Popstar! TV (1080p) https://linear-10.frequency.stream/dist/stirr/10/hls/master/playlist.m3u8 -#EXTINF:-1 tvg-id="",PursuitUP (1080p) +#EXTINF:-1 tvg-id="PursuitUP.us@SD",PursuitUP (1080p) https://linear-205.frequency.stream/dist/stirr/205/hls/master/playlist.m3u8 #EXTINF:-1 tvg-id="",QVC The Big Dish Channel (1080p) https://amg01717-qvc-amg01717c1-stirr-us-2651.playouts.now.amagi.tv/qvc-bigdishdelayed-switcher-localnow/playlist.m3u8 #EXTINF:-1 tvg-id="RightNowTV.us",RightNow TV (720p) https://2-fss-1.streamhoster.com/pl_154/amlst:205448-2145652/rightnowtv.m3u8 -#EXTINF:-1 tvg-id="",RVTV (1080p) +#EXTINF:-1 tvg-id="RVTV.us@SD",RVTV (1080p) https://rvtv-stirr.b-cdn.net/rvtv-on-stirr/playlist.m3u8 #EXTINF:-1 tvg-id="ShopLC.us",Shop LC (1080p) https://cdn-shop-lc-01.vos360.video/Content/HLS_HLS/Live/channel(ShopLCStirrTV)/master.m3u8 @@ -91,7 +91,7 @@ https://d3kddmbw1dqgzz.cloudfront.net/scheduler/scheduleMaster/332.m3u8 https://dr4jwhk0sty71.cloudfront.net/scheduler/scheduleMaster/444.m3u8 #EXTINF:-1 tvg-id="SwerveSports.us",Swerve Sports (1080p) https://linear-253.frequency.stream/dist/stirr/253/hls/master/playlist.m3u8 -#EXTINF:-1 tvg-id="TBNEast.us",TBN (720p) +#EXTINF:-1 tvg-id="TBN.us@East",TBN (720p) https://d7ge95bb03xsu.cloudfront.net/out/v1/e0fd0e2c760641fa816a3e216b3ca9c0/tbn-stirr.m3u8 #EXTINF:-1 tvg-id="",Teton Gravity Research (1080p) https://d1ur2fy7sesb3x.cloudfront.net/hls/main.m3u8 @@ -107,7 +107,7 @@ https://amg01131-tracetv-amg01131c2-stirr-us-4392.playouts.now.amagi.tv/playlist https://amg01131-tracetv-amg01131c5-stirr-us-4389.playouts.now.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="TraceUrban.fr",TRACE Urban (1080p) https://amg01131-tracetv-amg01131c1-stirr-us-4393.playouts.now.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Wild TV (1080p) +#EXTINF:-1 tvg-id="WildTV.ca@SD",Wild TV (1080p) https://dfhsahpa45kk2.cloudfront.net/scheduler/scheduleMaster/476.m3u8 #EXTINF:-1 tvg-id="WorldPokerTour.us",World Poker Tour (1080p) https://d2e00kr7m9coe4.cloudfront.net/scheduler/scheduleMaster/406.m3u8 diff --git a/streams/us_thetvapp.m3u b/streams/us_thetvapp.m3u index bd4a14116a..88ba01095a 100644 --- a/streams/us_thetvapp.m3u +++ b/streams/us_thetvapp.m3u @@ -1,5 +1,5 @@ #EXTM3U -#EXTINF:-1 tvg-id="AEEast.us",A&E East +#EXTINF:-1 tvg-id="AE.us@East",A&E East https://v1.thetvapp.to/hls/AEEast/index.m3u8 #EXTINF:-1 tvg-id="CSPAN.us",C-SPAN https://v1.thetvapp.to/hls/CSPAN/index.m3u8 @@ -9,37 +9,37 @@ https://v1.thetvapp.to/hls/CSPAN2/index.m3u8 https://v1.thetvapp.to/hls/CNBC/index.m3u8 #EXTINF:-1 tvg-id="CrimePlusInvestigation.us",Crime + Investigation https://v1.thetvapp.to/hls/CrimePlusInvestigation/index.m3u8 -#EXTINF:-1 tvg-id="DisneyChannelEast.us",Disney Channel East +#EXTINF:-1 tvg-id="DisneyChannel.us@East",Disney Channel East https://v1.thetvapp.to/hls/DisneyChannelEast/index.m3u8 -#EXTINF:-1 tvg-id="DisneyJuniorEast.us",Disney Junior East +#EXTINF:-1 tvg-id="DisneyJunior.us@East",Disney Junior East https://v1.thetvapp.to/hls/DisneyJuniorEast/index.m3u8 -#EXTINF:-1 tvg-id="DisneyXDEast.us",Disney XD East +#EXTINF:-1 tvg-id="DisneyXD.us@East",Disney XD East https://v1.thetvapp.to/hls/DisneyXDEast/index.m3u8 -#EXTINF:-1 tvg-id="EEast.us",E! East +#EXTINF:-1 tvg-id="E.us@East",E! East https://v1.thetvapp.to/hls/EEast/index.m3u8 #EXTINF:-1 tvg-id="FoxBusinessNetwork.us",Fox Business Network https://v1.thetvapp.to/hls/FoxBusiness/index.m3u8 #EXTINF:-1 tvg-id="FoxNewsChannel.us",Fox News Channel https://v1.thetvapp.to/hls/FoxNewsChannel/index.m3u8 -#EXTINF:-1 tvg-id="FoxSports2.us",Fox Sports 2 +#EXTINF:-1 tvg-id="",Fox Sports 2 https://v1.thetvapp.to/hls/FoxSports2/index.m3u8 -#EXTINF:-1 tvg-id="FuseEast.us",Fuse East +#EXTINF:-1 tvg-id="Fuse.us@East",Fuse East https://v1.thetvapp.to/hls/FuseEast/index.m3u8 -#EXTINF:-1 tvg-id="FXEast.us",FX East +#EXTINF:-1 tvg-id="FX.us@East",FX East https://v1.thetvapp.to/hls/FXEast/index.m3u8 #EXTINF:-1 tvg-id="FXMovieChannel.us",FX Movie Channel https://v1.thetvapp.to/hls/FXMovieChannel/index.m3u8 -#EXTINF:-1 tvg-id="FXXEast.us",FXX East +#EXTINF:-1 tvg-id="FXX.us@East",FXX East https://v1.thetvapp.to/hls/FXXEast/index.m3u8 -#EXTINF:-1 tvg-id="FYIEast.us",FYI East +#EXTINF:-1 tvg-id="FYI.us@East",FYI East https://v1.thetvapp.to/hls/FYIEast/index.m3u8 #EXTINF:-1 tvg-id="GolfChannel.us",Golf Channel https://v1.thetvapp.to/hls/GolfChannel/index.m3u8 #EXTINF:-1 tvg-id="HallmarkDrama.us",Hallmark Drama https://v1.thetvapp.to/hls/HallmarkDrama/index.m3u8 -#EXTINF:-1 tvg-id="HallmarkMoviesMysteriesEast.us",Hallmark Movies & Mysteries East +#EXTINF:-1 tvg-id="HallmarkMoviesMysteries.us@East",Hallmark Movies & Mysteries East https://v1.thetvapp.to/hls/HallmarkMoviesMysteriesEast/index.m3u8 -#EXTINF:-1 tvg-id="IFCEast.us",IFC East +#EXTINF:-1 tvg-id="IFC.us@East",IFC East https://v1.thetvapp.to/hls/IFCEast/index.m3u8 #EXTINF:-1 tvg-id="KABCDT1.us",KABC-DT1 https://v1.thetvapp.to/hls/abc-kabc-los-angeles-ca/index.m3u8 @@ -51,9 +51,9 @@ https://v1.thetvapp.to/hls/cw-kfmbtv2-san-diego-ca/index.m3u8 https://v1.thetvapp.to/hls/nbc-knbc-los-angeles-ca/index.m3u8 #EXTINF:-1 tvg-id="KTTVDT1.us",KTTV-DT1 https://v1.thetvapp.to/hls/fox-kttv-los-angeles-ca/index.m3u8 -#EXTINF:-1 tvg-id="LifetimeMoviesEast.us",Lifetime Movies East +#EXTINF:-1 tvg-id="LifetimeMovies.us@East",Lifetime Movies East https://v1.thetvapp.to/hls/LifetimeMoviesEast/index.m3u8 -#EXTINF:-1 tvg-id="LogoEast.us",Logo East +#EXTINF:-1 tvg-id="Logo.us@East",Logo East https://v1.thetvapp.to/hls/LogoEast/index.m3u8 #EXTINF:-1 tvg-id="MarqueeSportsNetwork.us",Marquee Sports Network https://v1.thetvapp.to/hls/marquee-sports-network/index.m3u8 @@ -61,9 +61,9 @@ https://v1.thetvapp.to/hls/marquee-sports-network/index.m3u8 https://v1.thetvapp.to/hls/msg-madison-square-gardens/index.m3u8 #EXTINF:-1 tvg-id="MSNBC.us",MSNBC https://v1.thetvapp.to/hls/MSNBC/index.m3u8 -#EXTINF:-1 tvg-id="NationalGeographicindex.m3u8East.us",National Geographic index.m3u8 East +#EXTINF:-1 tvg-id="NationalGeographic.us@East",National Geographic East https://v1.thetvapp.to/hls/NationalGeographicEast/index.m3u8 -#EXTINF:-1 tvg-id="NationalGeographicWildindex.m3u8East.us",National Geographic Wild index.m3u8 East +#EXTINF:-1 tvg-id="NationalGeographicWild.us@East",National Geographic Wild East https://v1.thetvapp.to/hls/NationalGeographicWildEast/index.m3u8 #EXTINF:-1 tvg-id="NBATV.us",NBA TV https://v1.thetvapp.to/hls/NBATV/index.m3u8 @@ -77,7 +77,7 @@ https://v1.thetvapp.to/hls/nbc-sports-philadelphia/index.m3u8 https://v1.thetvapp.to/hls/NewsmaxTV/index.m3u8 #EXTINF:-1 tvg-id="NFLRedZone.us",NFL RedZone https://v1.thetvapp.to/hls/NFLRedZone/index.m3u8 -#EXTINF:-1 tvg-id="StarzEast.us",Starz East +#EXTINF:-1 tvg-id="Starz.us@East",Starz East https://v1.thetvapp.to/hls/StarzEast/index.m3u8 #EXTINF:-1 tvg-id="TSN1.ca",TSN1 https://v1.thetvapp.to/hls/tsn1/index.m3u8 @@ -89,7 +89,7 @@ https://v1.thetvapp.to/hls/tsn3/index.m3u8 https://v1.thetvapp.to/hls/tsn4/index.m3u8 #EXTINF:-1 tvg-id="TSN5.ca",TSN5 https://v1.thetvapp.to/hls/tsn5/index.m3u8 -#EXTINF:-1 tvg-id="USANetworkEast.us",USA Network East +#EXTINF:-1 tvg-id="USANetwork.us@East",USA Network East https://v1.thetvapp.to/hls/USANetworkEast/index.m3u8 #EXTINF:-1 tvg-id="WABCDT1.us",WABC-DT1 https://v1.thetvapp.to/hls/WABCDT1/index.m3u8 diff --git a/streams/us_tubi.m3u b/streams/us_tubi.m3u index 8bd17aebfb..6994d50e07 100644 --- a/streams/us_tubi.m3u +++ b/streams/us_tubi.m3u @@ -95,7 +95,7 @@ https://apollo.production-public.tubi.io/live/ac-are-we-there-yet2.m3u8 https://apollo.production-public.tubi.io/live/ac-baywatch.m3u8 #EXTINF:-1 tvg-id="",BBC Doctor Who Classic (720p) https://aegis-cloudfront-1.tubi.video/7e9ef0f5-4d13-4083-aa3f-9375e652a4c9/playlist.m3u8 -#EXTINF:-1 tvg-id="",BBC Earth (720p) +#EXTINF:-1 tvg-id="BBCEarth.uk@US",BBC Earth (720p) https://apollo.production-public.tubi.io/live/ac-bbc-earth2.m3u8 #EXTINF:-1 tvg-id="",BBC Silent Witness New Tricks (720p) https://aegis-cloudfront-1.tubi.video/3723e418-8627-4a29-96fd-bcfebfccb004/playlist.m3u8 @@ -187,7 +187,7 @@ https://aegis-cloudfront-1.tubi.video/b2fc97e6-b98f-42b4-be35-bd0361f1f637/playl https://apollo.production-public.tubi.io/live/ac-dog-the-bounty-hunter.m3u8 #EXTINF:-1 tvg-id="",Dr. G Medical Examiner (720p) https://apollo.production-public.tubi.io/live/ac-dr-g-filmrise.m3u8 -#EXTINF:-1 tvg-id="DuckDynasty.uk",Duck Dynasty (1080p) +#EXTINF:-1 tvg-id="DuckDynasty.us@US",Duck Dynasty (1080p) https://apollo.production-public.tubi.io/live/ac-duck-dynasty.m3u8 #EXTINF:-1 tvg-id="",Ebony TV (1080p) https://aegis-cloudfront-1.tubi.video/22574bab-8a1f-44f4-b62f-ae2963c6a875/playlist.m3u8 @@ -201,7 +201,7 @@ https://apollo.production-public.tubi.io/live/ac-estrellatv.m3u8 https://apollo.production-public.tubi.io/live/ac-euronews2.m3u8 #EXTINF:-1 tvg-id="",Fanduel TV Extra (720p) https://aegis-cloudfront-1.tubi.video/fdd93041-1042-41bf-9200-8f9efe38ace5/playlist.m3u8 -#EXTINF:-1 tvg-id="FBIFiles.uk",FBI Files (720p) +#EXTINF:-1 tvg-id="FBIFiles.us@US",FBI Files (720p) https://apollo.production-public.tubi.io/live/ac-the-fbi-files.m3u8 #EXTINF:-1 tvg-id="FearFactor.us",Fear Factor (720p) https://apollo.production-public.tubi.io/live/ac-fear-factor.m3u8 @@ -279,7 +279,7 @@ https://apollo.production-public.tubi.io/live/ac-wsym.m3u8 https://livetv-fa.tubi.video/wtic/live.m3u8 #EXTINF:-1 tvg-id="FoxSoul.us",Fox Soul (720p) https://apollo.production-public.tubi.io/live/ac-fox-soul-scte.m3u8 -#EXTINF:-1 tvg-id="FoxSports.us",Fox Sports (720p) +#EXTINF:-1 tvg-id="",Fox Sports (720p) https://apollo.production-public.tubi.io/live/fox-sports.m3u8 #EXTINF:-1 tvg-id="FoxDeportes.us",Fox Sports en Espanol (720p) https://apollo.production-public.tubi.io/live/fox-sports-espanol.m3u8 @@ -301,7 +301,7 @@ https://aegis-cloudfront-1.tubi.video/358eebe5-75f6-42dc-96b3-c6ddf5a46698/playl https://aegis-cloudfront-1.tubi.video/43911d88-1ba4-4595-9b35-bf96d09efeef/playlist.m3u8 #EXTINF:-1 tvg-id="",Haunt TV Canada (1080p) https://aegis-cloudfront-1.tubi.video/62f59fa9-7923-47ae-8c71-5446cf927f7e/playlist.m3u8 -#EXTINF:-1 tvg-id="",Heartland (720p) +#EXTINF:-1 tvg-id="Heartland.us@Web",Heartland (720p) https://apollo.production-public.tubi.io/live/ac-heartland.m3u8 #EXTINF:-1 tvg-id="",Her Sphere (720p) [Geo-blocked] https://aegis-cloudfront-1.tubi.video/134d66e4-9382-4f51-85a0-c47717a3b037/playlist.m3u8 @@ -311,13 +311,13 @@ https://apollo.production-public.tubi.io/live/ac-hi-yah.m3u8 https://aegis-cloudfront-1.tubi.video/36785f5f-4e63-4cca-a16a-c8b309af0287/playlist.m3u8 #EXTINF:-1 tvg-id="",Ice Road Truckers (1080p) https://apollo.production-public.tubi.io/live/ac-ice-road-truckers.m3u8 -#EXTINF:-1 tvg-id="IONTVEast.us",ION (720p) +#EXTINF:-1 tvg-id="IONTV.us@East",ION (720p) https://apollo.production-public.tubi.io/live/ac-ion.m3u8 #EXTINF:-1 tvg-id="",ION Mystery (1080p) https://aegis-cloudfront-1.tubi.video/b11b44b8-461f-4034-becb-9bb14ee45be2/playlist.m3u8 #EXTINF:-1 tvg-id="",ION Mystery (1080p) https://livetv-fa.tubi.video/ion-mystery/playlist.m3u8 -#EXTINF:-1 tvg-id="IONPlusEast.us",ION Plus (720p) +#EXTINF:-1 tvg-id="IONPlus.us@East",ION Plus (720p) https://apollo.production-public.tubi.io/live/ac-ion-plus.m3u8 #EXTINF:-1 tvg-id="KartoonChannel.us",Kartoon Channel (720p) https://apollo.production-public.tubi.io/live/ac-kartoon.m3u8 diff --git a/streams/us_tvpass.m3u b/streams/us_tvpass.m3u index 01dfa5792e..e47263adda 100644 --- a/streams/us_tvpass.m3u +++ b/streams/us_tvpass.m3u @@ -1,7 +1,7 @@ #EXTM3U -#EXTINF:-1 tvg-id="AEEast.us",A&E East (720p) +#EXTINF:-1 tvg-id="AE.us@East",A&E East (720p) https://tvpass.org/live/AEEast/hd -#EXTINF:-1 tvg-id="AEEast.us",A&E East (360p) +#EXTINF:-1 tvg-id="AE.us@East",A&E East (360p) https://tvpass.org/live/AEEast/sd #EXTINF:-1 tvg-id="CSPAN2.us",C-SPAN 2 (720p) https://tvpass.org/live/CSPAN2/hd @@ -15,21 +15,21 @@ https://tvpass.org/live/CNBC/sd https://tvpass.org/live/CrimePlusInvestigation/hd #EXTINF:-1 tvg-id="CrimePlusInvestigation.us",Crime + Investigation (360p) https://tvpass.org/live/CrimePlusInvestigation/sd -#EXTINF:-1 tvg-id="DisneyChannelEast.us",Disney Channel East (720p) +#EXTINF:-1 tvg-id="DisneyChannel.us@East",Disney Channel East (720p) https://tvpass.org/live/DisneyChannelEast/hd -#EXTINF:-1 tvg-id="DisneyChannelEast.us",Disney Channel East (360p) +#EXTINF:-1 tvg-id="DisneyChannel.us@East",Disney Channel East (360p) https://tvpass.org/live/DisneyChannelEast/sd -#EXTINF:-1 tvg-id="DisneyJuniorEast.us",Disney Junior East (720p) +#EXTINF:-1 tvg-id="DisneyJunior.us@East",Disney Junior East (720p) https://tvpass.org/live/DisneyJuniorEast/hd -#EXTINF:-1 tvg-id="DisneyJuniorEast.us",Disney Junior East (360p) +#EXTINF:-1 tvg-id="DisneyJunior.us@East",Disney Junior East (360p) https://tvpass.org/live/DisneyJuniorEast/sd -#EXTINF:-1 tvg-id="DisneyXDEast.us",Disney XD East (720p) +#EXTINF:-1 tvg-id="DisneyXD.us@East",Disney XD East (720p) https://tvpass.org/live/DisneyXDEast/hd -#EXTINF:-1 tvg-id="DisneyXDEast.us",Disney XD East (360p) +#EXTINF:-1 tvg-id="DisneyXD.us@East",Disney XD East (360p) https://tvpass.org/live/DisneyXDEast/sd -#EXTINF:-1 tvg-id="EEast.us",E! East (1080p) +#EXTINF:-1 tvg-id="E.us@East",E! East (1080p) https://tvpass.org/live/EEast/hd -#EXTINF:-1 tvg-id="EEast.us",E! East (360p) +#EXTINF:-1 tvg-id="E.us@East",E! East (360p) https://tvpass.org/live/EEast/sd #EXTINF:-1 tvg-id="FoxBusinessNetwork.us",Fox Business Network (720p) https://tvpass.org/live/FoxBusiness/hd @@ -39,29 +39,29 @@ https://tvpass.org/live/FoxBusiness/sd https://tvpass.org/live/FoxNewsChannel/hd #EXTINF:-1 tvg-id="FoxNewsChannel.us",Fox News Channel (360p) https://tvpass.org/live/FoxNewsChannel/sd -#EXTINF:-1 tvg-id="FoxSports2.us",Fox Sports 2 (720p) +#EXTINF:-1 tvg-id="",Fox Sports 2 (720p) https://tvpass.org/live/FoxSports2/hd -#EXTINF:-1 tvg-id="FoxSports2.us",Fox Sports 2 (360p) +#EXTINF:-1 tvg-id="",Fox Sports 2 (360p) https://tvpass.org/live/FoxSports2/sd -#EXTINF:-1 tvg-id="FuseEast.us",Fuse East (1080p) +#EXTINF:-1 tvg-id="Fuse.us@East",Fuse East (1080p) https://tvpass.org/live/FuseEast/hd -#EXTINF:-1 tvg-id="FuseEast.us",Fuse East (360p) +#EXTINF:-1 tvg-id="Fuse.us@East",Fuse East (360p) https://tvpass.org/live/FuseEast/sd -#EXTINF:-1 tvg-id="FXEast.us",FX East (720p) +#EXTINF:-1 tvg-id="FX.us@East",FX East (720p) https://tvpass.org/live/FXEast/hd -#EXTINF:-1 tvg-id="FXEast.us",FX East (360p) +#EXTINF:-1 tvg-id="FX.us@East",FX East (360p) https://tvpass.org/live/FXEast/sd #EXTINF:-1 tvg-id="FXMovieChannel.us",FX Movie Channel (720p) https://tvpass.org/live/FXMovieChannel/hd #EXTINF:-1 tvg-id="FXMovieChannel.us",FX Movie Channel (360p) https://tvpass.org/live/FXMovieChannel/sd -#EXTINF:-1 tvg-id="FXXEast.us",FXX East (720p) +#EXTINF:-1 tvg-id="FXX.us@East",FXX East (720p) https://tvpass.org/live/FXXEast/hd -#EXTINF:-1 tvg-id="FXXEast.us",FXX East (360p) +#EXTINF:-1 tvg-id="FXX.us@East",FXX East (360p) https://tvpass.org/live/FXXEast/sd -#EXTINF:-1 tvg-id="FYIEast.us",FYI East (720p) +#EXTINF:-1 tvg-id="FYI.us@East",FYI East (720p) https://tvpass.org/live/FYIEast/hd -#EXTINF:-1 tvg-id="FYIEast.us",FYI East (360p) +#EXTINF:-1 tvg-id="FYI.us@East",FYI East (360p) https://tvpass.org/live/FYIEast/sd #EXTINF:-1 tvg-id="GolfChannel.us",Golf Channel (1080p) https://tvpass.org/live/GolfChannel/hd @@ -71,13 +71,13 @@ https://tvpass.org/live/GolfChannel/sd https://tvpass.org/live/HallmarkDrama/hd #EXTINF:-1 tvg-id="HallmarkDrama.us",Hallmark Drama (360p) https://tvpass.org/live/HallmarkDrama/sd -#EXTINF:-1 tvg-id="HallmarkMoviesMysteriesEast.us",Hallmark Movies & Mysteries East (1080p) +#EXTINF:-1 tvg-id="HallmarkMoviesMysteries.us@East",Hallmark Movies & Mysteries East (1080p) https://tvpass.org/live/HallmarkMoviesMysteriesEast/hd -#EXTINF:-1 tvg-id="HallmarkMoviesMysteriesEast.us",Hallmark Movies & Mysteries East (360p) +#EXTINF:-1 tvg-id="HallmarkMoviesMysteries.us@East",Hallmark Movies & Mysteries East (360p) https://tvpass.org/live/HallmarkMoviesMysteriesEast/sd -#EXTINF:-1 tvg-id="IFCEast.us",IFC East (720p) +#EXTINF:-1 tvg-id="IFC.us@East",IFC East (720p) https://tvpass.org/live/IFCEast/hd -#EXTINF:-1 tvg-id="IFCEast.us",IFC East (360p) +#EXTINF:-1 tvg-id="IFC.us@East",IFC East (360p) https://tvpass.org/live/IFCEast/sd #EXTINF:-1 tvg-id="KABCDT1.us",KABC-DT1 (720p) https://tvpass.org/live/abc-kabc-los-angeles-ca/hd @@ -99,13 +99,13 @@ https://tvpass.org/live/nbc-knbc-los-angeles-ca/sd https://tvpass.org/live/fox-kttv-los-angeles-ca/hd #EXTINF:-1 tvg-id="KTTVDT1.us",KTTV-DT1 (360p) https://tvpass.org/live/fox-kttv-los-angeles-ca/sd -#EXTINF:-1 tvg-id="LifetimeMoviesEast.us",Lifetime Movies East (720p) +#EXTINF:-1 tvg-id="LifetimeMovies.us@East",Lifetime Movies East (720p) https://tvpass.org/live/LifetimeMoviesEast/hd -#EXTINF:-1 tvg-id="LifetimeMoviesEast.us",Lifetime Movies East (360p) +#EXTINF:-1 tvg-id="LifetimeMovies.us@East",Lifetime Movies East (360p) https://tvpass.org/live/LifetimeMoviesEast/sd -#EXTINF:-1 tvg-id="LogoEast.us",Logo East (720p) +#EXTINF:-1 tvg-id="Logo.us@East",Logo East (720p) https://tvpass.org/live/LogoEast/hd -#EXTINF:-1 tvg-id="LogoEast.us",Logo East (360p) +#EXTINF:-1 tvg-id="Logo.us@East",Logo East (360p) https://tvpass.org/live/LogoEast/sd #EXTINF:-1 tvg-id="MSG.us",MSG (1080p) https://tvpass.org/live/msg-madison-square-gardens/hd @@ -119,13 +119,13 @@ https://tvpass.org/live/msg-plus/sd https://tvpass.org/live/MSNBC/hd #EXTINF:-1 tvg-id="MSNBC.us",MSNBC (360p) https://tvpass.org/live/MSNBC/sd -#EXTINF:-1 tvg-id="NationalGeographicHDEast.us",National Geographic HD East (720p) +#EXTINF:-1 tvg-id="NationalGeographic.us@HDEast",National Geographic HD East (720p) https://tvpass.org/live/NationalGeographicEast/hd -#EXTINF:-1 tvg-id="NationalGeographicHDEast.us",National Geographic HD East (360p) +#EXTINF:-1 tvg-id="NationalGeographic.us@HDEast",National Geographic HD East (360p) https://tvpass.org/live/NationalGeographicEast/sd -#EXTINF:-1 tvg-id="NationalGeographicWildHDEast.us",National Geographic Wild HD East (720p) +#EXTINF:-1 tvg-id="NationalGeographicWild.us@HDEast",National Geographic Wild HD East (720p) https://tvpass.org/live/NationalGeographicWildEast/hd -#EXTINF:-1 tvg-id="NationalGeographicWildHDEast.us",National Geographic Wild HD East (360p) +#EXTINF:-1 tvg-id="NationalGeographicWild.us@HDEast",National Geographic Wild HD East (360p) https://tvpass.org/live/NationalGeographicWildEast/sd #EXTINF:-1 tvg-id="NBCSportsBayArea.us",NBC Sports Bay Area (720p) https://tvpass.org/live/nbc-sports-bay-area/hd @@ -147,9 +147,9 @@ https://tvpass.org/live/NewsmaxTV/sd https://tvpass.org/live/NFLRedZone/hd #EXTINF:-1 tvg-id="NFLRedZone.us",NFL RedZone (360p) https://tvpass.org/live/NFLRedZone/sd -#EXTINF:-1 tvg-id="StarzEast.us",Starz East (1080p) +#EXTINF:-1 tvg-id="Starz.us@East",Starz East (1080p) https://tvpass.org/live/StarzEast/hd -#EXTINF:-1 tvg-id="StarzEast.us",Starz East (360p) +#EXTINF:-1 tvg-id="Starz.us@East",Starz East (360p) https://tvpass.org/live/StarzEast/sd #EXTINF:-1 tvg-id="TSN1.ca",TSN1 (1080p) https://tvpass.org/live/tsn1/hd @@ -171,9 +171,9 @@ https://tvpass.org/live/tsn4/sd https://tvpass.org/live/tsn5/hd #EXTINF:-1 tvg-id="TSN5.ca",TSN5 (360p) https://tvpass.org/live/tsn5/sd -#EXTINF:-1 tvg-id="USANetworkEast.us",USA Network East (1080p) +#EXTINF:-1 tvg-id="USANetwork.us@East",USA Network East (1080p) https://tvpass.org/live/USANetworkEast/hd -#EXTINF:-1 tvg-id="USANetworkEast.us",USA Network East (360p) +#EXTINF:-1 tvg-id="USANetwork.us@East",USA Network East (360p) https://tvpass.org/live/USANetworkEast/sd #EXTINF:-1 tvg-id="WABCDT1.us",WABC-DT1 (720p) https://tvpass.org/live/WABCDT1/hd diff --git a/streams/us_xumo.m3u b/streams/us_xumo.m3u index f4a7cb7d5c..c2b75ddbb9 100644 --- a/streams/us_xumo.m3u +++ b/streams/us_xumo.m3u @@ -27,7 +27,7 @@ https://xumo-xumoent-vc-118-jed5p.fast.nbcuni.com/live/master.m3u8 https://cinedigm-barney-xumo.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="Baywatch.us",Baywatch [Geo-blocked] https://baywatch-xumo.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",BBC Earth +#EXTINF:-1 tvg-id="BBCEarth.uk@US",BBC Earth https://amg00793-amg00793c6-xumo-us-2669.playouts.now.amagi.tv/BBCStudios-BBCEarthA-hls/playlist.m3u8 #EXTINF:-1 tvg-id="",BBC Impossible https://bbc-impossible-1-us.xumo.wurl.tv/playlist.m3u8 @@ -73,7 +73,7 @@ https://demandafrica-xumo-us.amagi.tv/playlist.m3u8 https://amg00353-amg00353c40-xumo-us-4839.playouts.now.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="DoctorWhoClassic.us",Doctor Who Classic https://bbc-classicdrwho-1-us.xumo.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="DogWhisperer.uk",Dog Whisperer with Cesar Millan [Geo-blocked] +#EXTINF:-1 tvg-id="",Dog Whisperer with Cesar Millan [Geo-blocked] https://amg01201-cinedigm-amg01201c30-xumo-us-2277.playouts.now.amagi.tv/cinedigm-dogwhisperer-hls/playlist.m3u8 #EXTINF:-1 tvg-id="DoveChannel.us",Dove Channel https://linear-896.frequency.stream/dist/xumo/896/hls/master/playlist.m3u8 @@ -97,7 +97,7 @@ https://filmex-filmexclasico-xumo.amagi.tv/playlist.m3u8 https://amg00346-vizioono-forkandfligt-xumo-us.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="LiveNOWfromFOX.us",FOX Live Now [Geo-blocked] https://amg00488-foxdigital-newsnow-xumo-qbvgp.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="FoxSports.us",FOX Sports [Geo-blocked] +#EXTINF:-1 tvg-id="",FOX Sports [Geo-blocked] https://amg02855-foxsports-amg02855c1-xumo-us-1755.playouts.now.amagi.tv/Fox-Sports-AmazonNews/playlist.m3u8 #EXTINF:-1 tvg-id="FoxWeather.us",FOX Weather https://amg01542-foxweatherllc-foxweather-xumo-ve91o.amagi.tv/playlist.m3u8 @@ -129,11 +129,11 @@ https://iheart-iheartcountry-1-us.xumo.wurl.tv/playlist.m3u8 https://iheart-iheartthebeat-1-us.xumo.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",Investigation https://amg00346-vizioono-investigation-xumo-us.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="IONTVEast.us",ION +#EXTINF:-1 tvg-id="IONTV.us@East",ION https://scripps-ion-1-us.xumo.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="WFXTDT2.us",ION Mystery (1080p) https://scripps-ionmystery-1-us.xumo.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="IONPlusEast.us",ION Plus +#EXTINF:-1 tvg-id="IONPlus.us@East",ION Plus https://ion-ion-plus-1-us.xumo.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="JewishLifeTelevision.us",Jewish Life Television https://jlt-jltv-xumo.otteravision.com/jlt/jltv/jltv.m3u8 @@ -243,7 +243,7 @@ https://xumo-xumoent-vc-111-0pd1g.fast.nbcuni.com/live/master.m3u8 https://amc-scaresbyshudder-1-us.xumo.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="ScrippsNews.us",Scripps News https://scripps-newsy-1-us.xumo.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Shades of Black [Geo-blocked] +#EXTINF:-1 tvg-id="ShadesofBlack.pl@SD",Shades of Black [Geo-blocked] https://xumo-fusebeats.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",Shaun the Sheep & Friends https://aar-shaun-xumo.otteravision.com/aar/shaun/shaun.m3u8 @@ -259,7 +259,7 @@ https://spt-competencias-1-us.xumo.wurl.tv/playlist.m3u8 https://spt-sonykal-1-us.xumo.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="StoriesbyAMC.us",Stories by AMC https://amc-amcpresents-1-us.xumo.wurl.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="",Strongman Champions League +#EXTINF:-1 tvg-id="StrongmanChampionsLeague.pl@SD",Strongman Champions League https://rightsboosterltd-scl-1-us.xumo.wurl.tv/playlist.m3u8 #EXTINF:-1 tvg-id="",Supermarket Sweep [Geo-blocked] https://amg00145-letsplayinc-supermarketswep-xumo-59bvy.amagi.tv/playlist.m3u8 @@ -307,7 +307,7 @@ https://tg-tg-xumo.otteravision.com/tg/tg/tg.m3u8 https://xumo-xumoent-vc-116-hrcw0.fast.nbcuni.com/live/master.m3u8 #EXTINF:-1 tvg-id="TribecaChannel.us",Tribeca Channel [Geo-blocked] https://amg02507-giantpictures-tribeca-xumo-ey2b7.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="TBNEast.us",Trinity Broadcast Network +#EXTINF:-1 tvg-id="",Trinity Broadcast Network https://d7ge95bb03xsu.cloudfront.net/out/v1/7ed92615b64b46d6b01e61f17463346e/tbn-xumo.m3u8 #EXTINF:-1 tvg-id="",True History Channel https://linear-188.frequency.stream/dist/xumo/188/hls/master/playlist.m3u8 @@ -317,7 +317,7 @@ https://linear-593.frequency.stream/dist/xumo/593/hls/master/playlist.m3u8 https://linear-893.frequency.stream/dist/xumo/893/hls/master/playlist.m3u8 #EXTINF:-1 tvg-id="",Universal Action https://xumo-xumoent-ch828-w6val.fast.nbcuni.com/live/master.m3u8 -#EXTINF:-1 tvg-id="",Universal Crime +#EXTINF:-1 tvg-id="UniversalCrime.us@East",Universal Crime https://xumo-xumoent-vc-107-xmuvk.fast.nbcuni.com/live/master.m3u8 #EXTINF:-1 tvg-id="",Universal Monsters https://xumo-xumoent-ch824-d4q5c.fast.nbcuni.com/live/master.m3u8 diff --git a/streams/vn.m3u b/streams/vn.m3u index a80dfd95d8..f0f4530b0c 100644 --- a/streams/vn.m3u +++ b/streams/vn.m3u @@ -83,6 +83,8 @@ https://60acee235f4d5.streamlock.net/live/mystream/playlist.m3u8 http://113.161.4.48:8080/phuyen/tv/index.m3u8 #EXTINF:-1 tvg-id="PNTV.us",PNTV (720p) https://livefta.malimarcdn.com/ftaedge00/pntv.sdp/playlist.m3u8 +#EXTINF:-1 tvg-id="QPVN.vn",QPVN (480p) +https://ott1.nethubtv.vn/live/qpvn/playlist.m3u8 #EXTINF:-1 tvg-id="QuangNgaiTV.vn",Quang Ngai TV (720p) http://118.107.85.5:1935/live/smil:PTQ.smil/playlist.m3u8 #EXTINF:-1 tvg-id="SETTV.us",SET TV 1 (1080p) @@ -125,5 +127,3 @@ http://125hvt.ddns.net:21585/vtv5/tracks-v1a1/mono.m3u8 http://125hvt.ddns.net:21585/vtv9/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="VTVCanTho.vn",VTV Can Tho (720p) http://125hvt.ddns.net:21585/vtv6/playlist.m3u8 -#EXTINF:-1 tvg-id="QPVN.vn",QPVN (480p) -https://ott1.nethubtv.vn/live/qpvn/playlist.m3u8 diff --git a/streams/za.m3u b/streams/za.m3u index c54e7f099c..fc6bfc56d4 100644 --- a/streams/za.m3u +++ b/streams/za.m3u @@ -15,10 +15,10 @@ https://cdn5.iqsat.net/iq/aa89b15058a61b904359307cc0a5e80a.sdp/playlist.m3u8 https://webstreaming-2.viewmedia.tv/web_022/Stream/playlist.m3u8 #EXTINF:-1 tvg-id="LN24SA.za",LN24SA (1080p) https://cdnstack.internetmultimediaonline.org/ln24/ln24.stream/playlist.m3u8 -#EXTINF:-1 tvg-id="",LoveworldSAT -https://cdnstack.internetmultimediaonline.org/lwsat/lwsat.stream/chunklist.m3u8 -#EXTINF:-1 tvg-id="",LoveworldSAT (1080p) +#EXTINF:-1 tvg-id="LoveworldSAT.ng@SD",LoveworldSAT (1080p) https://cdnstack.internetmultimediaonline.org/lwsat/lwsat.stream/index.m3u8 +#EXTINF:-1 tvg-id="LoveworldSAT.ng@SD",LoveworldSAT +https://cdnstack.internetmultimediaonline.org/lwsat/lwsat.stream/chunklist.m3u8 #EXTINF:-1 tvg-id="RedemptionTelevisionMinistry.za",Redemption TV Ministry (720p) https://live.nixsat.com/play/rtm/index.m3u8 #EXTINF:-1 tvg-id="RLWTV.za",RLW TV (576p) [Not 24/7] @@ -31,7 +31,7 @@ https://sabconeta.cdn.mangomolo.com/sabc1/smil:sabc1.stream.smil/master.m3u8 https://sabctwota.cdn.mangomolo.com/sabc2/smil:sabc2.stream.smil/master.m3u8 #EXTINF:-1 tvg-id="SABC3.za",SABC 3 [Geo-blocked] https://sabctreta.cdn.mangomolo.com/sabc3/smil:sabc3.stream.smil/master.m3u8 -#EXTINF:-1 tvg-id="",SABC Lehae [Geo-blocked] +#EXTINF:-1 tvg-id="SABCLehae.za@SD",SABC Lehae [Geo-blocked] https://sabctretalh.cdn.mangomolo.com/lehae/smil:lehae.stream.smil/master.m3u8 #EXTINF:-1 tvg-id="SABCNews.za",SABC News (720p) [Geo-blocked] https://sabconetanw.cdn.mangomolo.com/news/smil:news.stream.smil/master.m3u8 From 1df1829e2c2af2db7760967d5a88a5a08b0124a8 Mon Sep 17 00:00:00 2001 From: Luu Tuyen Date: Sat, 19 Apr 2025 15:09:41 +0000 Subject: [PATCH 15/40] Update cl.m3u --- streams/cl.m3u | 3 +++ 1 file changed, 3 insertions(+) diff --git a/streams/cl.m3u b/streams/cl.m3u index 3017b30f5c..f90ac1e7ef 100644 --- a/streams/cl.m3u +++ b/streams/cl.m3u @@ -319,6 +319,9 @@ https://stv.janus.cl/playlist/stream.m3u8 https://mdstrm.com/live-stream-playlist/5fad9b1d978fe1080e3ac4a8.m3u8 #EXTINF:-1 tvg-id="SURTV.cl",Sur TV (720p) https://paneltv.online:1936/8034/8034/playlist.m3u8 +#EXTINF:-1 tvg-id="SuyaiTV.cl", Suyai TV (1080p) +#EXTVLCOPT:http-referrer=https://suyaitv.cl +https://signal.suyaitv.cl/live/35/playlist.m3u8?username=ZZDemoIPTVGH&password=9PcdCnFxUe #EXTINF:-1 tvg-id="T13.cl",T13 (720p) https://jireh-2-hls-video-us-isp.dps.live/hls-video/10b92cafdf3646cbc1e727f3dc76863621a327fd/t13/t13.smil/playlist.m3u8 #EXTINF:-1 tvg-id="TVinet.cl",T-Vinet (480p) From 98de503be3616e0f120e77af90826b6ff4d52d2c Mon Sep 17 00:00:00 2001 From: Luu Tuyen Date: Sat, 19 Apr 2025 15:44:36 +0000 Subject: [PATCH 16/40] Update cl.m3u --- streams/cl.m3u | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streams/cl.m3u b/streams/cl.m3u index f90ac1e7ef..f1c05c9135 100644 --- a/streams/cl.m3u +++ b/streams/cl.m3u @@ -319,7 +319,7 @@ https://stv.janus.cl/playlist/stream.m3u8 https://mdstrm.com/live-stream-playlist/5fad9b1d978fe1080e3ac4a8.m3u8 #EXTINF:-1 tvg-id="SURTV.cl",Sur TV (720p) https://paneltv.online:1936/8034/8034/playlist.m3u8 -#EXTINF:-1 tvg-id="SuyaiTV.cl", Suyai TV (1080p) +#EXTINF:-1 tvg-id="SuyaiTV.cl" http-referrer="https://suyaitv.cl", Suyai TV (1080p) #EXTVLCOPT:http-referrer=https://suyaitv.cl https://signal.suyaitv.cl/live/35/playlist.m3u8?username=ZZDemoIPTVGH&password=9PcdCnFxUe #EXTINF:-1 tvg-id="T13.cl",T13 (720p) From 229a4bd6fabb7a70f204fcce875e2c7b1326d288 Mon Sep 17 00:00:00 2001 From: Luu Tuyen Date: Sat, 19 Apr 2025 15:48:56 +0000 Subject: [PATCH 17/40] Update ru.m3u --- streams/ru.m3u | 3 +++ 1 file changed, 3 insertions(+) diff --git a/streams/ru.m3u b/streams/ru.m3u index 65124dbb03..6e8050195d 100644 --- a/streams/ru.m3u +++ b/streams/ru.m3u @@ -133,6 +133,9 @@ https://hls-tvsoyuz.cdnvideo.ru/tvsoyuz2/muzsoyuz.6fw0-58xp-acts-esy0/playlist.m https://sirius.greenhosting.ru/MultimaniaRu/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="Multimania.ru",Мультимания ТВ http://sirius.greenhosting.ru/MultimaniaRu/video.m3u8 +#EXTINF:-1 tvg-id="Pobeda.ru" http-referrer="https://pobeda.tv/",Победа +#EXTVLCOPT:http-referrer=https://pobeda.tv/ +https://pkvc-hls3.cdnvideo.ru/Pobeda/smil:Pobeda.smil/chunklist_b5128000_slru.m3u8 #EXTINF:-1 tvg-id="HopeChannelRussia.ru",Надежда (720p) https://live-tvhope.cdnvideo.ru/tvhope-pull/tvhope_1/playlist.m3u8 #EXTINF:-1 tvg-id="HopeChannelRussia.ru",Надежда (720p) From 88e62715e81d7318b238203ff95b74753cda7dd0 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Tue, 22 Apr 2025 03:47:28 +0300 Subject: [PATCH 18/40] Update tests --- tests/commands/api/generate.test.ts | 25 ++++++--- tests/commands/playlist/format.test.ts | 30 +++++++---- tests/commands/playlist/generate.test.ts | 39 +++++++++------ tests/commands/playlist/test.test.ts | 35 +++++++++---- tests/commands/playlist/update.test.ts | 40 ++++++++------- tests/commands/playlist/validate.test.ts | 64 +++++++++++++----------- tests/commands/readme/update.test.ts | 27 ++++++---- tests/commands/report/create.test.ts | 26 ++++++---- 8 files changed, 175 insertions(+), 111 deletions(-) diff --git a/tests/commands/api/generate.test.ts b/tests/commands/api/generate.test.ts index 7f8f68aa93..3f2178da67 100644 --- a/tests/commands/api/generate.test.ts +++ b/tests/commands/api/generate.test.ts @@ -1,19 +1,28 @@ import { execSync } from 'child_process' import fs from 'fs-extra' +import os from 'os' + +let ENV_VAR = + 'DATA_DIR=tests/__data__/input/data STREAMS_DIR=tests/__data__/input/api_generate API_DIR=tests/__data__/output/.api' +if (os.platform() === 'win32') { + ENV_VAR = + 'SET "DATA_DIR=tests/__data__/input/data" && SET "STREAMS_DIR=tests/__data__/input/api_generate" && SET "API_DIR=tests/__data__/output/.api" &&' +} beforeEach(() => { fs.emptyDirSync('tests/__data__/output') }) -it('can create streams.json', () => { - execSync( - 'DATA_DIR=tests/__data__/input/data STREAMS_DIR=tests/__data__/input/api_generate API_DIR=tests/__data__/output/.api npm run api:generate', - { encoding: 'utf8' } - ) +describe('api:generate', () => { + it('can create streams.json', () => { + const cmd = `${ENV_VAR} npm run api:generate` + const stdout = execSync(cmd, { encoding: 'utf8' }) + if (process.env.DEBUG === 'true') console.log(cmd, stdout) - expect(content('output/.api/streams.json')).toMatchObject( - content('expected/api_generate/.api/streams.json') - ) + expect(content('output/.api/streams.json')).toMatchObject( + content('expected/api_generate/.api/streams.json') + ) + }) }) function content(filepath: string) { diff --git a/tests/commands/playlist/format.test.ts b/tests/commands/playlist/format.test.ts index d513c8b386..58174f93a3 100644 --- a/tests/commands/playlist/format.test.ts +++ b/tests/commands/playlist/format.test.ts @@ -1,25 +1,33 @@ import { execSync } from 'child_process' import * as fs from 'fs-extra' import { glob } from 'glob' +import os from 'os' + +let ENV_VAR = 'STREAMS_DIR=tests/__data__/output/streams' +if (os.platform() === 'win32') { + ENV_VAR = 'SET "STREAMS_DIR=tests/__data__/output/streams" &&' +} beforeEach(() => { fs.emptyDirSync('tests/__data__/output') fs.copySync('tests/__data__/input/playlist_format', 'tests/__data__/output/streams') }) -it('can format playlists', () => { - execSync('STREAMS_DIR=tests/__data__/output/streams npm run playlist:format', { - encoding: 'utf8' - }) +describe('playlist:format', () => { + it('can format playlists', () => { + const cmd = `${ENV_VAR} npm run playlist:format` + const stdout = execSync(cmd, { encoding: 'utf8' }) + if (process.env.DEBUG === 'true') console.log(cmd, stdout) - const files = glob - .sync('tests/__data__/expected/playlist_format/*.m3u') - .map(f => f.replace('tests/__data__/expected/playlist_format/', '')) + const files = glob + .sync('tests/__data__/expected/playlist_format/*.m3u') + .map(f => f.replace('tests/__data__/expected/playlist_format/', '')) - files.forEach(filepath => { - expect(content(`output/streams/${filepath}`), filepath).toBe( - content(`expected/playlist_format/${filepath}`) - ) + files.forEach(filepath => { + expect(content(`output/streams/${filepath}`), filepath).toBe( + content(`expected/playlist_format/${filepath}`) + ) + }) }) }) diff --git a/tests/commands/playlist/generate.test.ts b/tests/commands/playlist/generate.test.ts index 389ee022ee..d51428aca6 100644 --- a/tests/commands/playlist/generate.test.ts +++ b/tests/commands/playlist/generate.test.ts @@ -1,32 +1,39 @@ import { execSync } from 'child_process' import * as fs from 'fs-extra' import * as glob from 'glob' +import os from 'os' + +let ENV_VAR = + 'STREAMS_DIR=tests/__data__/input/playlist_generate DATA_DIR=tests/__data__/input/data PUBLIC_DIR=tests/__data__/output/.gh-pages LOGS_DIR=tests/__data__/output/logs' +if (os.platform() === 'win32') { + ENV_VAR = + 'SET "STREAMS_DIR=tests/__data__/input/playlist_generate" && SET "DATA_DIR=tests/__data__/input/data" && SET "PUBLIC_DIR=tests/__data__/output/.gh-pages" && SET "LOGS_DIR=tests/__data__/output/logs" &&' +} beforeEach(() => { fs.emptyDirSync('tests/__data__/output') }) -it('can generate playlists and logs', () => { - const stdout = execSync( - 'STREAMS_DIR=tests/__data__/input/playlist_generate DATA_DIR=tests/__data__/input/data PUBLIC_DIR=tests/__data__/output/.gh-pages LOGS_DIR=tests/__data__/output/logs npm run playlist:generate', - { encoding: 'utf8' } - ) +describe('playlist:generate', () => { + it('can generate playlists and logs', () => { + const cmd = `${ENV_VAR} npm run playlist:generate` + const stdout = execSync(cmd, { encoding: 'utf8' }) + if (process.env.DEBUG === 'true') console.log(cmd, stdout) - if (process.env.DEBUG === 'true') console.log(stdout) + const playlists = glob + .sync('tests/__data__/expected/playlist_generate/.gh-pages/**/*.m3u') + .map((file: string) => file.replace('tests/__data__/expected/playlist_generate/', '')) - const playlists = glob - .sync('tests/__data__/expected/playlist_generate/.gh-pages/**/*.m3u') - .map((file: string) => file.replace('tests/__data__/expected/playlist_generate/', '')) + playlists.forEach((filepath: string) => { + expect(content(`output/${filepath}`), filepath).toBe( + content(`expected/playlist_generate/${filepath}`) + ) + }) - playlists.forEach((filepath: string) => { - expect(content(`output/${filepath}`), filepath).toBe( - content(`expected/playlist_generate/${filepath}`) + expect(content('output/logs/generators.log').split('\n').sort()).toStrictEqual( + content('expected/playlist_generate/logs/generators.log').split('\n').sort() ) }) - - expect(content('output/logs/generators.log').split('\n').sort()).toStrictEqual( - content('expected/playlist_generate/logs/generators.log').split('\n').sort() - ) }) function content(filepath: string) { diff --git a/tests/commands/playlist/test.test.ts b/tests/commands/playlist/test.test.ts index 0842f0f108..0020106dce 100644 --- a/tests/commands/playlist/test.test.ts +++ b/tests/commands/playlist/test.test.ts @@ -1,19 +1,32 @@ import { execSync } from 'child_process' +import os from 'os' type ExecError = { status: number stdout: string } -it('shows an error if the playlist contains a broken link', () => { - try { - execSync('ROOT_DIR=tests/__data__/input npm run playlist:test playlist_test/ag.m3u', { - encoding: 'utf8' - }) - process.exit(1) - } catch (error) { - expect((error as ExecError).status).toBe(1) - expect((error as ExecError).stdout).toContain('playlist_test/ag.m3u') - expect((error as ExecError).stdout).toContain('2 problems (1 errors, 1 warnings)') - } +let ENV_VAR = 'ROOT_DIR=tests/__data__/input' +if (os.platform() === 'win32') { + ENV_VAR = 'SET "ROOT_DIR=tests/__data__/input" &&' +} + +describe('playlist:test', () => { + it('shows an error if the playlist contains a broken link', () => { + const cmd = `${ENV_VAR} npm run playlist:test playlist_test/ag.m3u` + try { + const stdout = execSync(cmd, { encoding: 'utf8' }) + if (process.env.DEBUG === 'true') console.log(cmd, stdout) + checkStdout(stdout) + } catch (error) { + // NOTE: for Windows only + if (process.env.DEBUG === 'true') console.log(cmd, error) + checkStdout((error as ExecError).stdout) + } + }) }) + +function checkStdout(stdout: string) { + expect(stdout).toContain('playlist_test/ag.m3u') + expect(stdout).toContain('2 problems (1 errors, 1 warnings)') +} diff --git a/tests/commands/playlist/update.test.ts b/tests/commands/playlist/update.test.ts index cc104d8cce..16dbefaf85 100644 --- a/tests/commands/playlist/update.test.ts +++ b/tests/commands/playlist/update.test.ts @@ -1,33 +1,39 @@ import { execSync } from 'child_process' import * as fs from 'fs-extra' import { glob } from 'glob' +import os from 'os' + +let ENV_VAR = 'DATA_DIR=tests/__data__/input/data STREAMS_DIR=tests/__data__/output/streams' +if (os.platform() === 'win32') { + ENV_VAR = + 'SET "DATA_DIR=tests/__data__/input/data" && SET "STREAMS_DIR=tests/__data__/output/streams" &&' +} beforeEach(() => { fs.emptyDirSync('tests/__data__/output') fs.copySync('tests/__data__/input/playlist_update', 'tests/__data__/output/streams') }) -it('can update playlists', () => { - const stdout = execSync( - 'DATA_DIR=tests/__data__/input/data STREAMS_DIR=tests/__data__/output/streams npm run playlist:update --silent', - { - encoding: 'utf8' - } - ) +describe('playlist:update', () => { + it('can update playlists', () => { + const cmd = `${ENV_VAR} npm run playlist:update --silent` + const stdout = execSync(cmd, { encoding: 'utf8' }) + if (process.env.DEBUG === 'true') console.log(cmd, stdout) - const files = glob - .sync('tests/__data__/expected/playlist_update/*.m3u') - .map(f => f.replace('tests/__data__/expected/playlist_update/', '')) + const files = glob + .sync('tests/__data__/expected/playlist_update/*.m3u') + .map(f => f.replace('tests/__data__/expected/playlist_update/', '')) - files.forEach(filepath => { - expect(content(`output/streams/${filepath}`), filepath).toBe( - content(`expected/playlist_update/${filepath}`) + files.forEach(filepath => { + expect(content(`output/streams/${filepath}`), filepath).toBe( + content(`expected/playlist_update/${filepath}`) + ) + }) + + expect(stdout).toBe( + 'OUTPUT=closes #14151, closes #14150, closes #14110, closes #14120, closes #14175, closes #14105, closes #14104, closes #14057, closes #14034, closes #13964, closes #13893, closes #13881, closes #13793, closes #13751, closes #13715\n' ) }) - - expect(stdout).toBe( - 'OUTPUT=closes #14151, closes #14150, closes #14110, closes #14120, closes #14175, closes #14105, closes #14104, closes #14057, closes #14034, closes #13964, closes #13893, closes #13881, closes #13793, closes #13751, closes #13715\n' - ) }) function content(filepath: string) { diff --git a/tests/commands/playlist/validate.test.ts b/tests/commands/playlist/validate.test.ts index b2a43324e4..933099bc9c 100644 --- a/tests/commands/playlist/validate.test.ts +++ b/tests/commands/playlist/validate.test.ts @@ -1,41 +1,47 @@ import { execSync } from 'child_process' +import os from 'os' type ExecError = { status: number stdout: string } -it('show an error if channel id in the blocklist', () => { - try { - const stdout = execSync( - 'DATA_DIR=tests/__data__/input/data STREAMS_DIR=tests/__data__/input/playlist_validate npm run playlist:validate -- us_blocked.m3u', - { - encoding: 'utf8' - } +let ENV_VAR = + 'DATA_DIR=tests/__data__/input/data STREAMS_DIR=tests/__data__/input/playlist_validate' +if (os.platform() === 'win32') { + ENV_VAR = + 'SET "DATA_DIR=tests/__data__/input/data" && SET "STREAMS_DIR=tests/__data__/input/playlist_validate" &&' +} + +describe('playlist:validate', () => { + it('show an error if channel id in the blocklist', () => { + const cmd = `${ENV_VAR} npm run playlist:validate -- us_blocked.m3u` + try { + const stdout = execSync(cmd, { encoding: 'utf8' }) + if (process.env.DEBUG === 'true') console.log(cmd, stdout) + checkStdout(stdout) + } catch (error) { + // NOTE: for Windows only + if (process.env.DEBUG === 'true') console.log(cmd, error) + checkStdout((error as ExecError).stdout) + } + }) + + it('show a warning if channel has wrong id', () => { + const cmd = `${ENV_VAR} npm run playlist:validate -- wrong_id.m3u` + const stdout = execSync(cmd, { encoding: 'utf8' }) + if (process.env.DEBUG === 'true') console.log(cmd, stdout) + + expect(stdout).toContain( + 'wrong_id.m3u\n 2 warning "qib22lAq1L.us" is not in the database\n\n1 problems (0 errors, 1 warnings)\n' ) - if (process.env.DEBUG === 'true') console.log(stdout) - process.exit(1) - } catch (error) { - if (process.env.DEBUG === 'true') console.log((error as ExecError).stdout) - expect((error as ExecError).status).toBe(1) - expect((error as ExecError).stdout).toContain(`us_blocked.m3u + }) +}) + +function checkStdout(stdout: string) { + expect(stdout).toContain(`us_blocked.m3u 2 error "FoxSports2.us" is on the blocklist due to claims of copyright holders (https://github.com/iptv-org/iptv/issues/0002) 4 error "TVN.pl" is on the blocklist due to NSFW content (https://github.com/iptv-org/iptv/issues/0003) 2 problems (2 errors, 0 warnings)`) - } -}) - -it('show a warning if channel has wrong id', () => { - const stdout = execSync( - 'DATA_DIR=tests/__data__/input/data STREAMS_DIR=tests/__data__/input/playlist_validate npm run playlist:validate -- wrong_id.m3u', - { - encoding: 'utf8' - } - ) - if (process.env.DEBUG === 'true') console.log(stdout) - - expect(stdout).toContain( - 'wrong_id.m3u\n 2 warning "qib22lAq1L.us" is not in the database\n\n1 problems (0 errors, 1 warnings)\n' - ) -}) +} diff --git a/tests/commands/readme/update.test.ts b/tests/commands/readme/update.test.ts index f15e71f48b..0ba363409d 100644 --- a/tests/commands/readme/update.test.ts +++ b/tests/commands/readme/update.test.ts @@ -1,6 +1,14 @@ import { execSync } from 'child_process' import fs from 'fs-extra' import path from 'path' +import os from 'os' + +let ENV_VAR = + 'DATA_DIR=tests/__data__/input/data LOGS_DIR=tests/__data__/input/readme_update README_DIR=tests/__data__/output/.readme' +if (os.platform() === 'win32') { + ENV_VAR = + 'SET "DATA_DIR=tests/__data__/input/data" && SET "LOGS_DIR=tests/__data__/input/readme_update" && SET "README_DIR=tests/__data__/output/.readme" &&' +} beforeEach(() => { fs.emptyDirSync('tests/__data__/output') @@ -13,17 +21,18 @@ beforeEach(() => { 'tests/__data__/input/readme_update/.readme/template.md', 'tests/__data__/output/.readme/template.md' ) - - execSync( - 'DATA_DIR=tests/__data__/input/data LOGS_DIR=tests/__data__/input/readme_update README_DIR=tests/__data__/output/.readme npm run readme:update', - { encoding: 'utf8' } - ) }) -it('can update readme.md', () => { - expect(content('tests/__data__/output/readme.md')).toEqual( - content('tests/__data__/expected/readme_update/_readme.md') - ) +describe('readme:update', () => { + it('can update readme.md', () => { + const cmd = `${ENV_VAR} npm run readme:update` + const stdout = execSync(cmd, { encoding: 'utf8' }) + if (process.env.DEBUG === 'true') console.log(cmd, stdout) + + expect(content('tests/__data__/output/readme.md')).toEqual( + content('tests/__data__/expected/readme_update/_readme.md') + ) + }) }) function content(filepath: string) { diff --git a/tests/commands/report/create.test.ts b/tests/commands/report/create.test.ts index de449347af..18c7994455 100644 --- a/tests/commands/report/create.test.ts +++ b/tests/commands/report/create.test.ts @@ -1,15 +1,20 @@ import { execSync } from 'child_process' +import os from 'os' -it('can create report', () => { - const stdout = execSync( - 'DATA_DIR=tests/__data__/input/data STREAMS_DIR=tests/__data__/input/report_create npm run report:create', - { - encoding: 'utf8' - } - ) +let ENV_VAR = 'DATA_DIR=tests/__data__/input/data STREAMS_DIR=tests/__data__/input/report_create' +if (os.platform() === 'win32') { + ENV_VAR = + 'SET "DATA_DIR=tests/__data__/input/data" && SET "STREAMS_DIR=tests/__data__/input/report_create" &&' +} - expect( - stdout.includes(` +describe('report:create', () => { + it('can create report', () => { + const cmd = `${ENV_VAR} npm run report:create` + const stdout = execSync(cmd, { encoding: 'utf8' }) + if (process.env.DEBUG === 'true') console.log(cmd, stdout) + + expect( + stdout.includes(` ┌─────────┬─────────────┬──────────────────┬─────────────────────────────┬───────────────────────────────────────────────────────────────────────────────────────────────────────────┬───────────────┐ │ (index) │ issueNumber │ type │ streamId │ streamUrl │ status │ ├─────────┼─────────────┼──────────────────┼─────────────────────────────┼───────────────────────────────────────────────────────────────────────────────────────────────────────────┼───────────────┤ @@ -20,5 +25,6 @@ it('can create report', () => { │ 4 │ 16120 │ 'broken stream' │ undefined │ 'http://190.61.102.67:2000/play/a038/index.m3u8' │ 'wrong_link' │ │ 5 │ 19956 │ 'channel search' │ 'CNBCe.tr' │ undefined │ 'invalid_id' │ └─────────┴─────────────┴──────────────────┴─────────────────────────────┴───────────────────────────────────────────────────────────────────────────────────────────────────────────┴───────────────┘`) - ).toBe(true) + ).toBe(true) + }) }) From 5e8dee13a99e05488afe62bdfe90801c646e2cbe Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Tue, 22 Apr 2025 23:17:48 +0300 Subject: [PATCH 19/40] Update tests --- tests/commands/api/generate.test.ts | 11 ++++------- tests/commands/playlist/format.test.ts | 9 ++++----- tests/commands/playlist/generate.test.ts | 13 ++++++------- tests/commands/playlist/update.test.ts | 9 ++++----- tests/commands/readme/update.test.ts | 7 ++----- 5 files changed, 20 insertions(+), 29 deletions(-) diff --git a/tests/commands/api/generate.test.ts b/tests/commands/api/generate.test.ts index 3f2178da67..931f543cb8 100644 --- a/tests/commands/api/generate.test.ts +++ b/tests/commands/api/generate.test.ts @@ -1,3 +1,4 @@ +import { pathToFileURL } from 'node:url' import { execSync } from 'child_process' import fs from 'fs-extra' import os from 'os' @@ -19,16 +20,12 @@ describe('api:generate', () => { const stdout = execSync(cmd, { encoding: 'utf8' }) if (process.env.DEBUG === 'true') console.log(cmd, stdout) - expect(content('output/.api/streams.json')).toMatchObject( - content('expected/api_generate/.api/streams.json') + expect(content('tests/__data__/output/.api/streams.json')).toMatchObject( + content('tests/__data__/expected/api_generate/.api/streams.json') ) }) }) function content(filepath: string) { - return JSON.parse( - fs.readFileSync(`tests/__data__/${filepath}`, { - encoding: 'utf8' - }) - ) + return JSON.parse(fs.readFileSync(pathToFileURL(filepath), { encoding: 'utf8' })) } diff --git a/tests/commands/playlist/format.test.ts b/tests/commands/playlist/format.test.ts index 58174f93a3..070bfd7d98 100644 --- a/tests/commands/playlist/format.test.ts +++ b/tests/commands/playlist/format.test.ts @@ -1,3 +1,4 @@ +import { pathToFileURL } from 'node:url' import { execSync } from 'child_process' import * as fs from 'fs-extra' import { glob } from 'glob' @@ -24,15 +25,13 @@ describe('playlist:format', () => { .map(f => f.replace('tests/__data__/expected/playlist_format/', '')) files.forEach(filepath => { - expect(content(`output/streams/${filepath}`), filepath).toBe( - content(`expected/playlist_format/${filepath}`) + expect(content(`tests/__data__/output/streams/${filepath}`), filepath).toBe( + content(`tests/__data__/expected/playlist_format/${filepath}`) ) }) }) }) function content(filepath: string) { - return fs.readFileSync(`tests/__data__/${filepath}`, { - encoding: 'utf8' - }) + return fs.readFileSync(pathToFileURL(filepath), { encoding: 'utf8' }) } diff --git a/tests/commands/playlist/generate.test.ts b/tests/commands/playlist/generate.test.ts index d51428aca6..5c99f02696 100644 --- a/tests/commands/playlist/generate.test.ts +++ b/tests/commands/playlist/generate.test.ts @@ -1,3 +1,4 @@ +import { pathToFileURL } from 'node:url' import { execSync } from 'child_process' import * as fs from 'fs-extra' import * as glob from 'glob' @@ -25,19 +26,17 @@ describe('playlist:generate', () => { .map((file: string) => file.replace('tests/__data__/expected/playlist_generate/', '')) playlists.forEach((filepath: string) => { - expect(content(`output/${filepath}`), filepath).toBe( - content(`expected/playlist_generate/${filepath}`) + expect(content(`tests/__data__/output/${filepath}`), filepath).toBe( + content(`tests/__data__/expected/playlist_generate/${filepath}`) ) }) - expect(content('output/logs/generators.log').split('\n').sort()).toStrictEqual( - content('expected/playlist_generate/logs/generators.log').split('\n').sort() + expect(content('tests/__data__/output/logs/generators.log').split('\n').sort()).toStrictEqual( + content('tests/__data__/expected/playlist_generate/logs/generators.log').split('\n').sort() ) }) }) function content(filepath: string) { - return fs.readFileSync(`tests/__data__/${filepath}`, { - encoding: 'utf8' - }) + return fs.readFileSync(pathToFileURL(filepath), { encoding: 'utf8' }) } diff --git a/tests/commands/playlist/update.test.ts b/tests/commands/playlist/update.test.ts index 16dbefaf85..a9949c4994 100644 --- a/tests/commands/playlist/update.test.ts +++ b/tests/commands/playlist/update.test.ts @@ -1,3 +1,4 @@ +import { pathToFileURL } from 'node:url' import { execSync } from 'child_process' import * as fs from 'fs-extra' import { glob } from 'glob' @@ -25,8 +26,8 @@ describe('playlist:update', () => { .map(f => f.replace('tests/__data__/expected/playlist_update/', '')) files.forEach(filepath => { - expect(content(`output/streams/${filepath}`), filepath).toBe( - content(`expected/playlist_update/${filepath}`) + expect(content(`tests/__data__/output/streams/${filepath}`), filepath).toBe( + content(`tests/__data__/expected/playlist_update/${filepath}`) ) }) @@ -37,7 +38,5 @@ describe('playlist:update', () => { }) function content(filepath: string) { - return fs.readFileSync(`tests/__data__/${filepath}`, { - encoding: 'utf8' - }) + return fs.readFileSync(pathToFileURL(filepath), { encoding: 'utf8' }) } diff --git a/tests/commands/readme/update.test.ts b/tests/commands/readme/update.test.ts index 0ba363409d..061179ed4d 100644 --- a/tests/commands/readme/update.test.ts +++ b/tests/commands/readme/update.test.ts @@ -1,3 +1,4 @@ +import { pathToFileURL } from 'node:url' import { execSync } from 'child_process' import fs from 'fs-extra' import path from 'path' @@ -36,9 +37,5 @@ describe('readme:update', () => { }) function content(filepath: string) { - const data = fs.readFileSync(path.resolve(filepath), { - encoding: 'utf8' - }) - - return JSON.stringify(data) + return JSON.stringify(fs.readFileSync(pathToFileURL(filepath), { encoding: 'utf8' })) } From c0514887ae53b8b2e6fe5af15cebd7f1d9b4dd13 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Tue, 22 Apr 2025 23:24:44 +0300 Subject: [PATCH 20/40] Update .gitignore --- .gitignore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3fe46ea012..ad225b41d1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ node_modules .secrets .actrc .DS_Store -.gh-pages -.api +/.gh-pages/ +/.api/ .env -/temp \ No newline at end of file +/temp/ \ No newline at end of file From b505949b821ff5ce99a6fb7ed8026aae1eb7b42a Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Tue, 22 Apr 2025 23:25:16 +0300 Subject: [PATCH 21/40] Add tests/__data__/expected --- .../expected/api_generate/.api/streams.json | 57 +++++++++++++++++++ .../.gh-pages/categories/general.m3u | 7 +++ .../.gh-pages/categories/legislative.m3u | 1 + .../.gh-pages/categories/news.m3u | 3 + .../.gh-pages/categories/undefined.m3u | 15 +++++ .../.gh-pages/categories/weather.m3u | 3 + .../.gh-pages/categories/xxx.m3u | 3 + .../.gh-pages/countries/ad.m3u | 3 + .../.gh-pages/countries/ca.m3u | 3 + .../.gh-pages/countries/ru.m3u | 3 + .../.gh-pages/countries/undefined.m3u | 11 ++++ .../.gh-pages/index.category.m3u | 25 ++++++++ .../.gh-pages/index.country.m3u | 31 ++++++++++ .../.gh-pages/index.language.m3u | 23 ++++++++ .../playlist_generate/.gh-pages/index.m3u | 23 ++++++++ .../.gh-pages/index.region.m3u | 43 ++++++++++++++ .../.gh-pages/languages/eng.m3u | 3 + .../.gh-pages/languages/rus.m3u | 3 + .../.gh-pages/languages/undefined.m3u | 17 ++++++ .../.gh-pages/regions/afr.m3u | 1 + .../.gh-pages/regions/amer.m3u | 3 + .../.gh-pages/regions/apac.m3u | 1 + .../.gh-pages/regions/arab.m3u | 1 + .../.gh-pages/regions/asia.m3u | 5 ++ .../.gh-pages/regions/carib.m3u | 1 + .../.gh-pages/regions/cas.m3u | 3 + .../.gh-pages/regions/cis.m3u | 5 ++ .../.gh-pages/regions/emea.m3u | 7 +++ .../.gh-pages/regions/eur.m3u | 7 +++ .../.gh-pages/regions/hispam.m3u | 1 + .../.gh-pages/regions/int.m3u | 5 ++ .../.gh-pages/regions/lac.m3u | 1 + .../.gh-pages/regions/latam.m3u | 1 + .../.gh-pages/regions/maghreb.m3u | 1 + .../.gh-pages/regions/mena.m3u | 1 + .../.gh-pages/regions/mideast.m3u | 1 + .../.gh-pages/regions/nam.m3u | 3 + .../.gh-pages/regions/noram.m3u | 3 + .../.gh-pages/regions/nord.m3u | 1 + .../.gh-pages/regions/oce.m3u | 1 + .../.gh-pages/regions/sas.m3u | 1 + .../.gh-pages/regions/ssa.m3u | 1 + .../.gh-pages/regions/undefined.m3u | 11 ++++ .../.gh-pages/regions/wafr.m3u | 1 + .../.gh-pages/subdivisions/ca-on.m3u | 3 + 45 files changed, 347 insertions(+) create mode 100644 tests/__data__/expected/api_generate/.api/streams.json create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/categories/general.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/categories/legislative.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/categories/news.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/categories/undefined.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/categories/weather.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/categories/xxx.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/countries/ad.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/countries/ca.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/countries/ru.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/countries/undefined.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/index.category.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/index.country.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/index.language.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/index.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/index.region.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/languages/eng.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/languages/rus.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/languages/undefined.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/afr.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/amer.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/apac.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/arab.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/asia.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/carib.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/cas.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/cis.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/emea.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/eur.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/hispam.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/int.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/lac.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/latam.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/maghreb.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/mena.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/mideast.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/nam.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/noram.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/nord.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/oce.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/sas.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/ssa.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/undefined.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/regions/wafr.m3u create mode 100644 tests/__data__/expected/playlist_generate/.gh-pages/subdivisions/ca-on.m3u diff --git a/tests/__data__/expected/api_generate/.api/streams.json b/tests/__data__/expected/api_generate/.api/streams.json new file mode 100644 index 0000000000..b85871048b --- /dev/null +++ b/tests/__data__/expected/api_generate/.api/streams.json @@ -0,0 +1,57 @@ +[ + { + "channel": null, + "feed": null, + "url": "http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8", + "referrer": null, + "user_agent": null + }, + { + "channel": null, + "feed": null, + "url": "http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8", + "referrer": "http://imn.iq", + "user_agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" + }, + { + "channel": "AndorraTV.ad", + "feed": "SD", + "url": "https://iptv-all.lanesh4d0w.repl.co/andorra/atv", + "referrer": null, + "user_agent": null + }, + { + "channel": "BBCNews.uk", + "url": "http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8", + "referrer": null, + "user_agent": null + }, + { + "channel": "LDPRTV.ru", + "feed": null, + "url": "http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8", + "referrer": null, + "user_agent": null + }, + { + "channel": "MeteoMedia.ca", + "feed": null, + "url": "http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8", + "referrer": null, + "user_agent": null + }, + { + "channel": "VisitXTV.nl", + "feed": null, + "url": "https://stream.visit-x.tv/vxtv/ngrp:live_all/30fps.m3u8", + "referrer": null, + "user_agent": null + }, + { + "channel": "Zoo.ad", + "feed": null, + "url": "https://iptv-all.lanesh4d0w.repl.co/andorra/zoo", + "referrer": null, + "user_agent": null + } +] \ No newline at end of file diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/categories/general.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/categories/general.m3u new file mode 100644 index 0000000000..e9587edc70 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/categories/general.m3u @@ -0,0 +1,7 @@ +#EXTM3U +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/categories/legislative.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/categories/legislative.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/categories/legislative.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/categories/news.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/categories/news.m3u new file mode 100644 index 0000000000..cf4e62a9a5 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/categories/news.m3u @@ -0,0 +1,3 @@ +#EXTM3U +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/categories/undefined.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/categories/undefined.m3u new file mode 100644 index 0000000000..4182fcb1d6 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/categories/undefined.m3u @@ -0,0 +1,15 @@ +#EXTM3U +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/categories/weather.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/categories/weather.m3u new file mode 100644 index 0000000000..4686c68f4b --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/categories/weather.m3u @@ -0,0 +1,3 @@ +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/categories/xxx.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/categories/xxx.m3u new file mode 100644 index 0000000000..d1e3a69bcd --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/categories/xxx.m3u @@ -0,0 +1,3 @@ +#EXTM3U +#EXTINF:-1 tvg-id="VisitXTV.nl" tvg-logo="https://i.imgur.com/RJ9wbNF.jpg" group-title="XXX",Visit-X TV +https://stream.visit-x.tv/vxtv/ngrp:live_all/30fps.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/countries/ad.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/countries/ad.m3u new file mode 100644 index 0000000000..de466399ac --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/countries/ad.m3u @@ -0,0 +1,3 @@ +#EXTM3U +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/countries/ca.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/countries/ca.m3u new file mode 100644 index 0000000000..4686c68f4b --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/countries/ca.m3u @@ -0,0 +1,3 @@ +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/countries/ru.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/countries/ru.m3u new file mode 100644 index 0000000000..cbfde92492 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/countries/ru.m3u @@ -0,0 +1,3 @@ +#EXTM3U +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/countries/undefined.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/countries/undefined.m3u new file mode 100644 index 0000000000..da6b5f4bb7 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/countries/undefined.m3u @@ -0,0 +1,11 @@ +#EXTM3U +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/index.category.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/index.category.m3u new file mode 100644 index 0000000000..2ce7c040e5 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/index.category.m3u @@ -0,0 +1,25 @@ +#EXTM3U +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="News",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/index.country.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/index.country.m3u new file mode 100644 index 0000000000..f5eba15e42 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/index.country.m3u @@ -0,0 +1,31 @@ +#EXTM3U +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Andorra",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Canada",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Kazakhstan",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Kyrgyzstan",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Russia",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Tajikistan",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Turkmenistan",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Uzbekistan",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="International",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="International",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/index.language.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/index.language.m3u new file mode 100644 index 0000000000..ed5f240141 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/index.language.m3u @@ -0,0 +1,23 @@ +#EXTM3U +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Catalan",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="English",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Russian",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Undefined",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Undefined",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/index.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/index.m3u new file mode 100644 index 0000000000..1d27713b1d --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/index.m3u @@ -0,0 +1,23 @@ +#EXTM3U +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/index.region.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/index.region.m3u new file mode 100644 index 0000000000..90c7438cec --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/index.region.m3u @@ -0,0 +1,43 @@ +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Americas",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Asia",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Asia",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Central Asia",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Commonwealth of Independent States",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Commonwealth of Independent States",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Europe",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Europe",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Europe",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Europe, the Middle East and Africa",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Europe, the Middle East and Africa",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Europe, the Middle East and Africa",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="North America",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Northern America",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="International",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="International",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/languages/eng.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/languages/eng.m3u new file mode 100644 index 0000000000..cf4e62a9a5 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/languages/eng.m3u @@ -0,0 +1,3 @@ +#EXTM3U +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/languages/rus.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/languages/rus.m3u new file mode 100644 index 0000000000..cbfde92492 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/languages/rus.m3u @@ -0,0 +1,3 @@ +#EXTM3U +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/languages/undefined.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/languages/undefined.m3u new file mode 100644 index 0000000000..5d59e689d7 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/languages/undefined.m3u @@ -0,0 +1,17 @@ +#EXTM3U +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/afr.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/afr.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/afr.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/amer.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/amer.m3u new file mode 100644 index 0000000000..4686c68f4b --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/amer.m3u @@ -0,0 +1,3 @@ +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/apac.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/apac.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/apac.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/arab.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/arab.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/arab.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/asia.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/asia.m3u new file mode 100644 index 0000000000..6f6d448e87 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/asia.m3u @@ -0,0 +1,5 @@ +#EXTM3U +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/carib.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/carib.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/carib.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/cas.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/cas.m3u new file mode 100644 index 0000000000..a9387b8b44 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/cas.m3u @@ -0,0 +1,3 @@ +#EXTM3U +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/cis.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/cis.m3u new file mode 100644 index 0000000000..6f6d448e87 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/cis.m3u @@ -0,0 +1,5 @@ +#EXTM3U +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/emea.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/emea.m3u new file mode 100644 index 0000000000..16dd0c3954 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/emea.m3u @@ -0,0 +1,7 @@ +#EXTM3U +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/eur.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/eur.m3u new file mode 100644 index 0000000000..16dd0c3954 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/eur.m3u @@ -0,0 +1,7 @@ +#EXTM3U +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/hispam.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/hispam.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/hispam.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/int.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/int.m3u new file mode 100644 index 0000000000..c549c09ce1 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/int.m3u @@ -0,0 +1,5 @@ +#EXTM3U +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/lac.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/lac.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/lac.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/latam.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/latam.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/latam.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/maghreb.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/maghreb.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/maghreb.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/mena.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/mena.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/mena.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/mideast.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/mideast.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/mideast.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/nam.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/nam.m3u new file mode 100644 index 0000000000..4686c68f4b --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/nam.m3u @@ -0,0 +1,3 @@ +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/noram.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/noram.m3u new file mode 100644 index 0000000000..4686c68f4b --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/noram.m3u @@ -0,0 +1,3 @@ +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/nord.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/nord.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/nord.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/oce.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/oce.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/oce.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/sas.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/sas.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/sas.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/ssa.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/ssa.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/ssa.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/undefined.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/undefined.m3u new file mode 100644 index 0000000000..da6b5f4bb7 --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/undefined.m3u @@ -0,0 +1,11 @@ +#EXTM3U +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/wafr.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/wafr.m3u new file mode 100644 index 0000000000..fcd718794a --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/wafr.m3u @@ -0,0 +1 @@ +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/subdivisions/ca-on.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/subdivisions/ca-on.m3u new file mode 100644 index 0000000000..4686c68f4b --- /dev/null +++ b/tests/__data__/expected/playlist_generate/.gh-pages/subdivisions/ca-on.m3u @@ -0,0 +1,3 @@ +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 From e05896a567e2feaab103d25e2c9d31b7b62facf1 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Tue, 22 Apr 2025 23:30:31 +0300 Subject: [PATCH 22/40] Update tests/__data__ --- .../expected/readme_update/_readme.md | 514 +++++++++--------- .../input/readme_update/.readme/template.md | 316 +++++------ 2 files changed, 415 insertions(+), 415 deletions(-) diff --git a/tests/__data__/expected/readme_update/_readme.md b/tests/__data__/expected/readme_update/_readme.md index 9fc78acc23..67b094c3de 100644 --- a/tests/__data__/expected/readme_update/_readme.md +++ b/tests/__data__/expected/readme_update/_readme.md @@ -1,257 +1,257 @@ -# IPTV [![update](https://github.com/iptv-org/iptv/actions/workflows/update.yml/badge.svg)](https://github.com/iptv-org/iptv/actions/workflows/update.yml) - -Collection of publicly available IPTV (Internet Protocol television) channels from all over the world. - -## Table of contents - -- 🚀 [How to use?](#how-to-use) -- 📺 [Playlists](#playlists) -- 🗄 [Database](#database) -- 👨‍💻 [API](#api) -- 📚 [Resources](#resources) -- 💬 [Discussions](#discussions) -- ❓ [FAQ](#faq) -- 🛠 [Contribution](#contribution) -- ⚖ [Legal](#legal) -- © [License](#license) - -## How to use? - -Simply insert one of the links below into [any video player](https://github.com/iptv-org/awesome-iptv#apps) that supports live streaming and press _Open_. - -![VLC Network Panel](https://github.com/iptv-org/iptv/raw/master/.readme/preview.png) - -## Playlists - -There are several versions of playlists that differ in the way they are grouped. - -### Main playlist - -Playlist includes all known channels except adult channels. - -``` -https://iptv-org.github.io/iptv/index.m3u -``` - -And here is the full version: - -``` -https://iptv-org.github.io/iptv/index.nsfw.m3u -``` - -### Grouped by category - -
-Expand -
- -Playlist in which each channel has its _category_ as a group title: - -``` -https://iptv-org.github.io/iptv/index.category.m3u -``` - -Same thing, but split up into separate files: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CategoryChannelsPlaylist
Animation0https://iptv-org.github.io/iptv/categories/animation.m3u
Auto0https://iptv-org.github.io/iptv/categories/auto.m3u
Business0https://iptv-org.github.io/iptv/categories/business.m3u
Classic0https://iptv-org.github.io/iptv/categories/classic.m3u
Comedy0https://iptv-org.github.io/iptv/categories/comedy.m3u
Cooking0https://iptv-org.github.io/iptv/categories/cooking.m3u
Culture0https://iptv-org.github.io/iptv/categories/culture.m3u
Documentary0https://iptv-org.github.io/iptv/categories/documentary.m3u
Education0https://iptv-org.github.io/iptv/categories/education.m3u
Entertainment0https://iptv-org.github.io/iptv/categories/entertainment.m3u
Family0https://iptv-org.github.io/iptv/categories/family.m3u
General2https://iptv-org.github.io/iptv/categories/general.m3u
Kids0https://iptv-org.github.io/iptv/categories/kids.m3u
Legislative0https://iptv-org.github.io/iptv/categories/legislative.m3u
Lifestyle0https://iptv-org.github.io/iptv/categories/lifestyle.m3u
Movies0https://iptv-org.github.io/iptv/categories/movies.m3u
Music0https://iptv-org.github.io/iptv/categories/music.m3u
News1https://iptv-org.github.io/iptv/categories/news.m3u
Outdoor0https://iptv-org.github.io/iptv/categories/outdoor.m3u
Relax0https://iptv-org.github.io/iptv/categories/relax.m3u
Religious0https://iptv-org.github.io/iptv/categories/religious.m3u
Science0https://iptv-org.github.io/iptv/categories/science.m3u
Series0https://iptv-org.github.io/iptv/categories/series.m3u
Shop0https://iptv-org.github.io/iptv/categories/shop.m3u
Sports0https://iptv-org.github.io/iptv/categories/sports.m3u
Travel0https://iptv-org.github.io/iptv/categories/travel.m3u
Weather1https://iptv-org.github.io/iptv/categories/weather.m3u
XXX1https://iptv-org.github.io/iptv/categories/xxx.m3u
Undefined3https://iptv-org.github.io/iptv/categories/undefined.m3u
- -
- -### Grouped by language - -
-Expand -
- -Playlist in which each channel has its _language_ as a group title: - -``` -https://iptv-org.github.io/iptv/index.language.m3u -``` - -Same thing, but split up into separate files: - - - - - - - - - - - - - -
LanguageChannelsPlaylist
Catalan1https://iptv-org.github.io/iptv/languages/cat.m3u
English1https://iptv-org.github.io/iptv/languages/eng.m3u
French1https://iptv-org.github.io/iptv/languages/fra.m3u
Russian1https://iptv-org.github.io/iptv/languages/rus.m3u
Undefined2https://iptv-org.github.io/iptv/languages/undefined.m3u
- -
- -### Grouped by country - -
-Expand -
- -Playlist in which each channel has its _country_ as a group title: - -``` -https://iptv-org.github.io/iptv/index.country.m3u -``` - -Same thing, but split up into separate files: - - - - - - - - - - - - - - - - - - - - - -
CountryChannelsPlaylist
🇨🇲 Cameroon1https://iptv-org.github.io/iptv/countries/cm.m3u
🇨🇦 Canada2https://iptv-org.github.io/iptv/countries/ca.m3u
      Ontario1https://iptv-org.github.io/iptv/subdivisions/ca-on.m3u
🇨🇻 Cape Verde1https://iptv-org.github.io/iptv/countries/cv.m3u
🇨🇬 Republic of the Congo1https://iptv-org.github.io/iptv/countries/cg.m3u
🇷🇪 Réunion1https://iptv-org.github.io/iptv/countries/re.m3u
🇷🇴 Romania1https://iptv-org.github.io/iptv/countries/ro.m3u
🇷🇺 Russia2https://iptv-org.github.io/iptv/countries/ru.m3u
🇷🇼 Rwanda1https://iptv-org.github.io/iptv/countries/rw.m3u
🇧🇱 Saint Barthélemy1https://iptv-org.github.io/iptv/countries/bl.m3u
🇸🇭 Saint Helena1https://iptv-org.github.io/iptv/countries/sh.m3u
🇰🇳 Saint Kitts and Nevis1https://iptv-org.github.io/iptv/countries/kn.m3u
Undefined2https://iptv-org.github.io/iptv/countries/undefined.m3u
- -
- -### Grouped by region - -
-Expand -
- -Playlist in which each channel has its _region_ as a group title: - -``` -https://iptv-org.github.io/iptv/index.region.m3u -``` - -Same thing, but split up into separate files: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
RegionChannelsPlaylist
Africa0https://iptv-org.github.io/iptv/regions/afr.m3u
Americas1https://iptv-org.github.io/iptv/regions/amer.m3u
Arab world0https://iptv-org.github.io/iptv/regions/arab.m3u
Asia2https://iptv-org.github.io/iptv/regions/asia.m3u
Asia-Pacific1https://iptv-org.github.io/iptv/regions/apac.m3u
Association of Southeast Asian Nations0https://iptv-org.github.io/iptv/regions/asean.m3u
Caribbean0https://iptv-org.github.io/iptv/regions/carib.m3u
Central America0https://iptv-org.github.io/iptv/regions/cenamer.m3u
Central Asia0https://iptv-org.github.io/iptv/regions/cas.m3u
Commonwealth of Independent States1https://iptv-org.github.io/iptv/regions/cis.m3u
Europe3https://iptv-org.github.io/iptv/regions/eur.m3u
Europe, the Middle East and Africa3https://iptv-org.github.io/iptv/regions/emea.m3u
Hispanic America0https://iptv-org.github.io/iptv/regions/hispam.m3u
Latin America0https://iptv-org.github.io/iptv/regions/latam.m3u
Latin America and the Caribbean0https://iptv-org.github.io/iptv/regions/lac.m3u
Maghreb0https://iptv-org.github.io/iptv/regions/maghreb.m3u
Middle East0https://iptv-org.github.io/iptv/regions/mideast.m3u
Middle East and North Africa0https://iptv-org.github.io/iptv/regions/mena.m3u
Nordics0https://iptv-org.github.io/iptv/regions/nord.m3u
North America1https://iptv-org.github.io/iptv/regions/noram.m3u
Northern America1https://iptv-org.github.io/iptv/regions/nam.m3u
Oceania0https://iptv-org.github.io/iptv/regions/oce.m3u
South America0https://iptv-org.github.io/iptv/regions/southam.m3u
South Asia1https://iptv-org.github.io/iptv/regions/sas.m3u
Sub-Saharan Africa0https://iptv-org.github.io/iptv/regions/ssa.m3u
West Africa0https://iptv-org.github.io/iptv/regions/wafr.m3u
Worldwide1https://iptv-org.github.io/iptv/regions/int.m3u
Undefined2https://iptv-org.github.io/iptv/regions/undefined.m3u
- -
- -## Database - -All channel data is taken from the [iptv-org/database](https://github.com/iptv-org/database) repository. If you find any errors please open a new [issue](https://github.com/iptv-org/database/issues) there. - -## API - -The API documentation can be found in the [iptv-org/api](https://github.com/iptv-org/api) repository. - -## Resources - -Links to other useful IPTV-related resources can be found in the [iptv-org/awesome-iptv](https://github.com/iptv-org/awesome-iptv) repository. - -## Discussions - -If you need help finding a channel, have a question or idea, welcome to the [Discussions](https://github.com/orgs/iptv-org/discussions). - -## FAQ - -The answers to the most popular questions can be found in the [FAQ.md](FAQ.md) file. - -## Contribution - -Please make sure to read the [Contributing Guide](CONTRIBUTING.md) before sending an issue or making a pull request. - -And thank you to everyone who has already contributed! - -### Backers - - - -### Contributors - - - -## Legal - -No video files are stored in this repository. The repository simply contains user-submitted links to publicly available video stream URLs, which to the best of our knowledge have been intentionally made publicly by the copyright holders. If any links in these playlists infringe on your rights as a copyright holder, they may be removed by sending a [pull request](https://github.com/iptv-org/iptv/pulls) or opening an [issue](https://github.com/iptv-org/iptv/issues/new?assignees=freearhey&labels=removal+request&template=--removal-request.yml&title=Remove%3A+). However, note that we have **no control** over the destination of the link, and just removing the link from the playlist will not remove its contents from the web. Note that linking does not directly infringe copyright because no copy is made on the site providing the link, and thus this is **not** a valid reason to send a DMCA notice to GitHub. To remove this content from the web, you should contact the web host that's actually hosting the content (**not** GitHub, nor the maintainers of this repository). - -## License - -[![CC0](http://mirrors.creativecommons.org/presskit/buttons/88x31/svg/cc-zero.svg)](LICENSE) +# IPTV [![update](https://github.com/iptv-org/iptv/actions/workflows/update.yml/badge.svg)](https://github.com/iptv-org/iptv/actions/workflows/update.yml) + +Collection of publicly available IPTV (Internet Protocol television) channels from all over the world. + +## Table of contents + +- 🚀 [How to use?](#how-to-use) +- 📺 [Playlists](#playlists) +- 🗄 [Database](#database) +- 👨‍💻 [API](#api) +- 📚 [Resources](#resources) +- 💬 [Discussions](#discussions) +- ❓ [FAQ](#faq) +- 🛠 [Contribution](#contribution) +- ⚖ [Legal](#legal) +- © [License](#license) + +## How to use? + +Simply insert one of the links below into [any video player](https://github.com/iptv-org/awesome-iptv#apps) that supports live streaming and press _Open_. + +![VLC Network Panel](https://github.com/iptv-org/iptv/raw/master/.readme/preview.png) + +## Playlists + +There are several versions of playlists that differ in the way they are grouped. + +### Main playlist + +Playlist includes all known channels except adult channels. + +``` +https://iptv-org.github.io/iptv/index.m3u +``` + +And here is the full version: + +``` +https://iptv-org.github.io/iptv/index.nsfw.m3u +``` + +### Grouped by category + +
+Expand +
+ +Playlist in which each channel has its _category_ as a group title: + +``` +https://iptv-org.github.io/iptv/index.category.m3u +``` + +Same thing, but split up into separate files: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CategoryChannelsPlaylist
Animation0https://iptv-org.github.io/iptv/categories/animation.m3u
Auto0https://iptv-org.github.io/iptv/categories/auto.m3u
Business0https://iptv-org.github.io/iptv/categories/business.m3u
Classic0https://iptv-org.github.io/iptv/categories/classic.m3u
Comedy0https://iptv-org.github.io/iptv/categories/comedy.m3u
Cooking0https://iptv-org.github.io/iptv/categories/cooking.m3u
Culture0https://iptv-org.github.io/iptv/categories/culture.m3u
Documentary0https://iptv-org.github.io/iptv/categories/documentary.m3u
Education0https://iptv-org.github.io/iptv/categories/education.m3u
Entertainment0https://iptv-org.github.io/iptv/categories/entertainment.m3u
Family0https://iptv-org.github.io/iptv/categories/family.m3u
General2https://iptv-org.github.io/iptv/categories/general.m3u
Kids0https://iptv-org.github.io/iptv/categories/kids.m3u
Legislative0https://iptv-org.github.io/iptv/categories/legislative.m3u
Lifestyle0https://iptv-org.github.io/iptv/categories/lifestyle.m3u
Movies0https://iptv-org.github.io/iptv/categories/movies.m3u
Music0https://iptv-org.github.io/iptv/categories/music.m3u
News1https://iptv-org.github.io/iptv/categories/news.m3u
Outdoor0https://iptv-org.github.io/iptv/categories/outdoor.m3u
Relax0https://iptv-org.github.io/iptv/categories/relax.m3u
Religious0https://iptv-org.github.io/iptv/categories/religious.m3u
Science0https://iptv-org.github.io/iptv/categories/science.m3u
Series0https://iptv-org.github.io/iptv/categories/series.m3u
Shop0https://iptv-org.github.io/iptv/categories/shop.m3u
Sports0https://iptv-org.github.io/iptv/categories/sports.m3u
Travel0https://iptv-org.github.io/iptv/categories/travel.m3u
Weather1https://iptv-org.github.io/iptv/categories/weather.m3u
XXX1https://iptv-org.github.io/iptv/categories/xxx.m3u
Undefined3https://iptv-org.github.io/iptv/categories/undefined.m3u
+ +
+ +### Grouped by language + +
+Expand +
+ +Playlist in which each channel has its _language_ as a group title: + +``` +https://iptv-org.github.io/iptv/index.language.m3u +``` + +Same thing, but split up into separate files: + + + + + + + + + + + + + +
LanguageChannelsPlaylist
Catalan1https://iptv-org.github.io/iptv/languages/cat.m3u
English1https://iptv-org.github.io/iptv/languages/eng.m3u
French1https://iptv-org.github.io/iptv/languages/fra.m3u
Russian1https://iptv-org.github.io/iptv/languages/rus.m3u
Undefined2https://iptv-org.github.io/iptv/languages/undefined.m3u
+ +
+ +### Grouped by country + +
+Expand +
+ +Playlist in which each channel has its _country_ as a group title: + +``` +https://iptv-org.github.io/iptv/index.country.m3u +``` + +Same thing, but split up into separate files: + + + + + + + + + + + + + + + + + + + + + +
CountryChannelsPlaylist
🇨🇲 Cameroon1https://iptv-org.github.io/iptv/countries/cm.m3u
🇨🇦 Canada2https://iptv-org.github.io/iptv/countries/ca.m3u
      Ontario1https://iptv-org.github.io/iptv/subdivisions/ca-on.m3u
🇨🇻 Cape Verde1https://iptv-org.github.io/iptv/countries/cv.m3u
🇨🇬 Republic of the Congo1https://iptv-org.github.io/iptv/countries/cg.m3u
🇷🇪 Réunion1https://iptv-org.github.io/iptv/countries/re.m3u
🇷🇴 Romania1https://iptv-org.github.io/iptv/countries/ro.m3u
🇷🇺 Russia2https://iptv-org.github.io/iptv/countries/ru.m3u
🇷🇼 Rwanda1https://iptv-org.github.io/iptv/countries/rw.m3u
🇧🇱 Saint Barthélemy1https://iptv-org.github.io/iptv/countries/bl.m3u
🇸🇭 Saint Helena1https://iptv-org.github.io/iptv/countries/sh.m3u
🇰🇳 Saint Kitts and Nevis1https://iptv-org.github.io/iptv/countries/kn.m3u
Undefined2https://iptv-org.github.io/iptv/countries/undefined.m3u
+ +
+ +### Grouped by region + +
+Expand +
+ +Playlist in which each channel has its _region_ as a group title: + +``` +https://iptv-org.github.io/iptv/index.region.m3u +``` + +Same thing, but split up into separate files: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
RegionChannelsPlaylist
Africa0https://iptv-org.github.io/iptv/regions/afr.m3u
Americas1https://iptv-org.github.io/iptv/regions/amer.m3u
Arab world0https://iptv-org.github.io/iptv/regions/arab.m3u
Asia2https://iptv-org.github.io/iptv/regions/asia.m3u
Asia-Pacific1https://iptv-org.github.io/iptv/regions/apac.m3u
Association of Southeast Asian Nations0https://iptv-org.github.io/iptv/regions/asean.m3u
Caribbean0https://iptv-org.github.io/iptv/regions/carib.m3u
Central America0https://iptv-org.github.io/iptv/regions/cenamer.m3u
Central Asia0https://iptv-org.github.io/iptv/regions/cas.m3u
Commonwealth of Independent States1https://iptv-org.github.io/iptv/regions/cis.m3u
Europe3https://iptv-org.github.io/iptv/regions/eur.m3u
Europe, the Middle East and Africa3https://iptv-org.github.io/iptv/regions/emea.m3u
Hispanic America0https://iptv-org.github.io/iptv/regions/hispam.m3u
Latin America0https://iptv-org.github.io/iptv/regions/latam.m3u
Latin America and the Caribbean0https://iptv-org.github.io/iptv/regions/lac.m3u
Maghreb0https://iptv-org.github.io/iptv/regions/maghreb.m3u
Middle East0https://iptv-org.github.io/iptv/regions/mideast.m3u
Middle East and North Africa0https://iptv-org.github.io/iptv/regions/mena.m3u
Nordics0https://iptv-org.github.io/iptv/regions/nord.m3u
North America1https://iptv-org.github.io/iptv/regions/noram.m3u
Northern America1https://iptv-org.github.io/iptv/regions/nam.m3u
Oceania0https://iptv-org.github.io/iptv/regions/oce.m3u
South America0https://iptv-org.github.io/iptv/regions/southam.m3u
South Asia1https://iptv-org.github.io/iptv/regions/sas.m3u
Sub-Saharan Africa0https://iptv-org.github.io/iptv/regions/ssa.m3u
West Africa0https://iptv-org.github.io/iptv/regions/wafr.m3u
Worldwide1https://iptv-org.github.io/iptv/regions/int.m3u
Undefined2https://iptv-org.github.io/iptv/regions/undefined.m3u
+ +
+ +## Database + +All channel data is taken from the [iptv-org/database](https://github.com/iptv-org/database) repository. If you find any errors please open a new [issue](https://github.com/iptv-org/database/issues) there. + +## API + +The API documentation can be found in the [iptv-org/api](https://github.com/iptv-org/api) repository. + +## Resources + +Links to other useful IPTV-related resources can be found in the [iptv-org/awesome-iptv](https://github.com/iptv-org/awesome-iptv) repository. + +## Discussions + +If you need help finding a channel, have a question or idea, welcome to the [Discussions](https://github.com/orgs/iptv-org/discussions). + +## FAQ + +The answers to the most popular questions can be found in the [FAQ.md](FAQ.md) file. + +## Contribution + +Please make sure to read the [Contributing Guide](CONTRIBUTING.md) before sending an issue or making a pull request. + +And thank you to everyone who has already contributed! + +### Backers + + + +### Contributors + + + +## Legal + +No video files are stored in this repository. The repository simply contains user-submitted links to publicly available video stream URLs, which to the best of our knowledge have been intentionally made publicly by the copyright holders. If any links in these playlists infringe on your rights as a copyright holder, they may be removed by sending a [pull request](https://github.com/iptv-org/iptv/pulls) or opening an [issue](https://github.com/iptv-org/iptv/issues/new?assignees=freearhey&labels=removal+request&template=--removal-request.yml&title=Remove%3A+). However, note that we have **no control** over the destination of the link, and just removing the link from the playlist will not remove its contents from the web. Note that linking does not directly infringe copyright because no copy is made on the site providing the link, and thus this is **not** a valid reason to send a DMCA notice to GitHub. To remove this content from the web, you should contact the web host that's actually hosting the content (**not** GitHub, nor the maintainers of this repository). + +## License + +[![CC0](http://mirrors.creativecommons.org/presskit/buttons/88x31/svg/cc-zero.svg)](LICENSE) diff --git a/tests/__data__/input/readme_update/.readme/template.md b/tests/__data__/input/readme_update/.readme/template.md index 04cab4cd5e..4883a98e4f 100644 --- a/tests/__data__/input/readme_update/.readme/template.md +++ b/tests/__data__/input/readme_update/.readme/template.md @@ -1,158 +1,158 @@ -# IPTV [![update](https://github.com/iptv-org/iptv/actions/workflows/update.yml/badge.svg)](https://github.com/iptv-org/iptv/actions/workflows/update.yml) - -Collection of publicly available IPTV (Internet Protocol television) channels from all over the world. - -## Table of contents - -- 🚀 [How to use?](#how-to-use) -- 📺 [Playlists](#playlists) -- 🗄 [Database](#database) -- 👨‍💻 [API](#api) -- 📚 [Resources](#resources) -- 💬 [Discussions](#discussions) -- ❓ [FAQ](#faq) -- 🛠 [Contribution](#contribution) -- ⚖ [Legal](#legal) -- © [License](#license) - -## How to use? - -Simply insert one of the links below into [any video player](https://github.com/iptv-org/awesome-iptv#apps) that supports live streaming and press _Open_. - -![VLC Network Panel](https://github.com/iptv-org/iptv/raw/master/.readme/preview.png) - -## Playlists - -There are several versions of playlists that differ in the way they are grouped. - -### Main playlist - -Playlist includes all known channels except adult channels. - -``` -https://iptv-org.github.io/iptv/index.m3u -``` - -And here is the full version: - -``` -https://iptv-org.github.io/iptv/index.nsfw.m3u -``` - -### Grouped by category - -
-Expand -
- -Playlist in which each channel has its _category_ as a group title: - -``` -https://iptv-org.github.io/iptv/index.category.m3u -``` - -Same thing, but split up into separate files: - - -#include "tests/__data__/output/.readme/_categories.md" - -
- -### Grouped by language - -
-Expand -
- -Playlist in which each channel has its _language_ as a group title: - -``` -https://iptv-org.github.io/iptv/index.language.m3u -``` - -Same thing, but split up into separate files: - - -#include "tests/__data__/output/.readme/_languages.md" - -
- -### Grouped by country - -
-Expand -
- -Playlist in which each channel has its _country_ as a group title: - -``` -https://iptv-org.github.io/iptv/index.country.m3u -``` - -Same thing, but split up into separate files: - - -#include "tests/__data__/output/.readme/_countries.md" - -
- -### Grouped by region - -
-Expand -
- -Playlist in which each channel has its _region_ as a group title: - -``` -https://iptv-org.github.io/iptv/index.region.m3u -``` - -Same thing, but split up into separate files: - - -#include "tests/__data__/output/.readme/_regions.md" - -
- -## Database - -All channel data is taken from the [iptv-org/database](https://github.com/iptv-org/database) repository. If you find any errors please open a new [issue](https://github.com/iptv-org/database/issues) there. - -## API - -The API documentation can be found in the [iptv-org/api](https://github.com/iptv-org/api) repository. - -## Resources - -Links to other useful IPTV-related resources can be found in the [iptv-org/awesome-iptv](https://github.com/iptv-org/awesome-iptv) repository. - -## Discussions - -If you need help finding a channel, have a question or idea, welcome to the [Discussions](https://github.com/orgs/iptv-org/discussions). - -## FAQ - -The answers to the most popular questions can be found in the [FAQ.md](FAQ.md) file. - -## Contribution - -Please make sure to read the [Contributing Guide](CONTRIBUTING.md) before sending an issue or making a pull request. - -And thank you to everyone who has already contributed! - -### Backers - - - -### Contributors - - - -## Legal - -No video files are stored in this repository. The repository simply contains user-submitted links to publicly available video stream URLs, which to the best of our knowledge have been intentionally made publicly by the copyright holders. If any links in these playlists infringe on your rights as a copyright holder, they may be removed by sending a [pull request](https://github.com/iptv-org/iptv/pulls) or opening an [issue](https://github.com/iptv-org/iptv/issues/new?assignees=freearhey&labels=removal+request&template=--removal-request.yml&title=Remove%3A+). However, note that we have **no control** over the destination of the link, and just removing the link from the playlist will not remove its contents from the web. Note that linking does not directly infringe copyright because no copy is made on the site providing the link, and thus this is **not** a valid reason to send a DMCA notice to GitHub. To remove this content from the web, you should contact the web host that's actually hosting the content (**not** GitHub, nor the maintainers of this repository). - -## License - -[![CC0](http://mirrors.creativecommons.org/presskit/buttons/88x31/svg/cc-zero.svg)](LICENSE) +# IPTV [![update](https://github.com/iptv-org/iptv/actions/workflows/update.yml/badge.svg)](https://github.com/iptv-org/iptv/actions/workflows/update.yml) + +Collection of publicly available IPTV (Internet Protocol television) channels from all over the world. + +## Table of contents + +- 🚀 [How to use?](#how-to-use) +- 📺 [Playlists](#playlists) +- 🗄 [Database](#database) +- 👨‍💻 [API](#api) +- 📚 [Resources](#resources) +- 💬 [Discussions](#discussions) +- ❓ [FAQ](#faq) +- 🛠 [Contribution](#contribution) +- ⚖ [Legal](#legal) +- © [License](#license) + +## How to use? + +Simply insert one of the links below into [any video player](https://github.com/iptv-org/awesome-iptv#apps) that supports live streaming and press _Open_. + +![VLC Network Panel](https://github.com/iptv-org/iptv/raw/master/.readme/preview.png) + +## Playlists + +There are several versions of playlists that differ in the way they are grouped. + +### Main playlist + +Playlist includes all known channels except adult channels. + +``` +https://iptv-org.github.io/iptv/index.m3u +``` + +And here is the full version: + +``` +https://iptv-org.github.io/iptv/index.nsfw.m3u +``` + +### Grouped by category + +
+Expand +
+ +Playlist in which each channel has its _category_ as a group title: + +``` +https://iptv-org.github.io/iptv/index.category.m3u +``` + +Same thing, but split up into separate files: + + +#include "tests/__data__/output/.readme/_categories.md" + +
+ +### Grouped by language + +
+Expand +
+ +Playlist in which each channel has its _language_ as a group title: + +``` +https://iptv-org.github.io/iptv/index.language.m3u +``` + +Same thing, but split up into separate files: + + +#include "tests/__data__/output/.readme/_languages.md" + +
+ +### Grouped by country + +
+Expand +
+ +Playlist in which each channel has its _country_ as a group title: + +``` +https://iptv-org.github.io/iptv/index.country.m3u +``` + +Same thing, but split up into separate files: + + +#include "tests/__data__/output/.readme/_countries.md" + +
+ +### Grouped by region + +
+Expand +
+ +Playlist in which each channel has its _region_ as a group title: + +``` +https://iptv-org.github.io/iptv/index.region.m3u +``` + +Same thing, but split up into separate files: + + +#include "tests/__data__/output/.readme/_regions.md" + +
+ +## Database + +All channel data is taken from the [iptv-org/database](https://github.com/iptv-org/database) repository. If you find any errors please open a new [issue](https://github.com/iptv-org/database/issues) there. + +## API + +The API documentation can be found in the [iptv-org/api](https://github.com/iptv-org/api) repository. + +## Resources + +Links to other useful IPTV-related resources can be found in the [iptv-org/awesome-iptv](https://github.com/iptv-org/awesome-iptv) repository. + +## Discussions + +If you need help finding a channel, have a question or idea, welcome to the [Discussions](https://github.com/orgs/iptv-org/discussions). + +## FAQ + +The answers to the most popular questions can be found in the [FAQ.md](FAQ.md) file. + +## Contribution + +Please make sure to read the [Contributing Guide](CONTRIBUTING.md) before sending an issue or making a pull request. + +And thank you to everyone who has already contributed! + +### Backers + + + +### Contributors + + + +## Legal + +No video files are stored in this repository. The repository simply contains user-submitted links to publicly available video stream URLs, which to the best of our knowledge have been intentionally made publicly by the copyright holders. If any links in these playlists infringe on your rights as a copyright holder, they may be removed by sending a [pull request](https://github.com/iptv-org/iptv/pulls) or opening an [issue](https://github.com/iptv-org/iptv/issues/new?assignees=freearhey&labels=removal+request&template=--removal-request.yml&title=Remove%3A+). However, note that we have **no control** over the destination of the link, and just removing the link from the playlist will not remove its contents from the web. Note that linking does not directly infringe copyright because no copy is made on the site providing the link, and thus this is **not** a valid reason to send a DMCA notice to GitHub. To remove this content from the web, you should contact the web host that's actually hosting the content (**not** GitHub, nor the maintainers of this repository). + +## License + +[![CC0](http://mirrors.creativecommons.org/presskit/buttons/88x31/svg/cc-zero.svg)](LICENSE) From 66136e051cafbbe14c861232d9ebe8a03ba094df Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Tue, 22 Apr 2025 23:30:34 +0300 Subject: [PATCH 23/40] Update htmlTable.ts --- scripts/core/htmlTable.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/core/htmlTable.ts b/scripts/core/htmlTable.ts index 1caa85fa0c..b4f7b42ac6 100644 --- a/scripts/core/htmlTable.ts +++ b/scripts/core/htmlTable.ts @@ -16,15 +16,15 @@ export class HTMLTable { } toString() { - let output = '\n' + let output = '
\r\n' - output += ' \n ' + output += ' \r\n ' for (const column of this.columns) { output += `` } - output += '\n \n' + output += '\r\n \r\n' - output += ' \n' + output += ' \r\n' for (const item of this.data) { output += ' ' let i = 0 @@ -35,9 +35,9 @@ export class HTMLTable { output += `${item[prop]}` i++ } - output += '\n' + output += '\r\n' } - output += ' \n' + output += ' \r\n' output += '
${column.name}
' From 0e5a3bdfbccf006adea043854762cf9888e012a6 Mon Sep 17 00:00:00 2001 From: "iptv-bot[bot]" <84861620+iptv-bot[bot]@users.noreply.github.com> Date: Wed, 23 Apr 2025 00:11:23 +0000 Subject: [PATCH 24/40] [Bot] Update /streams Committed by [iptv-bot](https://github.com/apps/iptv-bot) via [update](https://github.com/iptv-org/iptv/actions/runs/14607007919) workflow. closes #21276, closes #21267, closes #21319, closes #21317, closes #21315, closes #21313 --- streams/ar.m3u | 2 ++ streams/cl.m3u | 2 ++ streams/co.m3u | 2 ++ streams/hu.m3u | 2 ++ streams/it.m3u | 2 -- streams/us_samsung.m3u | 4 ---- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/streams/ar.m3u b/streams/ar.m3u index b051df2b51..efb5707482 100644 --- a/streams/ar.m3u +++ b/streams/ar.m3u @@ -368,3 +368,5 @@ https://stmv1.cnarlatam.com/xtremaseries/xtremaseries/playlist.m3u8 #EXTINF:-1 tvg-id="XtremaTerror.ar" http-referrer="https://xtrematv.com/?p=1456",Xtrema Terror #EXTVLCOPT:http-referrer=https://xtrematv.com/?p=1456 https://stmv6.voxtvhd.com.br/cineterror/cineterror/playlist.m3u8 +#EXTINF:-1 tvg-id="RetroMagico.ar",Retro Magico (720p) +https://stream.gia.tv/giatv/giatv-retromagico/retromagico/playlist.m3u8 diff --git a/streams/cl.m3u b/streams/cl.m3u index 7f2b3b1736..0464629b71 100644 --- a/streams/cl.m3u +++ b/streams/cl.m3u @@ -456,3 +456,5 @@ https://xui-backend.energeek.cl/live/deM0kanADeweB/Cerq7EpWHiWDuHTJ8ikz/13.m3u8 #EXTINF:-1 tvg-id="VisionPlusTV.cl" http-referrer="https://visionplustv.cl/",Vision Plus TV (1080i) #EXTVLCOPT:http-referrer=https://visionplustv.cl/ https://5ff3d9babae13.streamlock.net/jwagpqxehu/jwagpqxehu/playlist.m3u8 +#EXTINF:-1 tvg-id="Nublevision.cl",Nublevision (720p) +https://tv.arkeo.cl:1936/nublevision/nublevision/playlist.m3u8 diff --git a/streams/co.m3u b/streams/co.m3u index c3a7706d59..52f9c14f9f 100644 --- a/streams/co.m3u +++ b/streams/co.m3u @@ -330,3 +330,5 @@ https://ssh101stream.ssh101.com/akamaissh101/ssh101/multicanal/playlist.m3u8 https://play.cdn.enetres.net/6E5C615AA5FF4123ACAF0DAB57B7B8DC021/022/playlist.m3u8 #EXTINF:-1 tvg-id="NSTV.co",NSTV (720p) https://cp.panelchs.com:1936/8038/8038/playlist.m3u8 +#EXTINF:-1 tvg-id="NSTV.co",NSTV (720p) +http://138.186.23.7:22281/nstv/nstv/playlist.m3u8 diff --git a/streams/hu.m3u b/streams/hu.m3u index 4711e943bf..f7582ade58 100644 --- a/streams/hu.m3u +++ b/streams/hu.m3u @@ -261,3 +261,5 @@ https://cloudfront44.lexanetwork.com:1344/relay01/HDE051.sdp/playlist.m3u8 https://cloudfront44.lexanetwork.com:1344/freerelay/zegtv.sdp/playlist.m3u8 #EXTINF:-1 tvg-id="ZugloTV.hu",Zuglo TV (360p) https://cloudfront44.lexanetwork.com:1344/freerelay/zuglotv.sdp/playlist.m3u8 +#EXTINF:-1 tvg-id="AXNSpin.hu@Poland",AXN Spin Poland (1080i) +http://nowatv.stream2.link:8080/live/64%3A1c%3Ab0%3Aa1%3A48%3Ac1/tfAjswfz6H/0577b50c-92ca-49bc-a769-48203eb96bfd.ts diff --git a/streams/it.m3u b/streams/it.m3u index d62df232ba..03e6e6ed0b 100644 --- a/streams/it.m3u +++ b/streams/it.m3u @@ -461,8 +461,6 @@ https://59d7d6f47d7fc.streamlock.net/supertv/supertv/playlist.m3u8 http://wms.shared.streamshow.it:1935/supertv/supertv/live.m3u8 #EXTINF:-1 tvg-id="SuperTVOristano.it",Super TV Oristano (720p) [Not 24/7] http://193.70.81.40:1935/supertvoristano/supertvoristano/playlist.m3u8 -#EXTINF:-1 tvg-id="Super.it",Super! (480p) -https://vimnitaly.akamaized.net/hls/live/2094034/super/master-2500.m3u8 #EXTINF:-1 tvg-id="SuperSix.it",SuperSix Lombardia (720p) https://5db313b643fd8.streamlock.net/SUPERSIXLombardia/SUPERSIXLombardia/playlist.m3u8 #EXTINF:-1 tvg-id="SuperTennisHD.it",SuperTennis HD diff --git a/streams/us_samsung.m3u b/streams/us_samsung.m3u index d3ee5b96d2..f9129d92b3 100644 --- a/streams/us_samsung.m3u +++ b/streams/us_samsung.m3u @@ -11,10 +11,6 @@ https://bonappetit-samsung.amagi.tv/playlist.m3u8 https://d37v4ie0vq884e.cloudfront.net/v1/master/3722c60a815c199d9c0ef36c5b73da68a62b09d1/cc-ujoygpbfraxho/bounce_xl.m3u8 #EXTINF:-1 tvg-id="BratTV.us",Brat TV (1080p) https://brat-samsung-us.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="Buzzr.us",Buzzr (1080p) -https://buzzr-samsungus.amagi.tv/playlist.m3u8 -#EXTINF:-1 tvg-id="Buzzr.us",Buzzr (1080p) -https://cdn-ue1-prod.tsv2.amagi.tv/linear/samsungus-buzzr-samsungtv-us/playlist.m3u8 #EXTINF:-1 tvg-id="Circle.us",Circle (1080p) https://circle-samsung.amagi.tv/playlist.m3u8 #EXTINF:-1 tvg-id="Crime360.us",Crime 360 (720p) From 6498c221585b88cc3edc4a2ab0c2d9465a97adb8 Mon Sep 17 00:00:00 2001 From: "iptv-bot[bot]" <84861620+iptv-bot[bot]@users.noreply.github.com> Date: Wed, 23 Apr 2025 00:11:23 +0000 Subject: [PATCH 25/40] [Bot] Update README.md Committed by [iptv-bot](https://github.com/apps/iptv-bot) via [update](https://github.com/iptv-org/iptv/actions/runs/14607007919) workflow. --- README.md | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 62760f012d..547810ecff 100644 --- a/README.md +++ b/README.md @@ -63,9 +63,9 @@ Same thing, but split up into separate files: Culture167https://iptv-org.github.io/iptv/categories/culture.m3u Documentary78https://iptv-org.github.io/iptv/categories/documentary.m3u Education150https://iptv-org.github.io/iptv/categories/education.m3u - Entertainment542https://iptv-org.github.io/iptv/categories/entertainment.m3u + Entertainment543https://iptv-org.github.io/iptv/categories/entertainment.m3u Family35https://iptv-org.github.io/iptv/categories/family.m3u - General2343https://iptv-org.github.io/iptv/categories/general.m3u + General2344https://iptv-org.github.io/iptv/categories/general.m3u Kids174https://iptv-org.github.io/iptv/categories/kids.m3u Legislative192https://iptv-org.github.io/iptv/categories/legislative.m3u Lifestyle77https://iptv-org.github.io/iptv/categories/lifestyle.m3u @@ -115,7 +115,7 @@ Same thing, but split up into separate files: Albanian46https://iptv-org.github.io/iptv/languages/sqi.m3u Alur1https://iptv-org.github.io/iptv/languages/alz.m3u Amharic7https://iptv-org.github.io/iptv/languages/amh.m3u - Arabic393https://iptv-org.github.io/iptv/languages/ara.m3u + Arabic392https://iptv-org.github.io/iptv/languages/ara.m3u Armenian25https://iptv-org.github.io/iptv/languages/hye.m3u Assamese7https://iptv-org.github.io/iptv/languages/asm.m3u Assyrian Neo-Aramaic1https://iptv-org.github.io/iptv/languages/aii.m3u @@ -235,7 +235,7 @@ Same thing, but split up into separate files: Parsi-Dari3https://iptv-org.github.io/iptv/languages/prd.m3u Pashto16https://iptv-org.github.io/iptv/languages/pus.m3u Persian139https://iptv-org.github.io/iptv/languages/fas.m3u - Polish140https://iptv-org.github.io/iptv/languages/pol.m3u + Polish141https://iptv-org.github.io/iptv/languages/pol.m3u Portuguese337https://iptv-org.github.io/iptv/languages/por.m3u Pulaar1https://iptv-org.github.io/iptv/languages/fuc.m3u Quechua1https://iptv-org.github.io/iptv/languages/que.m3u @@ -286,7 +286,7 @@ Same thing, but split up into separate files: Yucatec Maya1https://iptv-org.github.io/iptv/languages/yua.m3u Yue Chinese5https://iptv-org.github.io/iptv/languages/yue.m3u Zarma1https://iptv-org.github.io/iptv/languages/dje.m3u - Undefined2878https://iptv-org.github.io/iptv/languages/undefined.m3u + Undefined2880https://iptv-org.github.io/iptv/languages/undefined.m3u @@ -320,7 +320,7 @@ Same thing, but split up into separate files: 🇦🇴 Angola27https://iptv-org.github.io/iptv/countries/ao.m3u 🇦🇮 Anguilla12https://iptv-org.github.io/iptv/countries/ai.m3u 🇦🇬 Antigua and Barbuda13https://iptv-org.github.io/iptv/countries/ag.m3u - 🇦🇷 Argentina223https://iptv-org.github.io/iptv/countries/ar.m3u + 🇦🇷 Argentina224https://iptv-org.github.io/iptv/countries/ar.m3u       Buenos Aires18https://iptv-org.github.io/iptv/subdivisions/ar-b.m3u       Catamarca1https://iptv-org.github.io/iptv/subdivisions/ar-k.m3u       Chaco3https://iptv-org.github.io/iptv/subdivisions/ar-h.m3u @@ -667,9 +667,9 @@ Same thing, but split up into separate files:       Ucayali2https://iptv-org.github.io/iptv/subdivisions/pe-uca.m3u 🇵🇭 Philippines26https://iptv-org.github.io/iptv/countries/ph.m3u 🇵🇳 Pitcairn Islands5https://iptv-org.github.io/iptv/countries/pn.m3u - 🇵🇱 Poland180https://iptv-org.github.io/iptv/countries/pl.m3u + 🇵🇱 Poland181https://iptv-org.github.io/iptv/countries/pl.m3u 🇵🇹 Portugal83https://iptv-org.github.io/iptv/countries/pt.m3u - 🇵🇷 Puerto Rico100https://iptv-org.github.io/iptv/countries/pr.m3u + 🇵🇷 Puerto Rico99https://iptv-org.github.io/iptv/countries/pr.m3u 🇶🇦 Qatar54https://iptv-org.github.io/iptv/countries/qa.m3u 🇨🇬 Republic of the Congo33https://iptv-org.github.io/iptv/countries/cg.m3u       Brazzaville1https://iptv-org.github.io/iptv/subdivisions/cg-bzv.m3u @@ -750,7 +750,7 @@ Same thing, but split up into separate files: 🇹🇴 Tonga5https://iptv-org.github.io/iptv/countries/to.m3u 🇹🇹 Trinidad and Tobago18https://iptv-org.github.io/iptv/countries/tt.m3u 🇹🇳 Tunisia66https://iptv-org.github.io/iptv/countries/tn.m3u - 🇹🇷 Turkey281https://iptv-org.github.io/iptv/countries/tr.m3u + 🇹🇷 Turkey280https://iptv-org.github.io/iptv/countries/tr.m3u 🇹🇲 Turkmenistan16https://iptv-org.github.io/iptv/countries/tm.m3u 🇹🇨 Turks and Caicos Islands12https://iptv-org.github.io/iptv/countries/tc.m3u 🇹🇻 Tuvalu5https://iptv-org.github.io/iptv/countries/tv.m3u @@ -820,7 +820,7 @@ Same thing, but split up into separate files: 🇾🇪 Yemen46https://iptv-org.github.io/iptv/countries/ye.m3u 🇿🇲 Zambia24https://iptv-org.github.io/iptv/countries/zm.m3u 🇿🇼 Zimbabwe24https://iptv-org.github.io/iptv/countries/zw.m3u - Undefined2878https://iptv-org.github.io/iptv/countries/undefined.m3u + Undefined2880https://iptv-org.github.io/iptv/countries/undefined.m3u @@ -849,39 +849,39 @@ Same thing, but split up into separate files: Africa542https://iptv-org.github.io/iptv/regions/afr.m3u Americas3603https://iptv-org.github.io/iptv/regions/amer.m3u Arab world403https://iptv-org.github.io/iptv/regions/arab.m3u - Asia2143https://iptv-org.github.io/iptv/regions/asia.m3u + Asia2142https://iptv-org.github.io/iptv/regions/asia.m3u Asia-Pacific1134https://iptv-org.github.io/iptv/regions/apac.m3u Association of Southeast Asian Nations347https://iptv-org.github.io/iptv/regions/asean.m3u - Balkan690https://iptv-org.github.io/iptv/regions/balkan.m3u + Balkan689https://iptv-org.github.io/iptv/regions/balkan.m3u Benelux240https://iptv-org.github.io/iptv/regions/benelux.m3u - Caribbean367https://iptv-org.github.io/iptv/regions/carib.m3u + Caribbean366https://iptv-org.github.io/iptv/regions/carib.m3u Central America373https://iptv-org.github.io/iptv/regions/cenamer.m3u - Central and Eastern Europe975https://iptv-org.github.io/iptv/regions/cee.m3u + Central and Eastern Europe976https://iptv-org.github.io/iptv/regions/cee.m3u Central Asia109https://iptv-org.github.io/iptv/regions/cas.m3u Commonwealth of Independent States354https://iptv-org.github.io/iptv/regions/cis.m3u Europe2841https://iptv-org.github.io/iptv/regions/eur.m3u Europe, the Middle East and Africa3750https://iptv-org.github.io/iptv/regions/emea.m3u - European Union1938https://iptv-org.github.io/iptv/regions/eu.m3u + European Union1939https://iptv-org.github.io/iptv/regions/eu.m3u Hispanic America1682https://iptv-org.github.io/iptv/regions/hispam.m3u Latin America1999https://iptv-org.github.io/iptv/regions/latam.m3u Latin America and the Caribbean2043https://iptv-org.github.io/iptv/regions/lac.m3u Maghreb90https://iptv-org.github.io/iptv/regions/maghreb.m3u - Middle East809https://iptv-org.github.io/iptv/regions/mideast.m3u - Middle East and North Africa838https://iptv-org.github.io/iptv/regions/mena.m3u + Middle East808https://iptv-org.github.io/iptv/regions/mideast.m3u + Middle East and North Africa837https://iptv-org.github.io/iptv/regions/mena.m3u Nordics111https://iptv-org.github.io/iptv/regions/nord.m3u - North America2422https://iptv-org.github.io/iptv/regions/noram.m3u + North America2421https://iptv-org.github.io/iptv/regions/noram.m3u Northern America1582https://iptv-org.github.io/iptv/regions/nam.m3u Northern Europe147https://iptv-org.github.io/iptv/regions/neur.m3u Oceania56https://iptv-org.github.io/iptv/regions/oce.m3u - South America1261https://iptv-org.github.io/iptv/regions/southam.m3u + South America1262https://iptv-org.github.io/iptv/regions/southam.m3u South Asia408https://iptv-org.github.io/iptv/regions/sas.m3u Southeast Asia347https://iptv-org.github.io/iptv/regions/sea.m3u - Southern Europe1059https://iptv-org.github.io/iptv/regions/ser.m3u + Southern Europe1058https://iptv-org.github.io/iptv/regions/ser.m3u Sub-Saharan Africa487https://iptv-org.github.io/iptv/regions/ssa.m3u West Africa249https://iptv-org.github.io/iptv/regions/wafr.m3u Western Europe783https://iptv-org.github.io/iptv/regions/wer.m3u Worldwide57https://iptv-org.github.io/iptv/regions/int.m3u - Undefined2878https://iptv-org.github.io/iptv/regions/undefined.m3u + Undefined2880https://iptv-org.github.io/iptv/regions/undefined.m3u From a5ebe89004f4e96ef8bee97d1983701cc68b6279 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 23 Apr 2025 05:19:55 +0300 Subject: [PATCH 26/40] Update tests/__data__ --- .../expected/api_generate/.api/streams.json | 112 +++++++++--------- .../__data__/expected/playlist_format/in.m3u | 6 +- .../__data__/expected/playlist_format/nl.m3u | 22 ++-- .../.gh-pages/categories/general.m3u | 14 +-- .../.gh-pages/categories/legislative.m3u | 2 +- .../.gh-pages/categories/news.m3u | 6 +- .../.gh-pages/categories/undefined.m3u | 30 ++--- .../.gh-pages/categories/weather.m3u | 6 +- .../.gh-pages/categories/xxx.m3u | 6 +- .../.gh-pages/countries/ad.m3u | 6 +- .../.gh-pages/countries/ca.m3u | 6 +- .../.gh-pages/countries/ru.m3u | 6 +- .../.gh-pages/countries/undefined.m3u | 22 ++-- .../.gh-pages/index.category.m3u | 50 ++++---- .../.gh-pages/index.country.m3u | 62 +++++----- .../.gh-pages/index.language.m3u | 46 +++---- .../playlist_generate/.gh-pages/index.m3u | 46 +++---- .../.gh-pages/index.region.m3u | 86 +++++++------- .../.gh-pages/languages/eng.m3u | 6 +- .../.gh-pages/languages/rus.m3u | 6 +- .../.gh-pages/languages/undefined.m3u | 34 +++--- .../.gh-pages/regions/afr.m3u | 2 +- .../.gh-pages/regions/amer.m3u | 6 +- .../.gh-pages/regions/apac.m3u | 2 +- .../.gh-pages/regions/arab.m3u | 2 +- .../.gh-pages/regions/asia.m3u | 10 +- .../.gh-pages/regions/carib.m3u | 2 +- .../.gh-pages/regions/cas.m3u | 6 +- .../.gh-pages/regions/cis.m3u | 10 +- .../.gh-pages/regions/emea.m3u | 14 +-- .../.gh-pages/regions/eur.m3u | 14 +-- .../.gh-pages/regions/hispam.m3u | 2 +- .../.gh-pages/regions/int.m3u | 10 +- .../.gh-pages/regions/lac.m3u | 2 +- .../.gh-pages/regions/latam.m3u | 2 +- .../.gh-pages/regions/maghreb.m3u | 2 +- .../.gh-pages/regions/mena.m3u | 2 +- .../.gh-pages/regions/mideast.m3u | 2 +- .../.gh-pages/regions/nam.m3u | 6 +- .../.gh-pages/regions/noram.m3u | 6 +- .../.gh-pages/regions/nord.m3u | 2 +- .../.gh-pages/regions/oce.m3u | 2 +- .../.gh-pages/regions/sas.m3u | 2 +- .../.gh-pages/regions/ssa.m3u | 2 +- .../.gh-pages/regions/undefined.m3u | 22 ++-- .../.gh-pages/regions/wafr.m3u | 2 +- .../.gh-pages/subdivisions/ca-on.m3u | 6 +- .../__data__/expected/playlist_update/cy.m3u | 6 +- .../__data__/expected/playlist_update/fr.m3u | 10 +- .../__data__/expected/playlist_update/uk.m3u | 14 +-- .../__data__/expected/playlist_update/us.m3u | 12 +- tests/__data__/input/api_generate/ad.m3u | 10 +- tests/__data__/input/api_generate/ca.m3u | 6 +- tests/__data__/input/api_generate/in.m3u | 6 +- tests/__data__/input/api_generate/uk.m3u | 6 +- .../__data__/input/api_generate/unsorted.m3u | 18 +-- .../__data__/input/playlist_edit/playlist.m3u | 8 +- tests/__data__/input/playlist_format/in.m3u | 6 +- tests/__data__/input/playlist_format/nl.m3u | 26 ++-- tests/__data__/input/playlist_generate/ad.m3u | 18 +-- tests/__data__/input/playlist_generate/ca.m3u | 6 +- tests/__data__/input/playlist_generate/in.m3u | 6 +- tests/__data__/input/playlist_generate/kg.m3u | 6 +- tests/__data__/input/playlist_generate/uk.m3u | 6 +- .../input/playlist_generate/unsorted.m3u | 22 ++-- tests/__data__/input/playlist_test/ag.m3u | 8 +- tests/__data__/input/playlist_update/br.m3u | 12 +- tests/__data__/input/playlist_update/cy.m3u | 14 +-- tests/__data__/input/playlist_update/uk.m3u | 10 +- .../input/playlist_validate/us_blocked.m3u | 14 +-- .../input/playlist_validate/wrong_id.m3u | 6 +- tests/__data__/input/report_create/br.m3u | 12 +- tests/__data__/input/report_create/cy.m3u | 10 +- tests/__data__/input/report_create/uk.m3u | 10 +- tests/__data__/input/report_create/us.m3u | 6 +- 75 files changed, 507 insertions(+), 507 deletions(-) diff --git a/tests/__data__/expected/api_generate/.api/streams.json b/tests/__data__/expected/api_generate/.api/streams.json index b85871048b..55128bca36 100644 --- a/tests/__data__/expected/api_generate/.api/streams.json +++ b/tests/__data__/expected/api_generate/.api/streams.json @@ -1,57 +1,57 @@ -[ - { - "channel": null, - "feed": null, - "url": "http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8", - "referrer": null, - "user_agent": null - }, - { - "channel": null, - "feed": null, - "url": "http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8", - "referrer": "http://imn.iq", - "user_agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" - }, - { - "channel": "AndorraTV.ad", - "feed": "SD", - "url": "https://iptv-all.lanesh4d0w.repl.co/andorra/atv", - "referrer": null, - "user_agent": null - }, - { - "channel": "BBCNews.uk", - "url": "http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8", - "referrer": null, - "user_agent": null - }, - { - "channel": "LDPRTV.ru", - "feed": null, - "url": "http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8", - "referrer": null, - "user_agent": null - }, - { - "channel": "MeteoMedia.ca", - "feed": null, - "url": "http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8", - "referrer": null, - "user_agent": null - }, - { - "channel": "VisitXTV.nl", - "feed": null, - "url": "https://stream.visit-x.tv/vxtv/ngrp:live_all/30fps.m3u8", - "referrer": null, - "user_agent": null - }, - { - "channel": "Zoo.ad", - "feed": null, - "url": "https://iptv-all.lanesh4d0w.repl.co/andorra/zoo", - "referrer": null, - "user_agent": null - } +[ + { + "channel": null, + "feed": null, + "url": "http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8", + "referrer": null, + "user_agent": null + }, + { + "channel": null, + "feed": null, + "url": "http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8", + "referrer": "http://imn.iq", + "user_agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" + }, + { + "channel": "AndorraTV.ad", + "feed": "SD", + "url": "https://iptv-all.lanesh4d0w.repl.co/andorra/atv", + "referrer": null, + "user_agent": null + }, + { + "channel": "BBCNews.uk", + "url": "http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8", + "referrer": null, + "user_agent": null + }, + { + "channel": "LDPRTV.ru", + "feed": null, + "url": "http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8", + "referrer": null, + "user_agent": null + }, + { + "channel": "MeteoMedia.ca", + "feed": null, + "url": "http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8", + "referrer": null, + "user_agent": null + }, + { + "channel": "VisitXTV.nl", + "feed": null, + "url": "https://stream.visit-x.tv/vxtv/ngrp:live_all/30fps.m3u8", + "referrer": null, + "user_agent": null + }, + { + "channel": "Zoo.ad", + "feed": null, + "url": "https://iptv-all.lanesh4d0w.repl.co/andorra/zoo", + "referrer": null, + "user_agent": null + } ] \ No newline at end of file diff --git a/tests/__data__/expected/playlist_format/in.m3u b/tests/__data__/expected/playlist_format/in.m3u index 44a00ace12..2615da4e4c 100644 --- a/tests/__data__/expected/playlist_format/in.m3u +++ b/tests/__data__/expected/playlist_format/in.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="",Manorama News -2 [U3] (480p) [Geo-blocked] [Not 24/7] -https://ythls.onrender.com/channel/UCP0uG-mcMImgKnJz-VjJZmQ.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="",Manorama News -2 [U3] (480p) [Geo-blocked] [Not 24/7] +https://ythls.onrender.com/channel/UCP0uG-mcMImgKnJz-VjJZmQ.m3u8 diff --git a/tests/__data__/expected/playlist_format/nl.m3u b/tests/__data__/expected/playlist_format/nl.m3u index 8f1e0ba2ac..d08a2ac80c 100644 --- a/tests/__data__/expected/playlist_format/nl.m3u +++ b/tests/__data__/expected/playlist_format/nl.m3u @@ -1,11 +1,11 @@ -#EXTM3U -#EXTINF:-1 tvg-id="NPO1.nl@SD",NPO 1 (342p) [Geo-blocked] -http://resolver.streaming.api.nos.nl/livestream?url=/live/npo/tvlive/npo1/npo1.isml/.m3u8 -#EXTINF:-1 tvg-id="NPO2.nl",NPO 2 (342p) -http://resolver.streaming.api.nos.nl/livestream?url=/live/npo/tvlive/npo2/npo2.isml/.m3u8 -#EXTINF:-1 tvg-id="NPO2.nl" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",NPO 2 (302p) [Geo-blocked] -#EXTVLCOPT:http-referrer=http://imn.iq -#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 -http://stream.tvtap.net:8081/live/nl-npo2.stream/playlist.m3u8 -#EXTINF:-1 tvg-id="NPO2.nl",NPO 2 [Geo-blocked] -http://resolver.streaming.api.nos.nl/livestream?url=/live/npo/tvlive/npo2/npo22.isml/.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="NPO1.nl@SD",NPO 1 (342p) [Geo-blocked] +http://resolver.streaming.api.nos.nl/livestream?url=/live/npo/tvlive/npo1/npo1.isml/.m3u8 +#EXTINF:-1 tvg-id="NPO2.nl",NPO 2 (342p) +http://resolver.streaming.api.nos.nl/livestream?url=/live/npo/tvlive/npo2/npo2.isml/.m3u8 +#EXTINF:-1 tvg-id="NPO2.nl" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",NPO 2 (302p) [Geo-blocked] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://stream.tvtap.net:8081/live/nl-npo2.stream/playlist.m3u8 +#EXTINF:-1 tvg-id="NPO2.nl",NPO 2 [Geo-blocked] +http://resolver.streaming.api.nos.nl/livestream?url=/live/npo/tvlive/npo2/npo22.isml/.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/categories/general.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/categories/general.m3u index e9587edc70..d43fa35f64 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/categories/general.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/categories/general.m3u @@ -1,7 +1,7 @@ -#EXTM3U -#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 -#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/categories/legislative.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/categories/legislative.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/categories/legislative.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/categories/legislative.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/categories/news.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/categories/news.m3u index cf4e62a9a5..85c75b78bf 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/categories/news.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/categories/news.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/categories/undefined.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/categories/undefined.m3u index 4182fcb1d6..cfdce7d0bf 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/categories/undefined.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/categories/undefined.m3u @@ -1,15 +1,15 @@ -#EXTM3U -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] -#EXTVLCOPT:http-referrer=http://imn.iq -#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 -#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV -https://iptv-all.lanesh4d0w.repl.co/andorra/atv -#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD -https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV -http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 -#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) -http://146.59.85.40:89/dunaworld/index.m3u8 -#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) -https://iptv-all.lanesh4d0w.repl.co/andorra/zoo +#EXTM3U +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/categories/weather.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/categories/weather.m3u index 4686c68f4b..03a6963a33 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/categories/weather.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/categories/weather.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/categories/xxx.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/categories/xxx.m3u index d1e3a69bcd..a6791d64b8 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/categories/xxx.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/categories/xxx.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="VisitXTV.nl" tvg-logo="https://i.imgur.com/RJ9wbNF.jpg" group-title="XXX",Visit-X TV -https://stream.visit-x.tv/vxtv/ngrp:live_all/30fps.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="VisitXTV.nl" tvg-logo="https://i.imgur.com/RJ9wbNF.jpg" group-title="XXX",Visit-X TV +https://stream.visit-x.tv/vxtv/ngrp:live_all/30fps.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/countries/ad.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/countries/ad.m3u index de466399ac..9bc95be27d 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/countries/ad.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/countries/ad.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV -https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTM3U +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/countries/ca.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/countries/ca.m3u index 4686c68f4b..03a6963a33 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/countries/ca.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/countries/ca.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/countries/ru.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/countries/ru.m3u index cbfde92492..b701890a36 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/countries/ru.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/countries/ru.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/countries/undefined.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/countries/undefined.m3u index da6b5f4bb7..eb0364cd58 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/countries/undefined.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/countries/undefined.m3u @@ -1,11 +1,11 @@ -#EXTM3U -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] -#EXTVLCOPT:http-referrer=http://imn.iq -#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 -#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD -https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV -http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 -#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) -https://iptv-all.lanesh4d0w.repl.co/andorra/zoo +#EXTM3U +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/index.category.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/index.category.m3u index 2ce7c040e5..b3235a876c 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/index.category.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/index.category.m3u @@ -1,25 +1,25 @@ -#EXTM3U -#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General",BBC News HD -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 -#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 -#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="News",BBC News HD -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] -#EXTVLCOPT:http-referrer=http://imn.iq -#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 -#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV -https://iptv-all.lanesh4d0w.repl.co/andorra/atv -#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD -https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV -http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 -#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) -http://146.59.85.40:89/dunaworld/index.m3u8 -#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) -https://iptv-all.lanesh4d0w.repl.co/andorra/zoo +#EXTM3U +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="News",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/index.country.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/index.country.m3u index f5eba15e42..332df0029b 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/index.country.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/index.country.m3u @@ -1,31 +1,31 @@ -#EXTM3U -#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Andorra",ATV -https://iptv-all.lanesh4d0w.repl.co/andorra/atv -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Canada",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Kazakhstan",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Kyrgyzstan",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 -#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Russia",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Tajikistan",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Turkmenistan",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Uzbekistan",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 -#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="International",BBC News HD -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 -#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="International",Duna World (576i) -http://146.59.85.40:89/dunaworld/index.m3u8 -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] -#EXTVLCOPT:http-referrer=http://imn.iq -#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 -#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD -https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV -http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 -#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) -https://iptv-all.lanesh4d0w.repl.co/andorra/zoo +#EXTM3U +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Andorra",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Canada",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Kazakhstan",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Kyrgyzstan",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Russia",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Tajikistan",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Turkmenistan",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Uzbekistan",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="International",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="International",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/index.language.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/index.language.m3u index ed5f240141..e9f88f8ac2 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/index.language.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/index.language.m3u @@ -1,23 +1,23 @@ -#EXTM3U -#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Catalan",ATV -https://iptv-all.lanesh4d0w.repl.co/andorra/atv -#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="English",BBC News HD -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 -#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Russian",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] -#EXTVLCOPT:http-referrer=http://imn.iq -#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 -#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD -https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV -http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 -#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) -http://146.59.85.40:89/dunaworld/index.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Undefined",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) -https://iptv-all.lanesh4d0w.repl.co/andorra/zoo -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Undefined",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Catalan",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="English",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Russian",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Undefined",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Undefined",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/index.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/index.m3u index 1d27713b1d..fbf8cd7556 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/index.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/index.m3u @@ -1,23 +1,23 @@ -#EXTM3U -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] -#EXTVLCOPT:http-referrer=http://imn.iq -#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 -#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV -https://iptv-all.lanesh4d0w.repl.co/andorra/atv -#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD -https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd -#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV -http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 -#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) -http://146.59.85.40:89/dunaworld/index.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) -https://iptv-all.lanesh4d0w.repl.co/andorra/zoo -#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/index.region.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/index.region.m3u index 90c7438cec..aa3534ff75 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/index.region.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/index.region.m3u @@ -1,43 +1,43 @@ -#EXTM3U -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Americas",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Asia",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Asia",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Central Asia",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 -#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Commonwealth of Independent States",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Commonwealth of Independent States",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 -#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Europe",ATV -https://iptv-all.lanesh4d0w.repl.co/andorra/atv -#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Europe",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Europe",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 -#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Europe, the Middle East and Africa",ATV -https://iptv-all.lanesh4d0w.repl.co/andorra/atv -#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Europe, the Middle East and Africa",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Europe, the Middle East and Africa",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="North America",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Northern America",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="International",BBC News HD -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 -#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="International",Duna World (576i) -http://146.59.85.40:89/dunaworld/index.m3u8 -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] -#EXTVLCOPT:http-referrer=http://imn.iq -#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 -#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD -https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV -http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 -#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) -https://iptv-all.lanesh4d0w.repl.co/andorra/zoo +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Americas",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Asia",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Asia",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Central Asia",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Commonwealth of Independent States",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Commonwealth of Independent States",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Europe",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Europe",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Europe",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Europe, the Middle East and Africa",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Europe, the Middle East and Africa",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="Europe, the Middle East and Africa",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="North America",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Northern America",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="International",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="International",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/languages/eng.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/languages/eng.m3u index cf4e62a9a5..85c75b78bf 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/languages/eng.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/languages/eng.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/languages/rus.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/languages/rus.m3u index cbfde92492..b701890a36 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/languages/rus.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/languages/rus.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/languages/undefined.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/languages/undefined.m3u index 5d59e689d7..0eeed846f3 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/languages/undefined.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/languages/undefined.m3u @@ -1,17 +1,17 @@ -#EXTM3U -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] -#EXTVLCOPT:http-referrer=http://imn.iq -#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 -#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD -https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV -http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 -#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) -http://146.59.85.40:89/dunaworld/index.m3u8 -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) -https://iptv-all.lanesh4d0w.repl.co/andorra/zoo -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/afr.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/afr.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/afr.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/afr.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/amer.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/amer.m3u index 4686c68f4b..03a6963a33 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/amer.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/amer.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/apac.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/apac.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/apac.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/apac.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/arab.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/arab.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/arab.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/arab.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/asia.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/asia.m3u index 6f6d448e87..1a2c778e09 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/asia.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/asia.m3u @@ -1,5 +1,5 @@ -#EXTM3U -#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/carib.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/carib.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/carib.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/carib.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/cas.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/cas.m3u index a9387b8b44..847591ab04 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/cas.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/cas.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/cis.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/cis.m3u index 6f6d448e87..1a2c778e09 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/cis.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/cis.m3u @@ -1,5 +1,5 @@ -#EXTM3U -#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/emea.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/emea.m3u index 16dd0c3954..10fbb43f94 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/emea.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/emea.m3u @@ -1,7 +1,7 @@ -#EXTM3U -#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV -https://iptv-all.lanesh4d0w.repl.co/andorra/atv -#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/eur.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/eur.m3u index 16dd0c3954..10fbb43f94 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/eur.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/eur.m3u @@ -1,7 +1,7 @@ -#EXTM3U -#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV -https://iptv-all.lanesh4d0w.repl.co/andorra/atv -#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 -#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="AndorraTV.ad@SD" tvg-logo="" group-title="Undefined",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="ElTR.kg" tvg-logo="https://i.ibb.co/r6czQwQ/365049798-774721644658455-5702658175909463406-n-2.png" group-title="General",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/hispam.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/hispam.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/hispam.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/hispam.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/int.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/int.m3u index c549c09ce1..15240af7d0 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/int.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/int.m3u @@ -1,5 +1,5 @@ -#EXTM3U -#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 -#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) -http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="General;News",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu" tvg-logo="https://i.imgur.com/uOBQJZS.png" group-title="Undefined",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/lac.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/lac.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/lac.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/lac.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/latam.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/latam.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/latam.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/latam.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/maghreb.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/maghreb.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/maghreb.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/maghreb.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/mena.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/mena.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/mena.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/mena.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/mideast.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/mideast.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/mideast.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/mideast.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/nam.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/nam.m3u index 4686c68f4b..03a6963a33 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/nam.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/nam.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/noram.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/noram.m3u index 4686c68f4b..03a6963a33 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/noram.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/noram.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/nord.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/nord.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/nord.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/nord.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/oce.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/oce.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/oce.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/oce.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/sas.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/sas.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/sas.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/sas.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/ssa.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/ssa.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/ssa.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/ssa.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/undefined.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/undefined.m3u index da6b5f4bb7..eb0364cd58 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/undefined.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/undefined.m3u @@ -1,11 +1,11 @@ -#EXTM3U -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] -#EXTVLCOPT:http-referrer=http://imn.iq -#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 -#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD -https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd -#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV -http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 -#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) -https://iptv-all.lanesh4d0w.repl.co/andorra/zoo +#EXTM3U +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined" http-referrer="http://imn.iq" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="AndorraTV.ad@HD" tvg-logo="" group-title="Undefined",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTINF:-1 tvg-id="Zoo.ad@HD" tvg-logo="" group-title="Undefined",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/regions/wafr.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/regions/wafr.m3u index fcd718794a..7452e53aad 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/regions/wafr.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/regions/wafr.m3u @@ -1 +1 @@ -#EXTM3U +#EXTM3U diff --git a/tests/__data__/expected/playlist_generate/.gh-pages/subdivisions/ca-on.m3u b/tests/__data__/expected/playlist_generate/.gh-pages/subdivisions/ca-on.m3u index 4686c68f4b..03a6963a33 100644 --- a/tests/__data__/expected/playlist_generate/.gh-pages/subdivisions/ca-on.m3u +++ b/tests/__data__/expected/playlist_generate/.gh-pages/subdivisions/ca-on.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/expected/playlist_update/cy.m3u b/tests/__data__/expected/playlist_update/cy.m3u index 987825ca1d..13482713e9 100644 --- a/tests/__data__/expected/playlist_update/cy.m3u +++ b/tests/__data__/expected/playlist_update/cy.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="AdaTV.cy",AdaTV -https://ythls.onrender.com/channel/UC40TUSUx490U5uR1lZt3Ajg.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="AdaTV.cy",AdaTV +https://ythls.onrender.com/channel/UC40TUSUx490U5uR1lZt3Ajg.m3u8 diff --git a/tests/__data__/expected/playlist_update/fr.m3u b/tests/__data__/expected/playlist_update/fr.m3u index 82856b3387..f4f93afdcf 100644 --- a/tests/__data__/expected/playlist_update/fr.m3u +++ b/tests/__data__/expected/playlist_update/fr.m3u @@ -1,5 +1,5 @@ -#EXTM3U -#EXTINF:-1 tvg-id="TFX.fr" http-referrer="https://pkpakiplay.xyz/" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",TFX -#EXTVLCOPT:http-referrer=https://pkpakiplay.xyz/ -#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1 -https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/64c109a4798def0008a6e03e/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY +#EXTM3U +#EXTINF:-1 tvg-id="TFX.fr" http-referrer="https://pkpakiplay.xyz/" http-user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",TFX +#EXTVLCOPT:http-referrer=https://pkpakiplay.xyz/ +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1 +https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/64c109a4798def0008a6e03e/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY diff --git a/tests/__data__/expected/playlist_update/uk.m3u b/tests/__data__/expected/playlist_update/uk.m3u index 6ebfc71cd2..a60ea6210e 100644 --- a/tests/__data__/expected/playlist_update/uk.m3u +++ b/tests/__data__/expected/playlist_update/uk.m3u @@ -1,7 +1,7 @@ -#EXTM3U -#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD (720p) [Not 24/7] -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 -#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD (480p) [Geo-blocked] -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/playlist.m3u8 -#EXTINF:-1 tvg-id="BeanoTV.uk",Beano TV -https://a5b4bacecd47433dad06d3189fc7422e.mediatailor.us-east-1.amazonaws.com/v1/manifest/04fd913bb278d8775298c26fdca9d9841f37601f/RakutenTV-eu_BeanoTV/b1f233d5-847c-437d-aa4f-f73e67a85323/2.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD (720p) [Not 24/7] +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD (480p) [Geo-blocked] +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/playlist.m3u8 +#EXTINF:-1 tvg-id="BeanoTV.uk",Beano TV +https://a5b4bacecd47433dad06d3189fc7422e.mediatailor.us-east-1.amazonaws.com/v1/manifest/04fd913bb278d8775298c26fdca9d9841f37601f/RakutenTV-eu_BeanoTV/b1f233d5-847c-437d-aa4f-f73e67a85323/2.m3u8 diff --git a/tests/__data__/expected/playlist_update/us.m3u b/tests/__data__/expected/playlist_update/us.m3u index 5271483e5d..80ce51958a 100644 --- a/tests/__data__/expected/playlist_update/us.m3u +++ b/tests/__data__/expected/playlist_update/us.m3u @@ -1,6 +1,6 @@ -#EXTM3U -#EXTINF:-1 tvg-id="BBCAmerica.us@East" http-user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246",BBC America East (720p) -#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246 -https://servilive.com:3126/live/tele2000live.m3u8 -#EXTINF:-1 tvg-id="FastTV.us",Fast TV -https://3fa797d5.wurl.com/manifest/f36d25e7e52f1ba8d7e56eb859c636563214f541/T05PX01vdG9yVHJlbmRGYXN0VFZfSExT/b5e5e0e2-12b3-4312-93c9-c0a7c50b41ca/4.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="BBCAmerica.us@East" http-user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246",BBC America East (720p) +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246 +https://servilive.com:3126/live/tele2000live.m3u8 +#EXTINF:-1 tvg-id="FastTV.us",Fast TV +https://3fa797d5.wurl.com/manifest/f36d25e7e52f1ba8d7e56eb859c636563214f541/T05PX01vdG9yVHJlbmRGYXN0VFZfSExT/b5e5e0e2-12b3-4312-93c9-c0a7c50b41ca/4.m3u8 diff --git a/tests/__data__/input/api_generate/ad.m3u b/tests/__data__/input/api_generate/ad.m3u index 64a1dc0cf4..9d8926e0ea 100644 --- a/tests/__data__/input/api_generate/ad.m3u +++ b/tests/__data__/input/api_generate/ad.m3u @@ -1,5 +1,5 @@ -#EXTM3U -#EXTINF:-1 tvg-id="Zoo.ad",Zoo (720p) -https://iptv-all.lanesh4d0w.repl.co/andorra/zoo -#EXTINF:-1 tvg-id="AndorraTV.ad@SD",ATV -https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTM3U +#EXTINF:-1 tvg-id="Zoo.ad",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo +#EXTINF:-1 tvg-id="AndorraTV.ad@SD",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv diff --git a/tests/__data__/input/api_generate/ca.m3u b/tests/__data__/input/api_generate/ca.m3u index 9c198b6829..672601d7f7 100644 --- a/tests/__data__/input/api_generate/ca.m3u +++ b/tests/__data__/input/api_generate/ca.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="MeteoMedia.ca",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/input/api_generate/in.m3u b/tests/__data__/input/api_generate/in.m3u index 62594eb4bf..c375e17ace 100644 --- a/tests/__data__/input/api_generate/in.m3u +++ b/tests/__data__/input/api_generate/in.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="",Daawah TV -http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 diff --git a/tests/__data__/input/api_generate/uk.m3u b/tests/__data__/input/api_generate/uk.m3u index 5e8c7318e5..4a8a1f64ab 100644 --- a/tests/__data__/input/api_generate/uk.m3u +++ b/tests/__data__/input/api_generate/uk.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 diff --git a/tests/__data__/input/api_generate/unsorted.m3u b/tests/__data__/input/api_generate/unsorted.m3u index 1a9c40b9fd..96f9299e2d 100644 --- a/tests/__data__/input/api_generate/unsorted.m3u +++ b/tests/__data__/input/api_generate/unsorted.m3u @@ -1,9 +1,9 @@ -#EXTM3U -#EXTINF:-1 tvg-id="LDPRTV.ru",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 -#EXTINF:-1 tvg-id="VisitXTV.nl",Visit-X TV -https://stream.visit-x.tv/vxtv/ngrp:live_all/30fps.m3u8 -#EXTINF:-1 tvg-id="" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] -#EXTVLCOPT:http-referrer=http://imn.iq -#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="LDPRTV.ru",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="VisitXTV.nl",Visit-X TV +https://stream.visit-x.tv/vxtv/ngrp:live_all/30fps.m3u8 +#EXTINF:-1 tvg-id="" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 diff --git a/tests/__data__/input/playlist_edit/playlist.m3u b/tests/__data__/input/playlist_edit/playlist.m3u index 2ebf1ffa7a..0abd41b6f2 100644 --- a/tests/__data__/input/playlist_edit/playlist.m3u +++ b/tests/__data__/input/playlist_edit/playlist.m3u @@ -1,5 +1,5 @@ -#EXTM3U -#EXTINF:-1 tvg-id="HewadTV.af",Hewad TV (720p) [Not 24/7] -http://51.210.199.58/hls/stream.m3u8 -#EXTINF:-1 tvg-id="",Télévision française 1 (480p) +#EXTM3U +#EXTINF:-1 tvg-id="HewadTV.af",Hewad TV (720p) [Not 24/7] +http://51.210.199.58/hls/stream.m3u8 +#EXTINF:-1 tvg-id="",Télévision française 1 (480p) https://live.relentlessinnovations.net:1936/imantv/imantv/playlist.m3u8 \ No newline at end of file diff --git a/tests/__data__/input/playlist_format/in.m3u b/tests/__data__/input/playlist_format/in.m3u index 47c77da2e0..3d0bcd3596 100644 --- a/tests/__data__/input/playlist_format/in.m3u +++ b/tests/__data__/input/playlist_format/in.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="mn.in",Manorama News -2 [U3] (480p) [Geo-blocked] [Not 24/7] -https://ythls.onrender.com/channel/UCP0uG-mcMImgKnJz-VjJZmQ.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="mn.in",Manorama News -2 [U3] (480p) [Geo-blocked] [Not 24/7] +https://ythls.onrender.com/channel/UCP0uG-mcMImgKnJz-VjJZmQ.m3u8 diff --git a/tests/__data__/input/playlist_format/nl.m3u b/tests/__data__/input/playlist_format/nl.m3u index 5fdeaea52e..39d56a3ef4 100644 --- a/tests/__data__/input/playlist_format/nl.m3u +++ b/tests/__data__/input/playlist_format/nl.m3u @@ -1,13 +1,13 @@ -#EXTM3U -#EXTINF:-1 tvg-id="NPO2.nl",NPO 2 (302p) [Geo-blocked] -#EXTVLCOPT:http-referrer=http://imn.iq -#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 -http://stream.tvtap.net:8081/live/nl-npo2.stream/playlist.m3u8? -#EXTINF:-1 tvg-id="NPO2.nl",NPO 2 [Geo-blocked] -http://resolver.streaming.api.nos.nl/livestream?url=/live/npo/tvlive/npo2/npo22.isml/.m3u8 -#EXTINF:-1 tvg-id="NPO2.nl",NPO 2 (342p) -http://resolver.streaming.api.nos.nl/livestream?url=/live/npo/tvlive/npo2/npo2.isml/.m3u8 -#EXTINF:-1 tvg-id="NPO1.nl@SD",NPO 1 (342p) [Geo-blocked] -http://resolver.streaming.api.nos.nl/livestream?url=/live/npo/tvlive/npo1/npo1.isml/.m3u8 -#EXTINF:-1 tvg-id="",NPO 2 (Duplicate) -http://resolver.streaming.api.nos.nl/livestream?url=/live/npo/tvlive/npo2/npo2.isml/.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="NPO2.nl",NPO 2 (302p) [Geo-blocked] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://stream.tvtap.net:8081/live/nl-npo2.stream/playlist.m3u8? +#EXTINF:-1 tvg-id="NPO2.nl",NPO 2 [Geo-blocked] +http://resolver.streaming.api.nos.nl/livestream?url=/live/npo/tvlive/npo2/npo22.isml/.m3u8 +#EXTINF:-1 tvg-id="NPO2.nl",NPO 2 (342p) +http://resolver.streaming.api.nos.nl/livestream?url=/live/npo/tvlive/npo2/npo2.isml/.m3u8 +#EXTINF:-1 tvg-id="NPO1.nl@SD",NPO 1 (342p) [Geo-blocked] +http://resolver.streaming.api.nos.nl/livestream?url=/live/npo/tvlive/npo1/npo1.isml/.m3u8 +#EXTINF:-1 tvg-id="",NPO 2 (Duplicate) +http://resolver.streaming.api.nos.nl/livestream?url=/live/npo/tvlive/npo2/npo2.isml/.m3u8 diff --git a/tests/__data__/input/playlist_generate/ad.m3u b/tests/__data__/input/playlist_generate/ad.m3u index 9a1c9e175a..3c3bcae1db 100644 --- a/tests/__data__/input/playlist_generate/ad.m3u +++ b/tests/__data__/input/playlist_generate/ad.m3u @@ -1,9 +1,9 @@ -#EXTM3U -#EXTINF:-1 tvg-id="Zoo.ad@HD",Zoo (720p) -https://iptv-all.lanesh4d0w.repl.co/andorra/zoo -#EXTINF:-1 tvg-id="AndorraTV.ad@SD",ATV -https://iptv-all.lanesh4d0w.repl.co/andorra/atv -#EXTINF:-1 tvg-id="AndorraTV.ad@HD",ATV HD -https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd -#EXTINF:-1 tvg-id="AndorraTV.ad",ATV -https://iptv-all.lanesh4d0w.repl.co/andorra/atv2 +#EXTM3U +#EXTINF:-1 tvg-id="Zoo.ad@HD",Zoo (720p) +https://iptv-all.lanesh4d0w.repl.co/andorra/zoo +#EXTINF:-1 tvg-id="AndorraTV.ad@SD",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv +#EXTINF:-1 tvg-id="AndorraTV.ad@HD",ATV HD +https://iptv-all.lanesh4d0w.repl.co/andorra/atv_hd +#EXTINF:-1 tvg-id="AndorraTV.ad",ATV +https://iptv-all.lanesh4d0w.repl.co/andorra/atv2 diff --git a/tests/__data__/input/playlist_generate/ca.m3u b/tests/__data__/input/playlist_generate/ca.m3u index 9c198b6829..672601d7f7 100644 --- a/tests/__data__/input/playlist_generate/ca.m3u +++ b/tests/__data__/input/playlist_generate/ca.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="MeteoMedia.ca",Meteomedia -http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="MeteoMedia.ca",Meteomedia +http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8 diff --git a/tests/__data__/input/playlist_generate/in.m3u b/tests/__data__/input/playlist_generate/in.m3u index 62594eb4bf..c375e17ace 100644 --- a/tests/__data__/input/playlist_generate/in.m3u +++ b/tests/__data__/input/playlist_generate/in.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="",Daawah TV -http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="",Daawah TV +http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8 diff --git a/tests/__data__/input/playlist_generate/kg.m3u b/tests/__data__/input/playlist_generate/kg.m3u index 9c1d5a5755..9bf0832b51 100644 --- a/tests/__data__/input/playlist_generate/kg.m3u +++ b/tests/__data__/input/playlist_generate/kg.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="ElTR.kg",ЭлТР (480p) [Not 24/7] -http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="ElTR.kg",ЭлТР (480p) [Not 24/7] +http://gohoski.fvds.ru:3000/mediabay/162/index.m3u8 diff --git a/tests/__data__/input/playlist_generate/uk.m3u b/tests/__data__/input/playlist_generate/uk.m3u index 5e8c7318e5..4a8a1f64ab 100644 --- a/tests/__data__/input/playlist_generate/uk.m3u +++ b/tests/__data__/input/playlist_generate/uk.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 diff --git a/tests/__data__/input/playlist_generate/unsorted.m3u b/tests/__data__/input/playlist_generate/unsorted.m3u index b2b798b155..826414ad22 100644 --- a/tests/__data__/input/playlist_generate/unsorted.m3u +++ b/tests/__data__/input/playlist_generate/unsorted.m3u @@ -1,11 +1,11 @@ -#EXTM3U -#EXTINF:-1 tvg-id="LDPRTV.ru",ЛДПР ТВ (1080p) -http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 -#EXTINF:-1 tvg-id="VisitXTV.nl",Visit-X TV -https://stream.visit-x.tv/vxtv/ngrp:live_all/30fps.m3u8 -#EXTINF:-1 tvg-id="" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] -#EXTVLCOPT:http-referrer=http://imn.iq -#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 -#EXTINF:-1 tvg-id="DunaWorld.hu",Duna World (576i) -http://146.59.85.40:89/dunaworld/index.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="LDPRTV.ru",ЛДПР ТВ (1080p) +http://46.46.143.222:1935/live/mp4:ldpr.stream/blocked.m3u8 +#EXTINF:-1 tvg-id="VisitXTV.nl",Visit-X TV +https://stream.visit-x.tv/vxtv/ngrp:live_all/30fps.m3u8 +#EXTINF:-1 tvg-id="" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Andorra TV (720p) [Not 24/7] +#EXTVLCOPT:http-referrer=http://imn.iq +#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8 +#EXTINF:-1 tvg-id="DunaWorld.hu",Duna World (576i) +http://146.59.85.40:89/dunaworld/index.m3u8 diff --git a/tests/__data__/input/playlist_test/ag.m3u b/tests/__data__/input/playlist_test/ag.m3u index 66b32b21d7..f4716e013b 100644 --- a/tests/__data__/input/playlist_test/ag.m3u +++ b/tests/__data__/input/playlist_test/ag.m3u @@ -1,5 +1,5 @@ -#EXTM3U -#EXTINF:-1 tvg-id="ABSTV.ag",ABS TV -https://tego-cdn2a.sibercdn.com/Live_TV-ABSTV-10/tracks-v3a1/rewind-7200.m3u8?token=e5f61e7be8363eb781b4bdfe591bf917dd529c1a-SjY3NzRTbDZQNnFQVkZaNkZja2RxV3JKc1VBa05zQkdMNStJakRGV0VTTzNrOEVGVUlIQmxta1NLV0o3bzdVdQ-1736094545-1736008145 -#EXTINF:-1 tvg-id="ABSTV.ag@HD",ABS TV (1080p) [Not 24/7] +#EXTM3U +#EXTINF:-1 tvg-id="ABSTV.ag",ABS TV +https://tego-cdn2a.sibercdn.com/Live_TV-ABSTV-10/tracks-v3a1/rewind-7200.m3u8?token=e5f61e7be8363eb781b4bdfe591bf917dd529c1a-SjY3NzRTbDZQNnFQVkZaNkZja2RxV3JKc1VBa05zQkdMNStJakRGV0VTTzNrOEVGVUlIQmxta1NLV0o3bzdVdQ-1736094545-1736008145 +#EXTINF:-1 tvg-id="ABSTV.ag@HD",ABS TV (1080p) [Not 24/7] https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.twitch.tv/absliveantigua3 \ No newline at end of file diff --git a/tests/__data__/input/playlist_update/br.m3u b/tests/__data__/input/playlist_update/br.m3u index 6dcdaee152..31a8698610 100644 --- a/tests/__data__/input/playlist_update/br.m3u +++ b/tests/__data__/input/playlist_update/br.m3u @@ -1,6 +1,6 @@ -#EXTM3U -#EXTINF:-1 tvg-id="",VTV [Not 24/7] -https://ythls.onrender.com/channel/UC40TUSUx490U5uR1lZt3Ajg.m3u8 -#EXTINF:-1 tvg-id="",Tele2000 [Not 24/7] -#EXTVLCOPT:http-referrer=https://example2.com/ -https://servilive.com:3126/live/tele2000live.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="",VTV [Not 24/7] +https://ythls.onrender.com/channel/UC40TUSUx490U5uR1lZt3Ajg.m3u8 +#EXTINF:-1 tvg-id="",Tele2000 [Not 24/7] +#EXTVLCOPT:http-referrer=https://example2.com/ +https://servilive.com:3126/live/tele2000live.m3u8 diff --git a/tests/__data__/input/playlist_update/cy.m3u b/tests/__data__/input/playlist_update/cy.m3u index 439794ad78..03c605e3eb 100644 --- a/tests/__data__/input/playlist_update/cy.m3u +++ b/tests/__data__/input/playlist_update/cy.m3u @@ -1,7 +1,7 @@ -#EXTM3U -#EXTINF:-1 tvg-id="",RIK HD Cyprus -http://l6.cloudskep.com/rikcy/rikhd/playlist.m3u8 -#EXTINF:-1 tvg-id="",RIK 2 -http://l6.cloudskep.com/rikcy/rik2/playlist.m3u8 -#EXTINF:-1 tvg-id="AdaTV.cy",AdaTV -https://ythls.onrender.com/channel/UC40TUSUx490U5uR1lZt3Ajg.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="",RIK HD Cyprus +http://l6.cloudskep.com/rikcy/rikhd/playlist.m3u8 +#EXTINF:-1 tvg-id="",RIK 2 +http://l6.cloudskep.com/rikcy/rik2/playlist.m3u8 +#EXTINF:-1 tvg-id="AdaTV.cy",AdaTV +https://ythls.onrender.com/channel/UC40TUSUx490U5uR1lZt3Ajg.m3u8 diff --git a/tests/__data__/input/playlist_update/uk.m3u b/tests/__data__/input/playlist_update/uk.m3u index c1deeea978..033f5a36b5 100644 --- a/tests/__data__/input/playlist_update/uk.m3u +++ b/tests/__data__/input/playlist_update/uk.m3u @@ -1,5 +1,5 @@ -#EXTM3U -#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD (720p) [Not 24/7] -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 -#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD (480p) [Geo-blocked] -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/playlist.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD (720p) [Not 24/7] +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD (480p) [Geo-blocked] +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/playlist.m3u8 diff --git a/tests/__data__/input/playlist_validate/us_blocked.m3u b/tests/__data__/input/playlist_validate/us_blocked.m3u index 2ffa2273b6..3a5e4bd531 100644 --- a/tests/__data__/input/playlist_validate/us_blocked.m3u +++ b/tests/__data__/input/playlist_validate/us_blocked.m3u @@ -1,7 +1,7 @@ -#EXTM3U -#EXTINF:-1 tvg-id="FoxSports2.us@Asia",Fox Sports 2 Asia (Thai) (720p) -https://example.com/playlist.m3u8 -#EXTINF:-1 tvg-id="TVN.pl",TVN -https://example.com/playlist2.m3u8 -#EXTINF:-1 tvg-id="EverydayHeroes.us",Everyday Heroes (720p) -https://a.jsrdn.com/broadcast/7b1451fa52/+0000/c.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="FoxSports2.us@Asia",Fox Sports 2 Asia (Thai) (720p) +https://example.com/playlist.m3u8 +#EXTINF:-1 tvg-id="TVN.pl",TVN +https://example.com/playlist2.m3u8 +#EXTINF:-1 tvg-id="EverydayHeroes.us",Everyday Heroes (720p) +https://a.jsrdn.com/broadcast/7b1451fa52/+0000/c.m3u8 diff --git a/tests/__data__/input/playlist_validate/wrong_id.m3u b/tests/__data__/input/playlist_validate/wrong_id.m3u index fd98677736..dc7ab8504f 100644 --- a/tests/__data__/input/playlist_validate/wrong_id.m3u +++ b/tests/__data__/input/playlist_validate/wrong_id.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="qib22lAq1L.us",ABC (720p) -https://example.com/playlist2.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="qib22lAq1L.us",ABC (720p) +https://example.com/playlist2.m3u8 diff --git a/tests/__data__/input/report_create/br.m3u b/tests/__data__/input/report_create/br.m3u index 6dcdaee152..31a8698610 100644 --- a/tests/__data__/input/report_create/br.m3u +++ b/tests/__data__/input/report_create/br.m3u @@ -1,6 +1,6 @@ -#EXTM3U -#EXTINF:-1 tvg-id="",VTV [Not 24/7] -https://ythls.onrender.com/channel/UC40TUSUx490U5uR1lZt3Ajg.m3u8 -#EXTINF:-1 tvg-id="",Tele2000 [Not 24/7] -#EXTVLCOPT:http-referrer=https://example2.com/ -https://servilive.com:3126/live/tele2000live.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="",VTV [Not 24/7] +https://ythls.onrender.com/channel/UC40TUSUx490U5uR1lZt3Ajg.m3u8 +#EXTINF:-1 tvg-id="",Tele2000 [Not 24/7] +#EXTVLCOPT:http-referrer=https://example2.com/ +https://servilive.com:3126/live/tele2000live.m3u8 diff --git a/tests/__data__/input/report_create/cy.m3u b/tests/__data__/input/report_create/cy.m3u index 581d0961b6..82d0b78d44 100644 --- a/tests/__data__/input/report_create/cy.m3u +++ b/tests/__data__/input/report_create/cy.m3u @@ -1,5 +1,5 @@ -#EXTM3U -#EXTINF:-1 tvg-id="",RIK HD Cyprus -http://l6.cloudskep.com/rikcy/rikhd/playlist.m3u8 -#EXTINF:-1 tvg-id="",RIK 2 -http://l6.cloudskep.com/rikcy/rik2/playlist.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="",RIK HD Cyprus +http://l6.cloudskep.com/rikcy/rikhd/playlist.m3u8 +#EXTINF:-1 tvg-id="",RIK 2 +http://l6.cloudskep.com/rikcy/rik2/playlist.m3u8 diff --git a/tests/__data__/input/report_create/uk.m3u b/tests/__data__/input/report_create/uk.m3u index c1deeea978..033f5a36b5 100644 --- a/tests/__data__/input/report_create/uk.m3u +++ b/tests/__data__/input/report_create/uk.m3u @@ -1,5 +1,5 @@ -#EXTM3U -#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD (720p) [Not 24/7] -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 -#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD (480p) [Geo-blocked] -http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/playlist.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD (720p) [Not 24/7] +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8 +#EXTINF:-1 tvg-id="BBCNews.uk",BBC News HD (480p) [Geo-blocked] +http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/playlist.m3u8 diff --git a/tests/__data__/input/report_create/us.m3u b/tests/__data__/input/report_create/us.m3u index 92cee65b08..78ea4deb5c 100644 --- a/tests/__data__/input/report_create/us.m3u +++ b/tests/__data__/input/report_create/us.m3u @@ -1,3 +1,3 @@ -#EXTM3U -#EXTINF:-1 tvg-id="",TUTV -https://livestream.telvue.com/templeuni1/f7b44cfafd5c52223d5498196c8a2e7b.sdp/playlist.m3u8 +#EXTM3U +#EXTINF:-1 tvg-id="",TUTV +https://livestream.telvue.com/templeuni1/f7b44cfafd5c52223d5498196c8a2e7b.sdp/playlist.m3u8 From c38ab0f070fb97f7bc7505fca9d2fe9378e7351e Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 23 Apr 2025 05:21:23 +0300 Subject: [PATCH 27/40] Update update.test.ts --- tests/commands/playlist/update.test.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/commands/playlist/update.test.ts b/tests/commands/playlist/update.test.ts index a9949c4994..a430b8df45 100644 --- a/tests/commands/playlist/update.test.ts +++ b/tests/commands/playlist/update.test.ts @@ -21,9 +21,12 @@ describe('playlist:update', () => { const stdout = execSync(cmd, { encoding: 'utf8' }) if (process.env.DEBUG === 'true') console.log(cmd, stdout) - const files = glob - .sync('tests/__data__/expected/playlist_update/*.m3u') - .map(f => f.replace('tests/__data__/expected/playlist_update/', '')) + const files = glob.sync('tests/__data__/expected/playlist_update/*.m3u').map(filepath => { + const fileUrl = pathToFileURL(filepath).toString() + const pathToRemove = pathToFileURL('tests/__data__/expected/playlist_update/').toString() + + return fileUrl.replace(pathToRemove, '') + }) files.forEach(filepath => { expect(content(`tests/__data__/output/streams/${filepath}`), filepath).toBe( From 0deb0c8e015a32fba552d287769728e860187045 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 23 Apr 2025 05:21:33 +0300 Subject: [PATCH 28/40] Update scripts --- scripts/models/playlist.ts | 4 ++-- scripts/models/stream.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/models/playlist.ts b/scripts/models/playlist.ts index ba0a25c5c4..d3022a5af6 100644 --- a/scripts/models/playlist.ts +++ b/scripts/models/playlist.ts @@ -17,10 +17,10 @@ export class Playlist { } toString() { - let output = '#EXTM3U\n' + let output = '#EXTM3U\r\n' this.streams.forEach((stream: Stream) => { - output += stream.toString(this.options) + '\n' + output += stream.toString(this.options) + '\r\n' }) return output diff --git a/scripts/models/stream.ts b/scripts/models/stream.ts index 2de399efc7..443a249b9c 100644 --- a/scripts/models/stream.ts +++ b/scripts/models/stream.ts @@ -352,14 +352,14 @@ export class Stream { output += `,${this.getTitle()}` if (this.referrer) { - output += `\n#EXTVLCOPT:http-referrer=${this.referrer}` + output += `\r\n#EXTVLCOPT:http-referrer=${this.referrer}` } if (this.userAgent) { - output += `\n#EXTVLCOPT:http-user-agent=${this.userAgent}` + output += `\r\n#EXTVLCOPT:http-user-agent=${this.userAgent}` } - output += `\n${this.url}` + output += `\r\n${this.url}` return output } From 844771bfb1ca6e29b6be97c970b7d2dcfff9dee1 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 23 Apr 2025 05:42:52 +0300 Subject: [PATCH 29/40] Update tests --- tests/commands/playlist/format.test.ts | 9 ++++++--- tests/commands/playlist/generate.test.ts | 7 ++++++- tests/commands/playlist/test.test.ts | 7 ++++++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/tests/commands/playlist/format.test.ts b/tests/commands/playlist/format.test.ts index 070bfd7d98..f6c6312528 100644 --- a/tests/commands/playlist/format.test.ts +++ b/tests/commands/playlist/format.test.ts @@ -20,9 +20,12 @@ describe('playlist:format', () => { const stdout = execSync(cmd, { encoding: 'utf8' }) if (process.env.DEBUG === 'true') console.log(cmd, stdout) - const files = glob - .sync('tests/__data__/expected/playlist_format/*.m3u') - .map(f => f.replace('tests/__data__/expected/playlist_format/', '')) + const files = glob.sync('tests/__data__/expected/playlist_format/*.m3u').map(filepath => { + const fileUrl = pathToFileURL(filepath).toString() + const pathToRemove = pathToFileURL('tests/__data__/expected/playlist_format/').toString() + + return fileUrl.replace(pathToRemove, '') + }) files.forEach(filepath => { expect(content(`tests/__data__/output/streams/${filepath}`), filepath).toBe( diff --git a/tests/commands/playlist/generate.test.ts b/tests/commands/playlist/generate.test.ts index 5c99f02696..fa27be5b1f 100644 --- a/tests/commands/playlist/generate.test.ts +++ b/tests/commands/playlist/generate.test.ts @@ -23,7 +23,12 @@ describe('playlist:generate', () => { const playlists = glob .sync('tests/__data__/expected/playlist_generate/.gh-pages/**/*.m3u') - .map((file: string) => file.replace('tests/__data__/expected/playlist_generate/', '')) + .map(filepath => { + const fileUrl = pathToFileURL(filepath).toString() + const pathToRemove = pathToFileURL('tests/__data__/expected/playlist_generate/').toString() + + return fileUrl.replace(pathToRemove, '') + }) playlists.forEach((filepath: string) => { expect(content(`tests/__data__/output/${filepath}`), filepath).toBe( diff --git a/tests/commands/playlist/test.test.ts b/tests/commands/playlist/test.test.ts index 0020106dce..1b42c3d585 100644 --- a/tests/commands/playlist/test.test.ts +++ b/tests/commands/playlist/test.test.ts @@ -1,4 +1,5 @@ import { execSync } from 'child_process' +import path from 'node:path' import os from 'os' type ExecError = { @@ -27,6 +28,10 @@ describe('playlist:test', () => { }) function checkStdout(stdout: string) { - expect(stdout).toContain('playlist_test/ag.m3u') + expect(stdout).toContain(slash('playlist_test/ag.m3u')) expect(stdout).toContain('2 problems (1 errors, 1 warnings)') } + +function slash(filepath: string) { + return filepath.split(path.sep).join(path.posix.sep) +} From e11619c0542915a827f96c418fdb8da3a749894e Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 23 Apr 2025 20:55:48 +0300 Subject: [PATCH 30/40] Update dependencies --- package-lock.json | 865 +++++++++------------------------------------- package.json | 3 +- yarn.lock | 317 ++++------------- 3 files changed, 230 insertions(+), 955 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4df46535d8..7f48efc865 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@eslint/eslintrc": "^3.3.0", "@eslint/js": "^9.21.0", - "@freearhey/core": "^0.7.0", + "@freearhey/core": "^0.8.2", "@freearhey/search-js": "^0.1.2", "@inquirer/prompts": "^7.4.1", "@octokit/core": "^6.1.4", @@ -18,6 +18,7 @@ "@octokit/plugin-rest-endpoint-methods": "^7.1.3", "@octokit/types": "^11.1.0", "@types/cli-progress": "^3.11.3", + "@types/fs-extra": "^11.0.4", "@types/jest": "^29.5.14", "@types/lodash": "^4.14.198", "@types/numeral": "^2.0.3", @@ -1065,23 +1066,20 @@ } }, "node_modules/@freearhey/core": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@freearhey/core/-/core-0.7.0.tgz", - "integrity": "sha512-HXkKPYGY7ife7JAc1q/Qxzy0WUdSnyt3rHThCShZHgnH3rz0tpkjHFW7LNegB3he0IKn/Zc95/YSOQ97Fq8ctA==", + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/@freearhey/core/-/core-0.8.2.tgz", + "integrity": "sha512-jlb1XUbhUf3lqD3B9Wmx3c8qYG4+s1I0cr2FFQfiMpJh4nMvfUNdJr2OhH31S/dbNP12ycT6RPVoZ2j2G3+mXA==", "dependencies": { - "@types/fs-extra": "^11.0.2", - "@types/lodash": "^4.14.198", - "@types/luxon": "^3.3.2", - "fs-extra": "^11.1.1", - "glob": "^10.3.4", + "consola": "^3.4.2", + "dayjs": "^1.11.13", + "fs-extra": "^11.3.0", + "glob": "^11.0.1", "lodash": "^4.17.21", - "luxon": "^3.4.3", - "natural-orderby": "^3.0.2", - "node-gzip": "^1.1.2", + "natural-orderby": "^5.0.0", "normalize-url": "^6.1.0", "object-treeify": "^2.1.1", - "run-script-os": "^1.1.6", - "signale": "^1.4.0" + "pako": "^2.1.0", + "timer-node": "^5.0.9" } }, "node_modules/@freearhey/core/node_modules/normalize-url": { @@ -1493,9 +1491,9 @@ } }, "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "engines": { "node": ">=12" }, @@ -2287,15 +2285,6 @@ "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz", "integrity": "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==" }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "optional": true, - "engines": { - "node": ">=14" - } - }, "node_modules/@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", @@ -2379,9 +2368,9 @@ "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==" }, "node_modules/@types/fs-extra": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.2.tgz", - "integrity": "sha512-c0hrgAOVYr21EX8J0jBMXGLMgJqVf/v6yxi0dLaJboW9aQPh16Id+z6w2Tx1hm+piJOLv8xPfVKZCLfjPw/IMQ==", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.4.tgz", + "integrity": "sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==", "dependencies": { "@types/jsonfile": "*", "@types/node": "*" @@ -2432,9 +2421,9 @@ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==" }, "node_modules/@types/jsonfile": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.1.tgz", - "integrity": "sha512-GSgiRCVeapDN+3pqA35IkQwasaCh/0YFH5dEF6S88iDvEn901DjOeH3/QPY+XYP1DFzDZPvIvfeEgk+7br5png==", + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.4.tgz", + "integrity": "sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==", "dependencies": { "@types/node": "*" } @@ -2444,11 +2433,6 @@ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.198.tgz", "integrity": "sha512-trNJ/vtMZYMLhfN45uLq4ShQSw0/S7xCTLLVM+WM1rmFpba/VS42jVUgaO3w/NOLiWR/09lnYk0yMaA/atdIsg==" }, - "node_modules/@types/luxon": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.3.2.tgz", - "integrity": "sha512-l5cpE57br4BIjK+9BSkFBOsWtwv6J9bJpC7gdXIzZyI0vuKvNTk0wZZrkQxMGsUAuGW9+WMNWF2IJMD7br2yeQ==" - }, "node_modules/@types/node": { "version": "22.13.10", "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz", @@ -3221,6 +3205,14 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, + "node_modules/consola": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz", + "integrity": "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==", + "engines": { + "node": "^14.18.0 || >=16.10.0" + } + }, "node_modules/console-table-printer": { "version": "2.12.1", "resolved": "https://registry.npmjs.org/console-table-printer/-/console-table-printer-2.12.1.tgz", @@ -3285,6 +3277,11 @@ "node": ">=12.20" } }, + "node_modules/dayjs": { + "version": "1.11.13", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz", + "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==" + }, "node_modules/debug": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", @@ -3400,6 +3397,7 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "peer": true, "dependencies": { "is-arrayish": "^0.2.1" } @@ -3407,7 +3405,8 @@ "node_modules/error-ex/node_modules/is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "peer": true }, "node_modules/esbuild": { "version": "0.25.1", @@ -3790,25 +3789,6 @@ "bser": "2.1.1" } }, - "node_modules/figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "dependencies": { - "escape-string-regexp": "^1.0.5" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/figures/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/file-entry-cache": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", @@ -3949,9 +3929,9 @@ } }, "node_modules/fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz", + "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -3962,9 +3942,9 @@ } }, "node_modules/fs-extra/node_modules/universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "engines": { "node": ">= 10.0.0" } @@ -4058,21 +4038,22 @@ } }, "node_modules/glob": { - "version": "10.3.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.4.tgz", - "integrity": "sha512-6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.1.tgz", + "integrity": "sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw==", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", - "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", - "path-scurry": "^1.10.1" + "jackspeak": "^4.0.1", + "minimatch": "^10.0.0", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^2.0.0" }, "bin": { - "glob": "dist/cjs/src/bin.js" + "glob": "dist/esm/bin.mjs" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -4117,14 +4098,14 @@ } }, "node_modules/glob/node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", + "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -4529,20 +4510,17 @@ } }, "node_modules/jackspeak": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.3.tgz", - "integrity": "sha512-R2bUw+kVZFS/h1AZqBKrSgDmdmjApzgY0AlCPumopFiAlbUxE2gf+SCuBzQ0cP5hHmUmFYF5yw55T97Th5Kstg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.0.tgz", + "integrity": "sha512-9DDdhb5j6cpeitCbvLO7n7J4IxnbM6hoF6O1g4HQ5TfhvvKN8ywDM7668ZhMHRqVmxqhps/F6syWK2KcPxYlkw==", "dependencies": { "@isaacs/cliui": "^8.0.2" }, "engines": { - "node": ">=14" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" } }, "node_modules/jake": { @@ -5197,11 +5175,6 @@ "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" }, - "node_modules/json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" - }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -5241,9 +5214,9 @@ } }, "node_modules/jsonfile/node_modules/universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "engines": { "node": ">= 10.0.0" } @@ -5292,40 +5265,6 @@ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", "peer": true }, - "node_modules/load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", - "dependencies": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/load-json-file/node_modules/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dependencies": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/load-json-file/node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "engines": { - "node": ">=4" - } - }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -5364,14 +5303,6 @@ "yallist": "^3.0.2" } }, - "node_modules/luxon": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz", - "integrity": "sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg==", - "engines": { - "node": ">=12" - } - }, "node_modules/m3u-linter": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/m3u-linter/-/m3u-linter-0.4.2.tgz", @@ -5389,14 +5320,6 @@ "node": ">=10.0.0" } }, - "node_modules/m3u-linter/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, "node_modules/m3u-linter/node_modules/commander": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", @@ -5405,79 +5328,6 @@ "node": ">= 10" } }, - "node_modules/m3u-linter/node_modules/glob": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz", - "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^4.0.1", - "minimatch": "^10.0.0", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^2.0.0" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/m3u-linter/node_modules/jackspeak": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.2.tgz", - "integrity": "sha512-bZsjR/iRjl1Nk1UkjGpAzLNfQtzuijhn2g+pbZb98HQ1Gk8vM9hfbxeMBP+M2/UUdwj0RqGG3mlvk2MsAqwvEw==", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/m3u-linter/node_modules/lru-cache": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz", - "integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==", - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/m3u-linter/node_modules/minimatch": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", - "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/m3u-linter/node_modules/path-scurry": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", - "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", - "dependencies": { - "lru-cache": "^11.0.0", - "minipass": "^7.1.2" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/make-dir": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", @@ -5664,9 +5514,9 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" }, "node_modules/natural-orderby": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/natural-orderby/-/natural-orderby-3.0.2.tgz", - "integrity": "sha512-x7ZdOwBxZCEm9MM7+eQCjkrNLrW3rkBKNHVr78zbtqnMGVNlnDi6C/eUEYgxHNrcbu0ymvjzcwIL/6H1iHri9g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/natural-orderby/-/natural-orderby-5.0.0.tgz", + "integrity": "sha512-kKHJhxwpR/Okycz4HhQKKlhWe4ASEfPgkSWNmKFHd7+ezuQlxkA5cM3+XkBPvm1gmHen3w53qsYAv+8GwRrBlg==", "engines": { "node": ">=18" } @@ -5676,11 +5526,6 @@ "resolved": "https://registry.npmjs.org/node-cleanup/-/node-cleanup-2.1.2.tgz", "integrity": "sha512-qN8v/s2PAJwGUtr1/hYTpNKlD6Y9rc4p8KSmJXyGdYGZsDGKXrGThikLFP9OCHFeLeEpQzPwiAtdIvBLqm//Hw==" }, - "node_modules/node-gzip": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/node-gzip/-/node-gzip-1.1.2.tgz", - "integrity": "sha512-ZB6zWpfZHGtxZnPMrJSKHVPrRjURoUzaDbLFj3VO70mpLTW5np96vXyHwft4Id0o+PYIzgDkBUjIzaNHhQ8srw==" - }, "node_modules/node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -5836,6 +5681,11 @@ "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==" }, + "node_modules/pako": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz", + "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==" + }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -5897,26 +5747,26 @@ "peer": true }, "node_modules/path-scurry": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", - "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", + "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", "dependencies": { - "lru-cache": "^9.1.1 || ^10.0.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + "lru-cache": "^11.0.0", + "minipass": "^7.1.2" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", - "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.1.0.tgz", + "integrity": "sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==", "engines": { - "node": "14 || >=16.14" + "node": "20 || >=22" } }, "node_modules/path-to-regexp": { @@ -5940,14 +5790,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "engines": { - "node": ">=4" - } - }, "node_modules/pirates": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", @@ -5957,79 +5799,6 @@ "node": ">= 6" } }, - "node_modules/pkg-conf": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz", - "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=", - "dependencies": { - "find-up": "^2.0.0", - "load-json-file": "^4.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/pkg-conf/node_modules/find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dependencies": { - "locate-path": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/pkg-conf/node_modules/locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dependencies": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/pkg-conf/node_modules/p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dependencies": { - "p-try": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/pkg-conf/node_modules/p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dependencies": { - "p-limit": "^1.1.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/pkg-conf/node_modules/p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "engines": { - "node": ">=4" - } - }, - "node_modules/pkg-conf/node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "engines": { - "node": ">=4" - } - }, "node_modules/pkg-dir": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", @@ -6335,15 +6104,6 @@ "queue-microtask": "^1.2.2" } }, - "node_modules/run-script-os": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz", - "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==", - "bin": { - "run-os": "index.js", - "run-script-os": "index.js" - } - }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -6385,83 +6145,6 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "peer": true }, - "node_modules/signale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/signale/-/signale-1.4.0.tgz", - "integrity": "sha512-iuh+gPf28RkltuJC7W5MRi6XAjTDCAPC/prJUpQoG4vIP3MJZ+GTydVnodXA7pwvTKb2cA0m9OFZW/cdWy/I/w==", - "dependencies": { - "chalk": "^2.3.2", - "figures": "^2.0.0", - "pkg-conf": "^2.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/signale/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/signale/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/signale/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/signale/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - }, - "node_modules/signale/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/signale/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "engines": { - "node": ">=4" - } - }, - "node_modules/signale/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/simple-wcswidth": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/simple-wcswidth/-/simple-wcswidth-1.0.1.tgz", @@ -6723,6 +6406,11 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/timer-node": { + "version": "5.0.9", + "resolved": "https://registry.npmjs.org/timer-node/-/timer-node-5.0.9.tgz", + "integrity": "sha512-zXxCE/5/YDi0hY9pygqgRqjRbrFRzigYxOudG0I3syaqAAmX9/w9sxex1bNFCN6c1S66RwPtEIJv65dN+1psew==" + }, "node_modules/tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -7741,23 +7429,20 @@ } }, "@freearhey/core": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@freearhey/core/-/core-0.7.0.tgz", - "integrity": "sha512-HXkKPYGY7ife7JAc1q/Qxzy0WUdSnyt3rHThCShZHgnH3rz0tpkjHFW7LNegB3he0IKn/Zc95/YSOQ97Fq8ctA==", + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/@freearhey/core/-/core-0.8.2.tgz", + "integrity": "sha512-jlb1XUbhUf3lqD3B9Wmx3c8qYG4+s1I0cr2FFQfiMpJh4nMvfUNdJr2OhH31S/dbNP12ycT6RPVoZ2j2G3+mXA==", "requires": { - "@types/fs-extra": "^11.0.2", - "@types/lodash": "^4.14.198", - "@types/luxon": "^3.3.2", - "fs-extra": "^11.1.1", - "glob": "^10.3.4", + "consola": "^3.4.2", + "dayjs": "^1.11.13", + "fs-extra": "^11.3.0", + "glob": "^11.0.1", "lodash": "^4.17.21", - "luxon": "^3.4.3", - "natural-orderby": "^3.0.2", - "node-gzip": "^1.1.2", + "natural-orderby": "^5.0.0", "normalize-url": "^6.1.0", "object-treeify": "^2.1.1", - "run-script-os": "^1.1.6", - "signale": "^1.4.0" + "pako": "^2.1.0", + "timer-node": "^5.0.9" }, "dependencies": { "normalize-url": { @@ -7982,9 +7667,9 @@ }, "dependencies": { "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==" }, "ansi-styles": { "version": "6.2.1", @@ -8623,12 +8308,6 @@ "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz", "integrity": "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==" }, - "@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "optional": true - }, "@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", @@ -8712,9 +8391,9 @@ "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==" }, "@types/fs-extra": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.2.tgz", - "integrity": "sha512-c0hrgAOVYr21EX8J0jBMXGLMgJqVf/v6yxi0dLaJboW9aQPh16Id+z6w2Tx1hm+piJOLv8xPfVKZCLfjPw/IMQ==", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.4.tgz", + "integrity": "sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==", "requires": { "@types/jsonfile": "*", "@types/node": "*" @@ -8765,9 +8444,9 @@ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==" }, "@types/jsonfile": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.1.tgz", - "integrity": "sha512-GSgiRCVeapDN+3pqA35IkQwasaCh/0YFH5dEF6S88iDvEn901DjOeH3/QPY+XYP1DFzDZPvIvfeEgk+7br5png==", + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.4.tgz", + "integrity": "sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==", "requires": { "@types/node": "*" } @@ -8777,11 +8456,6 @@ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.198.tgz", "integrity": "sha512-trNJ/vtMZYMLhfN45uLq4ShQSw0/S7xCTLLVM+WM1rmFpba/VS42jVUgaO3w/NOLiWR/09lnYk0yMaA/atdIsg==" }, - "@types/luxon": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.3.2.tgz", - "integrity": "sha512-l5cpE57br4BIjK+9BSkFBOsWtwv6J9bJpC7gdXIzZyI0vuKvNTk0wZZrkQxMGsUAuGW9+WMNWF2IJMD7br2yeQ==" - }, "@types/node": { "version": "22.13.10", "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz", @@ -9318,6 +8992,11 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, + "consola": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz", + "integrity": "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==" + }, "console-table-printer": { "version": "2.12.1", "resolved": "https://registry.npmjs.org/console-table-printer/-/console-table-printer-2.12.1.tgz", @@ -9367,6 +9046,11 @@ "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-5.0.3.tgz", "integrity": "sha512-Kvr6HmPXUMerlLcLF+Pwq3K7apHpYmGDVqrxcDasBg86UcKeTSNWbEzU8bwdXnxnR44FtMhJAxI4Bov6Y/KUfA==" }, + "dayjs": { + "version": "1.11.13", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz", + "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==" + }, "debug": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", @@ -9443,6 +9127,7 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "peer": true, "requires": { "is-arrayish": "^0.2.1" }, @@ -9450,7 +9135,8 @@ "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "peer": true } } }, @@ -9726,21 +9412,6 @@ "bser": "2.1.1" } }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "requires": { - "escape-string-regexp": "^1.0.5" - }, - "dependencies": { - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" - } - } - }, "file-entry-cache": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", @@ -9838,9 +9509,9 @@ } }, "fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz", + "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==", "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -9848,9 +9519,9 @@ }, "dependencies": { "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==" } } }, @@ -9909,15 +9580,16 @@ } }, "glob": { - "version": "10.3.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.4.tgz", - "integrity": "sha512-6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.1.tgz", + "integrity": "sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw==", "requires": { "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", - "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", - "path-scurry": "^1.10.1" + "jackspeak": "^4.0.1", + "minimatch": "^10.0.0", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^2.0.0" }, "dependencies": { "brace-expansion": { @@ -9929,9 +9601,9 @@ } }, "minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", + "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", "requires": { "brace-expansion": "^2.0.1" } @@ -10255,12 +9927,11 @@ } }, "jackspeak": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.3.tgz", - "integrity": "sha512-R2bUw+kVZFS/h1AZqBKrSgDmdmjApzgY0AlCPumopFiAlbUxE2gf+SCuBzQ0cP5hHmUmFYF5yw55T97Th5Kstg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.0.tgz", + "integrity": "sha512-9DDdhb5j6cpeitCbvLO7n7J4IxnbM6hoF6O1g4HQ5TfhvvKN8ywDM7668ZhMHRqVmxqhps/F6syWK2KcPxYlkw==", "requires": { - "@isaacs/cliui": "^8.0.2", - "@pkgjs/parseargs": "^0.11.0" + "@isaacs/cliui": "^8.0.2" } }, "jake": { @@ -10761,11 +10432,6 @@ "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" }, - "json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" - }, "json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -10797,9 +10463,9 @@ }, "dependencies": { "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==" } } }, @@ -10838,33 +10504,6 @@ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", "peer": true }, - "load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - }, - "dependencies": { - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" - } - } - }, "locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -10897,11 +10536,6 @@ "yallist": "^3.0.2" } }, - "luxon": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz", - "integrity": "sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg==" - }, "m3u-linter": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/m3u-linter/-/m3u-linter-0.4.2.tgz", @@ -10913,61 +10547,10 @@ "is-valid-path": "^0.1.1" }, "dependencies": { - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "requires": { - "balanced-match": "^1.0.0" - } - }, "commander": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==" - }, - "glob": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz", - "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==", - "requires": { - "foreground-child": "^3.1.0", - "jackspeak": "^4.0.1", - "minimatch": "^10.0.0", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^2.0.0" - } - }, - "jackspeak": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.2.tgz", - "integrity": "sha512-bZsjR/iRjl1Nk1UkjGpAzLNfQtzuijhn2g+pbZb98HQ1Gk8vM9hfbxeMBP+M2/UUdwj0RqGG3mlvk2MsAqwvEw==", - "requires": { - "@isaacs/cliui": "^8.0.2" - } - }, - "lru-cache": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz", - "integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==" - }, - "minimatch": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", - "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", - "requires": { - "brace-expansion": "^2.0.1" - } - }, - "path-scurry": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", - "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", - "requires": { - "lru-cache": "^11.0.0", - "minipass": "^7.1.2" - } } } }, @@ -11102,20 +10685,15 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" }, "natural-orderby": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/natural-orderby/-/natural-orderby-3.0.2.tgz", - "integrity": "sha512-x7ZdOwBxZCEm9MM7+eQCjkrNLrW3rkBKNHVr78zbtqnMGVNlnDi6C/eUEYgxHNrcbu0ymvjzcwIL/6H1iHri9g==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/natural-orderby/-/natural-orderby-5.0.0.tgz", + "integrity": "sha512-kKHJhxwpR/Okycz4HhQKKlhWe4ASEfPgkSWNmKFHd7+ezuQlxkA5cM3+XkBPvm1gmHen3w53qsYAv+8GwRrBlg==" }, "node-cleanup": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/node-cleanup/-/node-cleanup-2.1.2.tgz", "integrity": "sha512-qN8v/s2PAJwGUtr1/hYTpNKlD6Y9rc4p8KSmJXyGdYGZsDGKXrGThikLFP9OCHFeLeEpQzPwiAtdIvBLqm//Hw==" }, - "node-gzip": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/node-gzip/-/node-gzip-1.1.2.tgz", - "integrity": "sha512-ZB6zWpfZHGtxZnPMrJSKHVPrRjURoUzaDbLFj3VO70mpLTW5np96vXyHwft4Id0o+PYIzgDkBUjIzaNHhQ8srw==" - }, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -11226,6 +10804,11 @@ "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==" }, + "pako": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz", + "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==" + }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -11269,18 +10852,18 @@ "peer": true }, "path-scurry": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", - "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", + "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", "requires": { - "lru-cache": "^9.1.1 || ^10.0.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + "lru-cache": "^11.0.0", + "minipass": "^7.1.2" }, "dependencies": { "lru-cache": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", - "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==" + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.1.0.tgz", + "integrity": "sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==" } } }, @@ -11299,71 +10882,12 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - }, "pirates": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", "peer": true }, - "pkg-conf": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz", - "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=", - "requires": { - "find-up": "^2.0.0", - "load-json-file": "^4.0.0" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "requires": { - "locate-path": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" - } - } - }, "pkg-dir": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", @@ -11560,11 +11084,6 @@ "queue-microtask": "^1.2.2" } }, - "run-script-os": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz", - "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==" - }, "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -11594,67 +11113,6 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "peer": true }, - "signale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/signale/-/signale-1.4.0.tgz", - "integrity": "sha512-iuh+gPf28RkltuJC7W5MRi6XAjTDCAPC/prJUpQoG4vIP3MJZ+GTydVnodXA7pwvTKb2cA0m9OFZW/cdWy/I/w==", - "requires": { - "chalk": "^2.3.2", - "figures": "^2.0.0", - "pkg-conf": "^2.1.0" - }, - "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": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" - }, - "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" - } - } - } - }, "simple-wcswidth": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/simple-wcswidth/-/simple-wcswidth-1.0.1.tgz", @@ -11846,6 +11304,11 @@ } } }, + "timer-node": { + "version": "5.0.9", + "resolved": "https://registry.npmjs.org/timer-node/-/timer-node-5.0.9.tgz", + "integrity": "sha512-zXxCE/5/YDi0hY9pygqgRqjRbrFRzigYxOudG0I3syaqAAmX9/w9sxex1bNFCN6c1S66RwPtEIJv65dN+1psew==" + }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", diff --git a/package.json b/package.json index 6533852a23..c03d75ccc4 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "dependencies": { "@eslint/eslintrc": "^3.3.0", "@eslint/js": "^9.21.0", - "@freearhey/core": "^0.7.0", + "@freearhey/core": "^0.8.2", "@freearhey/search-js": "^0.1.2", "@inquirer/prompts": "^7.4.1", "@octokit/core": "^6.1.4", @@ -48,6 +48,7 @@ "@octokit/plugin-rest-endpoint-methods": "^7.1.3", "@octokit/types": "^11.1.0", "@types/cli-progress": "^3.11.3", + "@types/fs-extra": "^11.0.4", "@types/jest": "^29.5.14", "@types/lodash": "^4.14.198", "@types/numeral": "^2.0.3", diff --git a/yarn.lock b/yarn.lock index 94e14d2f5d..1491b68a9a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -366,24 +366,21 @@ "@eslint/core" "^0.12.0" levn "^0.4.1" -"@freearhey/core@^0.7.0": - version "0.7.0" - resolved "https://registry.npmjs.org/@freearhey/core/-/core-0.7.0.tgz" - integrity sha512-HXkKPYGY7ife7JAc1q/Qxzy0WUdSnyt3rHThCShZHgnH3rz0tpkjHFW7LNegB3he0IKn/Zc95/YSOQ97Fq8ctA== +"@freearhey/core@^0.8.2": + version "0.8.2" + resolved "https://registry.npmjs.org/@freearhey/core/-/core-0.8.2.tgz" + integrity sha512-jlb1XUbhUf3lqD3B9Wmx3c8qYG4+s1I0cr2FFQfiMpJh4nMvfUNdJr2OhH31S/dbNP12ycT6RPVoZ2j2G3+mXA== dependencies: - "@types/fs-extra" "^11.0.2" - "@types/lodash" "^4.14.198" - "@types/luxon" "^3.3.2" - fs-extra "^11.1.1" - glob "^10.3.4" + consola "^3.4.2" + dayjs "^1.11.13" + fs-extra "^11.3.0" + glob "^11.0.1" lodash "^4.17.21" - luxon "^3.4.3" - natural-orderby "^3.0.2" - node-gzip "^1.1.2" + natural-orderby "^5.0.0" normalize-url "^6.1.0" object-treeify "^2.1.1" - run-script-os "^1.1.6" - signale "^1.4.0" + pako "^2.1.0" + timer-node "^5.0.9" "@freearhey/search-js@^0.1.2": version "0.1.2" @@ -967,11 +964,6 @@ resolved "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz" integrity sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg== -"@pkgjs/parseargs@^0.11.0": - version "0.11.0" - resolved "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz" - integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== - "@sinclair/typebox@^0.27.8": version "0.27.8" resolved "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz" @@ -1041,10 +1033,10 @@ resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz" integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw== -"@types/fs-extra@^11.0.2": - version "11.0.2" - resolved "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.2.tgz" - integrity sha512-c0hrgAOVYr21EX8J0jBMXGLMgJqVf/v6yxi0dLaJboW9aQPh16Id+z6w2Tx1hm+piJOLv8xPfVKZCLfjPw/IMQ== +"@types/fs-extra@^11.0.4": + version "11.0.4" + resolved "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.4.tgz" + integrity sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ== dependencies: "@types/jsonfile" "*" "@types/node" "*" @@ -1089,9 +1081,9 @@ integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== "@types/jsonfile@*": - version "6.1.1" - resolved "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.1.tgz" - integrity sha512-GSgiRCVeapDN+3pqA35IkQwasaCh/0YFH5dEF6S88iDvEn901DjOeH3/QPY+XYP1DFzDZPvIvfeEgk+7br5png== + version "6.1.4" + resolved "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.4.tgz" + integrity sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ== dependencies: "@types/node" "*" @@ -1100,11 +1092,6 @@ resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.198.tgz" integrity sha512-trNJ/vtMZYMLhfN45uLq4ShQSw0/S7xCTLLVM+WM1rmFpba/VS42jVUgaO3w/NOLiWR/09lnYk0yMaA/atdIsg== -"@types/luxon@^3.3.2": - version "3.3.2" - resolved "https://registry.npmjs.org/@types/luxon/-/luxon-3.3.2.tgz" - integrity sha512-l5cpE57br4BIjK+9BSkFBOsWtwv6J9bJpC7gdXIzZyI0vuKvNTk0wZZrkQxMGsUAuGW9+WMNWF2IJMD7br2yeQ== - "@types/node@*", "@types/node@>=18": version "22.13.10" resolved "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz" @@ -1263,16 +1250,9 @@ ansi-regex@^5.0.1: integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-regex@^6.0.1: - version "6.0.1" - resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz" - integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== - -ansi-styles@^3.2.1: - 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" + version "6.1.0" + resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz" + integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA== ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" @@ -1486,15 +1466,6 @@ caniuse-lite@^1.0.30001688: resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz" integrity sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w== -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== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.1, chalk@^4.1.2: version "4.1.2" resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" @@ -1554,13 +1525,6 @@ collect-v8-coverage@^1.0.0: resolved "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz" integrity sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q== -color-convert@^1.9.0: - 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" - color-convert@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz" @@ -1573,11 +1537,6 @@ color-name@~1.1.4: resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - colors@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz" @@ -1615,6 +1574,11 @@ concat-map@0.0.1: resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== +consola@^3.4.2: + version "3.4.2" + resolved "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz" + integrity sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA== + console-table-printer@^2.12.1: version "2.12.1" resolved "https://registry.npmjs.org/console-table-printer/-/console-table-printer-2.12.1.tgz" @@ -1659,6 +1623,11 @@ dateformat@^5.0.3: resolved "https://registry.npmjs.org/dateformat/-/dateformat-5.0.3.tgz" integrity sha512-Kvr6HmPXUMerlLcLF+Pwq3K7apHpYmGDVqrxcDasBg86UcKeTSNWbEzU8bwdXnxnR44FtMhJAxI4Bov6Y/KUfA== +dayjs@^1.11.13: + version "1.11.13" + resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz" + integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg== + debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: version "4.4.0" resolved "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz" @@ -1771,11 +1740,6 @@ escalade@^3.1.1, escalade@^3.2.0: resolved "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz" integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - escape-string-regexp@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz" @@ -1968,13 +1932,6 @@ fb-watchman@^2.0.0: dependencies: bser "2.1.1" -figures@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz" - integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= - dependencies: - escape-string-regexp "^1.0.5" - file-entry-cache@^8.0.0: version "8.0.0" resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz" @@ -1996,13 +1953,6 @@ fill-range@^7.1.1: dependencies: to-regex-range "^5.0.1" -find-up@^2.0.0: - version "2.1.0" - resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz" - integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= - dependencies: - locate-path "^2.0.0" - find-up@^4.0.0: version "4.1.0" resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz" @@ -2062,10 +2012,10 @@ form-data@^4.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" -fs-extra@^11.1.1: - version "11.1.1" - resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz" - integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ== +fs-extra@^11.3.0: + version "11.3.0" + resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz" + integrity sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -2132,21 +2082,10 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob@^10.3.4: - version "10.3.4" - resolved "https://registry.npmjs.org/glob/-/glob-10.3.4.tgz" - integrity sha512-6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ== - dependencies: - foreground-child "^3.1.0" - jackspeak "^2.0.3" - minimatch "^9.0.1" - minipass "^5.0.0 || ^6.0.2 || ^7.0.0" - path-scurry "^1.10.1" - -glob@^11.0.0: - version "11.0.0" - resolved "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz" - integrity sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g== +glob@^11.0.0, glob@^11.0.1: + version "11.0.1" + resolved "https://registry.npmjs.org/glob/-/glob-11.0.1.tgz" + integrity sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw== dependencies: foreground-child "^3.1.0" jackspeak "^4.0.1" @@ -2194,7 +2133,7 @@ globals@^16.0.0: resolved "https://registry.npmjs.org/globals/-/globals-16.0.0.tgz" integrity sha512-iInW14XItCXET01CQFqudPOWP2jYMl7T+QRQT+UNcR/iQncN/F0UNpgd76iFkBPgNQb4+X3LV9tLJYzwh+Gl3A== -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.9: +graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.9: version "4.2.9" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz" integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== @@ -2209,11 +2148,6 @@ graphql@^16.8.1: resolved "https://registry.npmjs.org/graphql/-/graphql-16.10.0.tgz" integrity sha512-AjqGKbDGUFRKIRCP9tCKiIGHyriz2oHEbPIbEtcSLSs4YjReZOIPQQWek4+6hjw62H9QShXHyaGivGiYVLeYFQ== -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= - has-flag@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz" @@ -2484,19 +2418,10 @@ istanbul-reports@^3.1.3: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jackspeak@^2.0.3: - version "2.3.3" - resolved "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.3.tgz" - integrity sha512-R2bUw+kVZFS/h1AZqBKrSgDmdmjApzgY0AlCPumopFiAlbUxE2gf+SCuBzQ0cP5hHmUmFYF5yw55T97Th5Kstg== - dependencies: - "@isaacs/cliui" "^8.0.2" - optionalDependencies: - "@pkgjs/parseargs" "^0.11.0" - jackspeak@^4.0.1: - version "4.0.2" - resolved "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.2.tgz" - integrity sha512-bZsjR/iRjl1Nk1UkjGpAzLNfQtzuijhn2g+pbZb98HQ1Gk8vM9hfbxeMBP+M2/UUdwj0RqGG3mlvk2MsAqwvEw== + version "4.1.0" + resolved "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.0.tgz" + integrity sha512-9DDdhb5j6cpeitCbvLO7n7J4IxnbM6hoF6O1g4HQ5TfhvvKN8ywDM7668ZhMHRqVmxqhps/F6syWK2KcPxYlkw== dependencies: "@isaacs/cliui" "^8.0.2" @@ -2908,11 +2833,6 @@ json-buffer@3.0.1: resolved "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz" integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== -json-parse-better-errors@^1.0.1: - version "1.0.2" - resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz" - integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== - json-parse-even-better-errors@^2.3.0: version "2.3.1" resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz" @@ -2972,24 +2892,6 @@ lines-and-columns@^1.1.6: resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== -load-json-file@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz" - integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= - dependencies: - graceful-fs "^4.1.2" - parse-json "^4.0.0" - pify "^3.0.0" - strip-bom "^3.0.0" - -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz" - integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= - dependencies: - p-locate "^2.0.0" - path-exists "^3.0.0" - locate-path@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz" @@ -3020,9 +2922,9 @@ lodash@^4.17.21: integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== lru-cache@^11.0.0: - version "11.0.2" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz" - integrity sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA== + version "11.1.0" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-11.1.0.tgz" + integrity sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A== lru-cache@^5.1.1: version "5.1.1" @@ -3031,16 +2933,6 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" -"lru-cache@^9.1.1 || ^10.0.0": - version "10.0.1" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz" - integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g== - -luxon@^3.4.3: - version "3.4.3" - resolved "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz" - integrity sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg== - m3u-linter@^0.4.2: version "0.4.2" resolved "https://registry.npmjs.org/m3u-linter/-/m3u-linter-0.4.2.tgz" @@ -3133,13 +3025,6 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^9.0.1: - version "9.0.3" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz" - integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== - dependencies: - brace-expansion "^2.0.1" - minimatch@^9.0.4: version "9.0.5" resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz" @@ -3147,7 +3032,7 @@ minimatch@^9.0.4: dependencies: brace-expansion "^2.0.1" -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2: +minipass@^7.1.2: version "7.1.2" resolved "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz" integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== @@ -3191,21 +3076,16 @@ natural-compare@^1.4.0: resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== -natural-orderby@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/natural-orderby/-/natural-orderby-3.0.2.tgz" - integrity sha512-x7ZdOwBxZCEm9MM7+eQCjkrNLrW3rkBKNHVr78zbtqnMGVNlnDi6C/eUEYgxHNrcbu0ymvjzcwIL/6H1iHri9g== +natural-orderby@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/natural-orderby/-/natural-orderby-5.0.0.tgz" + integrity sha512-kKHJhxwpR/Okycz4HhQKKlhWe4ASEfPgkSWNmKFHd7+ezuQlxkA5cM3+XkBPvm1gmHen3w53qsYAv+8GwRrBlg== node-cleanup@^2.1.2: version "2.1.2" resolved "https://registry.npmjs.org/node-cleanup/-/node-cleanup-2.1.2.tgz" integrity sha512-qN8v/s2PAJwGUtr1/hYTpNKlD6Y9rc4p8KSmJXyGdYGZsDGKXrGThikLFP9OCHFeLeEpQzPwiAtdIvBLqm//Hw== -node-gzip@^1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/node-gzip/-/node-gzip-1.1.2.tgz" - integrity sha512-ZB6zWpfZHGtxZnPMrJSKHVPrRjURoUzaDbLFj3VO70mpLTW5np96vXyHwft4Id0o+PYIzgDkBUjIzaNHhQ8srw== - node-int64@^0.4.0: version "0.4.0" resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz" @@ -3284,13 +3164,6 @@ outvariant@^1.4.0, outvariant@^1.4.3: resolved "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz" integrity sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA== -p-limit@^1.1.0: - version "1.3.0" - resolved "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz" - integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== - dependencies: - p-try "^1.0.0" - p-limit@^2.2.0: version "2.3.0" resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz" @@ -3305,13 +3178,6 @@ p-limit@^3.0.2, p-limit@^3.1.0: dependencies: yocto-queue "^0.1.0" -p-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz" - integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= - dependencies: - p-limit "^1.1.0" - p-locate@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz" @@ -3326,11 +3192,6 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" -p-try@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz" - integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= - p-try@^2.0.0: version "2.2.0" resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz" @@ -3341,6 +3202,11 @@ package-json-from-dist@^1.0.0: resolved "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz" integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw== +pako@^2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz" + integrity sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug== + parent-module@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz" @@ -3348,14 +3214,6 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parse-json@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz" - integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= - dependencies: - error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" - parse-json@^5.2.0: version "5.2.0" resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz" @@ -3366,11 +3224,6 @@ parse-json@^5.2.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= - path-exists@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz" @@ -3391,14 +3244,6 @@ path-parse@^1.0.7: resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-scurry@^1.10.1: - version "1.10.1" - resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz" - integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== - dependencies: - lru-cache "^9.1.1 || ^10.0.0" - minipass "^5.0.0 || ^6.0.2 || ^7.0.0" - path-scurry@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz" @@ -3422,24 +3267,11 @@ picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1: resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz" - integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= - pirates@^4.0.4: version "4.0.6" resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz" integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== -pkg-conf@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz" - integrity sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg= - dependencies: - find-up "^2.0.0" - load-json-file "^4.0.0" - pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz" @@ -3574,11 +3406,6 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -run-script-os@^1.1.6: - version "1.1.6" - resolved "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz" - integrity sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw== - "safer-buffer@>= 2.1.2 < 3": version "2.1.2" resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" @@ -3626,15 +3453,6 @@ signal-exit@^4.1.0: resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz" integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== -signale@^1.4.0: - version "1.4.0" - resolved "https://registry.npmjs.org/signale/-/signale-1.4.0.tgz" - integrity sha512-iuh+gPf28RkltuJC7W5MRi6XAjTDCAPC/prJUpQoG4vIP3MJZ+GTydVnodXA7pwvTKb2cA0m9OFZW/cdWy/I/w== - dependencies: - chalk "^2.3.2" - figures "^2.0.0" - pkg-conf "^2.1.0" - simple-wcswidth@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/simple-wcswidth/-/simple-wcswidth-1.0.1.tgz" @@ -3768,11 +3586,6 @@ strip-ansi@^7.0.1: dependencies: ansi-regex "^6.0.1" -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz" - integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= - strip-bom@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz" @@ -3788,13 +3601,6 @@ strip-json-comments@^3.1.1: resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -supports-color@^5.3.0: - 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" - supports-color@^7.1.0: version "7.2.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz" @@ -3823,6 +3629,11 @@ test-exclude@^6.0.0: glob "^7.1.4" minimatch "^3.0.4" +timer-node@^5.0.9: + version "5.0.9" + resolved "https://registry.npmjs.org/timer-node/-/timer-node-5.0.9.tgz" + integrity sha512-zXxCE/5/YDi0hY9pygqgRqjRbrFRzigYxOudG0I3syaqAAmX9/w9sxex1bNFCN6c1S66RwPtEIJv65dN+1psew== + tmp@^0.0.33: version "0.0.33" resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz" @@ -3925,9 +3736,9 @@ universalify@^0.2.0: integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== universalify@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz" - integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== + version "2.0.1" + resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz" + integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw== update-browserslist-db@^1.1.1: version "1.1.1" From e82155e38ede595017dd12c8ddfc8b3cd0e4ba8e Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 23 Apr 2025 20:56:02 +0300 Subject: [PATCH 31/40] Update tests/__data__ --- .../input/readme_update/generators.log | 148 +++++++++--------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/tests/__data__/input/readme_update/generators.log b/tests/__data__/input/readme_update/generators.log index 63cfea0585..55adb62b06 100644 --- a/tests/__data__/input/readme_update/generators.log +++ b/tests/__data__/input/readme_update/generators.log @@ -1,75 +1,75 @@ -{"type":"category","filepath":"categories/auto.m3u","count":0} -{"type":"category","filepath":"categories/animation.m3u","count":0} -{"type":"category","filepath":"categories/business.m3u","count":0} -{"type":"category","filepath":"categories/classic.m3u","count":0} -{"type":"category","filepath":"categories/comedy.m3u","count":0} -{"type":"category","filepath":"categories/cooking.m3u","count":0} -{"type":"category","filepath":"categories/culture.m3u","count":0} -{"type":"category","filepath":"categories/documentary.m3u","count":0} -{"type":"category","filepath":"categories/education.m3u","count":0} -{"type":"category","filepath":"categories/entertainment.m3u","count":0} -{"type":"category","filepath":"categories/family.m3u","count":0} -{"type":"category","filepath":"categories/general.m3u","count":2} -{"type":"category","filepath":"categories/kids.m3u","count":0} -{"type":"category","filepath":"categories/legislative.m3u","count":0} -{"type":"category","filepath":"categories/lifestyle.m3u","count":0} -{"type":"category","filepath":"categories/movies.m3u","count":0} -{"type":"category","filepath":"categories/music.m3u","count":0} -{"type":"category","filepath":"categories/news.m3u","count":1} -{"type":"category","filepath":"categories/outdoor.m3u","count":0} -{"type":"category","filepath":"categories/relax.m3u","count":0} -{"type":"category","filepath":"categories/religious.m3u","count":0} -{"type":"category","filepath":"categories/series.m3u","count":0} -{"type":"category","filepath":"categories/science.m3u","count":0} -{"type":"category","filepath":"categories/shop.m3u","count":0} -{"type":"category","filepath":"categories/sports.m3u","count":0} -{"type":"category","filepath":"categories/travel.m3u","count":0} -{"type":"category","filepath":"categories/weather.m3u","count":1} -{"type":"category","filepath":"categories/xxx.m3u","count":1} -{"type":"category","filepath":"categories/undefined.m3u","count":3} -{"type":"country","filepath":"countries/cm.m3u","count":1} -{"type":"country","filepath":"countries/ca.m3u","count":2} -{"type":"country","filepath":"countries/cv.m3u","count":1} -{"type":"country","filepath":"countries/cg.m3u","count":1} -{"type":"country","filepath":"countries/ro.m3u","count":1} -{"type":"subdivision","filepath":"subdivisions/ca-on.m3u","count":1} -{"type":"country","filepath":"countries/ru.m3u","count":2} -{"type":"country","filepath":"countries/rw.m3u","count":1} -{"type":"country","filepath":"countries/re.m3u","count":1} -{"type":"country","filepath":"countries/undefined.m3u","count":2} -{"type":"country","filepath":"countries/bl.m3u","count":1} -{"type":"country","filepath":"countries/sh.m3u","count":1} -{"type":"country","filepath":"countries/kn.m3u","count":1} -{"type":"language","filepath":"languages/cat.m3u","count":1} -{"type":"language","filepath":"languages/eng.m3u","count":1} -{"type":"language","filepath":"languages/fra.m3u","count":1} -{"type":"language","filepath":"languages/rus.m3u","count":1} -{"type":"language","filepath":"languages/undefined.m3u","count":2} -{"type":"region","filepath":"regions/afr.m3u","count":0} -{"type":"region","filepath":"regions/amer.m3u","count":1} -{"type":"region","filepath":"regions/apac.m3u","count":1} -{"type":"region","filepath":"regions/arab.m3u","count":0} -{"type":"region","filepath":"regions/asean.m3u","count":0} -{"type":"region","filepath":"regions/asia.m3u","count":2} -{"type":"region","filepath":"regions/carib.m3u","count":0} -{"type":"region","filepath":"regions/cas.m3u","count":0} -{"type":"region","filepath":"regions/cenamer.m3u","count":0} -{"type":"region","filepath":"regions/cis.m3u","count":1} -{"type":"region","filepath":"regions/emea.m3u","count":3} -{"type":"region","filepath":"regions/eur.m3u","count":3} -{"type":"region","filepath":"regions/hispam.m3u","count":0} -{"type":"region","filepath":"regions/lac.m3u","count":0} -{"type":"region","filepath":"regions/latam.m3u","count":0} -{"type":"region","filepath":"regions/maghreb.m3u","count":0} -{"type":"region","filepath":"regions/mena.m3u","count":0} -{"type":"region","filepath":"regions/mideast.m3u","count":0} -{"type":"region","filepath":"regions/nam.m3u","count":1} -{"type":"region","filepath":"regions/noram.m3u","count":1} -{"type":"region","filepath":"regions/nord.m3u","count":0} -{"type":"region","filepath":"regions/oce.m3u","count":0} -{"type":"region","filepath":"regions/undefined.m3u","count":2} -{"type":"region","filepath":"regions/sas.m3u","count":1} -{"type":"region","filepath":"regions/int.m3u","count":1} -{"type":"region","filepath":"regions/southam.m3u","count":0} -{"type":"region","filepath":"regions/ssa.m3u","count":0} +{"type":"category","filepath":"categories/auto.m3u","count":0} +{"type":"category","filepath":"categories/animation.m3u","count":0} +{"type":"category","filepath":"categories/business.m3u","count":0} +{"type":"category","filepath":"categories/classic.m3u","count":0} +{"type":"category","filepath":"categories/comedy.m3u","count":0} +{"type":"category","filepath":"categories/cooking.m3u","count":0} +{"type":"category","filepath":"categories/culture.m3u","count":0} +{"type":"category","filepath":"categories/documentary.m3u","count":0} +{"type":"category","filepath":"categories/education.m3u","count":0} +{"type":"category","filepath":"categories/entertainment.m3u","count":0} +{"type":"category","filepath":"categories/family.m3u","count":0} +{"type":"category","filepath":"categories/general.m3u","count":2} +{"type":"category","filepath":"categories/kids.m3u","count":0} +{"type":"category","filepath":"categories/legislative.m3u","count":0} +{"type":"category","filepath":"categories/lifestyle.m3u","count":0} +{"type":"category","filepath":"categories/movies.m3u","count":0} +{"type":"category","filepath":"categories/music.m3u","count":0} +{"type":"category","filepath":"categories/news.m3u","count":1} +{"type":"category","filepath":"categories/outdoor.m3u","count":0} +{"type":"category","filepath":"categories/relax.m3u","count":0} +{"type":"category","filepath":"categories/religious.m3u","count":0} +{"type":"category","filepath":"categories/series.m3u","count":0} +{"type":"category","filepath":"categories/science.m3u","count":0} +{"type":"category","filepath":"categories/shop.m3u","count":0} +{"type":"category","filepath":"categories/sports.m3u","count":0} +{"type":"category","filepath":"categories/travel.m3u","count":0} +{"type":"category","filepath":"categories/weather.m3u","count":1} +{"type":"category","filepath":"categories/xxx.m3u","count":1} +{"type":"category","filepath":"categories/undefined.m3u","count":3} +{"type":"country","filepath":"countries/cm.m3u","count":1} +{"type":"country","filepath":"countries/ca.m3u","count":2} +{"type":"country","filepath":"countries/cv.m3u","count":1} +{"type":"country","filepath":"countries/cg.m3u","count":1} +{"type":"country","filepath":"countries/ro.m3u","count":1} +{"type":"subdivision","filepath":"subdivisions/ca-on.m3u","count":1} +{"type":"country","filepath":"countries/ru.m3u","count":2} +{"type":"country","filepath":"countries/rw.m3u","count":1} +{"type":"country","filepath":"countries/re.m3u","count":1} +{"type":"country","filepath":"countries/undefined.m3u","count":2} +{"type":"country","filepath":"countries/bl.m3u","count":1} +{"type":"country","filepath":"countries/sh.m3u","count":1} +{"type":"country","filepath":"countries/kn.m3u","count":1} +{"type":"language","filepath":"languages/cat.m3u","count":1} +{"type":"language","filepath":"languages/eng.m3u","count":1} +{"type":"language","filepath":"languages/fra.m3u","count":1} +{"type":"language","filepath":"languages/rus.m3u","count":1} +{"type":"language","filepath":"languages/undefined.m3u","count":2} +{"type":"region","filepath":"regions/afr.m3u","count":0} +{"type":"region","filepath":"regions/amer.m3u","count":1} +{"type":"region","filepath":"regions/apac.m3u","count":1} +{"type":"region","filepath":"regions/arab.m3u","count":0} +{"type":"region","filepath":"regions/asean.m3u","count":0} +{"type":"region","filepath":"regions/asia.m3u","count":2} +{"type":"region","filepath":"regions/carib.m3u","count":0} +{"type":"region","filepath":"regions/cas.m3u","count":0} +{"type":"region","filepath":"regions/cenamer.m3u","count":0} +{"type":"region","filepath":"regions/cis.m3u","count":1} +{"type":"region","filepath":"regions/emea.m3u","count":3} +{"type":"region","filepath":"regions/eur.m3u","count":3} +{"type":"region","filepath":"regions/hispam.m3u","count":0} +{"type":"region","filepath":"regions/lac.m3u","count":0} +{"type":"region","filepath":"regions/latam.m3u","count":0} +{"type":"region","filepath":"regions/maghreb.m3u","count":0} +{"type":"region","filepath":"regions/mena.m3u","count":0} +{"type":"region","filepath":"regions/mideast.m3u","count":0} +{"type":"region","filepath":"regions/nam.m3u","count":1} +{"type":"region","filepath":"regions/noram.m3u","count":1} +{"type":"region","filepath":"regions/nord.m3u","count":0} +{"type":"region","filepath":"regions/oce.m3u","count":0} +{"type":"region","filepath":"regions/undefined.m3u","count":2} +{"type":"region","filepath":"regions/sas.m3u","count":1} +{"type":"region","filepath":"regions/int.m3u","count":1} +{"type":"region","filepath":"regions/southam.m3u","count":0} +{"type":"region","filepath":"regions/ssa.m3u","count":0} {"type":"region","filepath":"regions/wafr.m3u","count":0} \ No newline at end of file From 7f78b5770ecbd73480ce16a239650a5bb8388ddf Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 23 Apr 2025 20:56:11 +0300 Subject: [PATCH 32/40] Update tests --- tests/commands/playlist/edit.test.ts | 1 - tests/commands/playlist/generate.test.ts | 6 ++-- tests/commands/playlist/test.test.ts | 15 +++------- tests/commands/playlist/validate.test.ts | 36 +++++++++++------------- 4 files changed, 24 insertions(+), 34 deletions(-) diff --git a/tests/commands/playlist/edit.test.ts b/tests/commands/playlist/edit.test.ts index 4651e5ef88..3334b6dee5 100644 --- a/tests/commands/playlist/edit.test.ts +++ b/tests/commands/playlist/edit.test.ts @@ -39,5 +39,4 @@ function checkStdout(stdout: string) { expect(stdout).toContain('TF1.fr (TF1, Télévision française 1)') expect(stdout).toContain('Type...') expect(stdout).toContain('Skip') - expect(stdout).toContain("File 'tests/__data__/output/playlist.m3u' successfully saved") } diff --git a/tests/commands/playlist/generate.test.ts b/tests/commands/playlist/generate.test.ts index fa27be5b1f..4e14d0d30b 100644 --- a/tests/commands/playlist/generate.test.ts +++ b/tests/commands/playlist/generate.test.ts @@ -1,8 +1,8 @@ import { pathToFileURL } from 'node:url' import { execSync } from 'child_process' +import os, { EOL } from 'node:os' import * as fs from 'fs-extra' import * as glob from 'glob' -import os from 'os' let ENV_VAR = 'STREAMS_DIR=tests/__data__/input/playlist_generate DATA_DIR=tests/__data__/input/data PUBLIC_DIR=tests/__data__/output/.gh-pages LOGS_DIR=tests/__data__/output/logs' @@ -36,8 +36,8 @@ describe('playlist:generate', () => { ) }) - expect(content('tests/__data__/output/logs/generators.log').split('\n').sort()).toStrictEqual( - content('tests/__data__/expected/playlist_generate/logs/generators.log').split('\n').sort() + expect(content('tests/__data__/output/logs/generators.log').split(EOL).sort()).toStrictEqual( + content('tests/__data__/expected/playlist_generate/logs/generators.log').split(EOL).sort() ) }) }) diff --git a/tests/commands/playlist/test.test.ts b/tests/commands/playlist/test.test.ts index 1b42c3d585..515dbf824c 100644 --- a/tests/commands/playlist/test.test.ts +++ b/tests/commands/playlist/test.test.ts @@ -1,6 +1,6 @@ import { execSync } from 'child_process' import path from 'node:path' -import os from 'os' +import os from 'node:os' type ExecError = { status: number @@ -16,22 +16,15 @@ describe('playlist:test', () => { it('shows an error if the playlist contains a broken link', () => { const cmd = `${ENV_VAR} npm run playlist:test playlist_test/ag.m3u` try { - const stdout = execSync(cmd, { encoding: 'utf8' }) - if (process.env.DEBUG === 'true') console.log(cmd, stdout) - checkStdout(stdout) + execSync(cmd, { encoding: 'utf8' }) } catch (error) { - // NOTE: for Windows only if (process.env.DEBUG === 'true') console.log(cmd, error) - checkStdout((error as ExecError).stdout) + expect((error as ExecError).stdout).toContain(slash('playlist_test/ag.m3u')) + expect((error as ExecError).stdout).toContain('2 problems (1 errors, 1 warnings)') } }) }) -function checkStdout(stdout: string) { - expect(stdout).toContain(slash('playlist_test/ag.m3u')) - expect(stdout).toContain('2 problems (1 errors, 1 warnings)') -} - function slash(filepath: string) { return filepath.split(path.sep).join(path.posix.sep) } diff --git a/tests/commands/playlist/validate.test.ts b/tests/commands/playlist/validate.test.ts index 933099bc9c..feef97bbfa 100644 --- a/tests/commands/playlist/validate.test.ts +++ b/tests/commands/playlist/validate.test.ts @@ -17,31 +17,29 @@ describe('playlist:validate', () => { it('show an error if channel id in the blocklist', () => { const cmd = `${ENV_VAR} npm run playlist:validate -- us_blocked.m3u` try { - const stdout = execSync(cmd, { encoding: 'utf8' }) - if (process.env.DEBUG === 'true') console.log(cmd, stdout) - checkStdout(stdout) + execSync(cmd, { encoding: 'utf8' }) } catch (error) { - // NOTE: for Windows only if (process.env.DEBUG === 'true') console.log(cmd, error) - checkStdout((error as ExecError).stdout) + expect((error as ExecError).stdout).toContain('us_blocked.m3u') + expect((error as ExecError).stdout).toContain( + '2 error "FoxSports2.us" is on the blocklist due to claims of copyright holders (https://github.com/iptv-org/iptv/issues/0002)' + ) + expect((error as ExecError).stdout).toContain( + '4 error "TVN.pl" is on the blocklist due to NSFW content (https://github.com/iptv-org/iptv/issues/0003)' + ) + expect((error as ExecError).stdout).toContain('2 problems (2 errors, 0 warnings)') } }) it('show a warning if channel has wrong id', () => { const cmd = `${ENV_VAR} npm run playlist:validate -- wrong_id.m3u` - const stdout = execSync(cmd, { encoding: 'utf8' }) - if (process.env.DEBUG === 'true') console.log(cmd, stdout) - - expect(stdout).toContain( - 'wrong_id.m3u\n 2 warning "qib22lAq1L.us" is not in the database\n\n1 problems (0 errors, 1 warnings)\n' - ) + try { + execSync(cmd, { encoding: 'utf8' }) + } catch (error) { + if (process.env.DEBUG === 'true') console.log(cmd, error) + expect((error as ExecError).stdout).toContain( + 'wrong_id.m3u\n 2 warning "qib22lAq1L.us" is not in the database\n\n1 problems (0 errors, 1 warnings)\n' + ) + } }) }) - -function checkStdout(stdout: string) { - expect(stdout).toContain(`us_blocked.m3u - 2 error "FoxSports2.us" is on the blocklist due to claims of copyright holders (https://github.com/iptv-org/iptv/issues/0002) - 4 error "TVN.pl" is on the blocklist due to NSFW content (https://github.com/iptv-org/iptv/issues/0003) - -2 problems (2 errors, 0 warnings)`) -} From e6354bdd2390cb4e1102419dd3f1c90b99c07091 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 23 Apr 2025 20:56:19 +0300 Subject: [PATCH 33/40] Update scripts --- scripts/commands/playlist/edit.ts | 2 +- scripts/commands/playlist/generate.ts | 54 ++++++++++---------- scripts/commands/playlist/test.ts | 2 +- scripts/commands/playlist/validate.ts | 6 +-- scripts/generators/categoriesGenerator.ts | 21 ++++---- scripts/generators/countriesGenerator.ts | 25 ++++----- scripts/generators/indexCategoryGenerator.ts | 17 +++--- scripts/generators/indexCountryGenerator.ts | 17 +++--- scripts/generators/indexGenerator.ts | 17 +++--- scripts/generators/indexLanguageGenerator.ts | 17 +++--- scripts/generators/indexNsfwGenerator.ts | 17 +++--- scripts/generators/indexRegionGenerator.ts | 17 +++--- scripts/generators/languagesGenerator.ts | 21 ++++---- scripts/generators/regionsGenerator.ts | 25 +++++---- scripts/models/feed.ts | 4 +- 15 files changed, 144 insertions(+), 118 deletions(-) diff --git a/scripts/commands/playlist/edit.ts b/scripts/commands/playlist/edit.ts index c57a62d1e1..d87590b1f2 100644 --- a/scripts/commands/playlist/edit.ts +++ b/scripts/commands/playlist/edit.ts @@ -1,7 +1,7 @@ import { Storage, Collection, Logger, Dictionary } from '@freearhey/core' import { DataLoader, DataProcessor, PlaylistParser } from '../../core' -import { Channel, Feed, Playlist, Stream } from '../../models' import type { ChannelSearchableData } from '../../types/channel' +import { Channel, Feed, Playlist, Stream } from '../../models' import { DataProcessorData } from '../../types/dataProcessor' import { DataLoaderData } from '../../types/dataLoader' import { select, input } from '@inquirer/prompts' diff --git a/scripts/commands/playlist/generate.ts b/scripts/commands/playlist/generate.ts index c323d5395c..b903b5a435 100644 --- a/scripts/commands/playlist/generate.ts +++ b/scripts/commands/playlist/generate.ts @@ -1,27 +1,25 @@ -import { Logger, Storage } from '@freearhey/core' import { PlaylistParser, DataProcessor, DataLoader } from '../../core' +import type { DataProcessorData } from '../../types/dataProcessor' +import { DATA_DIR, LOGS_DIR, STREAMS_DIR } from '../../constants' +import type { DataLoaderData } from '../../types/dataLoader' +import { Logger, Storage, File } from '@freearhey/core' import { Stream } from '../../models' import { uniqueId } from 'lodash' import { + IndexCategoryGenerator, + IndexLanguageGenerator, + IndexCountryGenerator, + IndexRegionGenerator, CategoriesGenerator, CountriesGenerator, LanguagesGenerator, RegionsGenerator, - IndexGenerator, - IndexCategoryGenerator, - IndexCountryGenerator, - IndexLanguageGenerator, - IndexRegionGenerator + IndexGenerator } from '../../generators' -import { DATA_DIR, LOGS_DIR, STREAMS_DIR } from '../../constants' -import type { DataProcessorData } from '../../types/dataProcessor' -import type { DataLoaderData } from '../../types/dataLoader' async function main() { const logger = new Logger() - const generatorsLogger = new Logger({ - stream: await new Storage(LOGS_DIR).createStream(`generators.log`) - }) + const logFile = new File('generators.log') logger.info('loading data from api...') const processor = new DataProcessor() @@ -29,19 +27,19 @@ async function main() { const loader = new DataLoader({ storage: dataStorage }) const data: DataLoaderData = await loader.load() const { + feedsGroupedByChannelId, + channelsKeyById, categories, countries, - regions, - channelsKeyById, - feedsGroupedByChannelId + regions }: DataProcessorData = processor.process(data) logger.info('loading streams...') const streamsStorage = new Storage(STREAMS_DIR) const parser = new PlaylistParser({ storage: streamsStorage, - channelsKeyById, - feedsGroupedByChannelId + feedsGroupedByChannelId, + channelsKeyById }) const files = await streamsStorage.list('**/*.m3u') let streams = await parser.parse(files) @@ -62,42 +60,46 @@ async function main() { ) logger.info('generating categories/...') - await new CategoriesGenerator({ categories, streams, logger: generatorsLogger }).generate() + await new CategoriesGenerator({ categories, streams, logFile }).generate() logger.info('generating countries/...') await new CountriesGenerator({ countries, streams, - logger: generatorsLogger + logFile }).generate() logger.info('generating languages/...') - await new LanguagesGenerator({ streams, logger: generatorsLogger }).generate() + await new LanguagesGenerator({ streams, logFile }).generate() logger.info('generating regions/...') await new RegionsGenerator({ streams, regions, - logger: generatorsLogger + logFile }).generate() logger.info('generating index.m3u...') - await new IndexGenerator({ streams, logger: generatorsLogger }).generate() + await new IndexGenerator({ streams, logFile }).generate() logger.info('generating index.category.m3u...') - await new IndexCategoryGenerator({ streams, logger: generatorsLogger }).generate() + await new IndexCategoryGenerator({ streams, logFile }).generate() logger.info('generating index.country.m3u...') await new IndexCountryGenerator({ streams, - logger: generatorsLogger + logFile }).generate() logger.info('generating index.language.m3u...') - await new IndexLanguageGenerator({ streams, logger: generatorsLogger }).generate() + await new IndexLanguageGenerator({ streams, logFile }).generate() logger.info('generating index.region.m3u...') - await new IndexRegionGenerator({ streams, regions, logger: generatorsLogger }).generate() + await new IndexRegionGenerator({ streams, regions, logFile }).generate() + + logger.info('saving generators.log...') + const logStorage = new Storage(LOGS_DIR) + logStorage.saveFile(logFile) } main() diff --git a/scripts/commands/playlist/test.ts b/scripts/commands/playlist/test.ts index cc6f1dc148..a37b7ecd02 100644 --- a/scripts/commands/playlist/test.ts +++ b/scripts/commands/playlist/test.ts @@ -159,7 +159,7 @@ function onFinish() { drawTable() - logger.error(`\n${errors + warnings} problems (${errors} errors, ${warnings} warnings)`) + console.log(chalk.red(`\n${errors + warnings} problems (${errors} errors, ${warnings} warnings)`)) if (errors > 0) { process.exit(1) diff --git a/scripts/commands/playlist/validate.ts b/scripts/commands/playlist/validate.ts index 57bca4f6fb..e089f7eff8 100644 --- a/scripts/commands/playlist/validate.ts +++ b/scripts/commands/playlist/validate.ts @@ -94,14 +94,14 @@ async function main() { }) if (log.notEmpty()) { - logger.info(`\n${chalk.underline(filepath)}`) + console.log(`\n${chalk.underline(filepath)}`) log.forEach((logItem: LogItem) => { const position = logItem.line.toString().padEnd(6, ' ') const type = logItem.type.padEnd(9, ' ') const status = logItem.type === 'error' ? chalk.red(type) : chalk.yellow(type) - logger.info(` ${chalk.gray(position)}${status}${logItem.message}`) + console.log(` ${chalk.gray(position)}${status}${logItem.message}`) }) errors = errors.concat(log.filter((logItem: LogItem) => logItem.type === 'error')) @@ -109,7 +109,7 @@ async function main() { } } - logger.error( + console.log( chalk.red( `\n${ errors.count() + warnings.count() diff --git a/scripts/generators/categoriesGenerator.ts b/scripts/generators/categoriesGenerator.ts index cd20b6ea4f..f6d455d4be 100644 --- a/scripts/generators/categoriesGenerator.ts +++ b/scripts/generators/categoriesGenerator.ts @@ -1,25 +1,26 @@ -import { Generator } from './generator' -import { Collection, Storage, Logger } from '@freearhey/core' +import { Collection, Storage, Logger, File } from '@freearhey/core' import { Stream, Category, Playlist } from '../models' import { PUBLIC_DIR } from '../constants' +import { Generator } from './generator' +import { EOL } from 'node:os' type CategoriesGeneratorProps = { streams: Collection categories: Collection - logger: Logger + logFile: File } export class CategoriesGenerator implements Generator { streams: Collection categories: Collection storage: Storage - logger: Logger + logFile: File - constructor({ streams, categories, logger }: CategoriesGeneratorProps) { + constructor({ streams, categories, logFile }: CategoriesGeneratorProps) { this.streams = streams this.categories = categories this.storage = new Storage(PUBLIC_DIR) - this.logger = logger + this.logFile = logFile } async generate() { @@ -37,8 +38,8 @@ export class CategoriesGenerator implements Generator { const playlist = new Playlist(categoryStreams, { public: true }) const filepath = `categories/${category.id}.m3u` await this.storage.save(filepath, playlist.toString()) - this.logger.info( - JSON.stringify({ type: 'category', filepath, count: playlist.streams.count() }) + this.logFile.append( + JSON.stringify({ type: 'category', filepath, count: playlist.streams.count() }) + EOL ) }) @@ -46,8 +47,8 @@ export class CategoriesGenerator implements Generator { const playlist = new Playlist(undefinedStreams, { public: true }) const filepath = 'categories/undefined.m3u' await this.storage.save(filepath, playlist.toString()) - this.logger.info( - JSON.stringify({ type: 'category', filepath, count: playlist.streams.count() }) + this.logFile.append( + JSON.stringify({ type: 'category', filepath, count: playlist.streams.count() }) + EOL ) } } diff --git a/scripts/generators/countriesGenerator.ts b/scripts/generators/countriesGenerator.ts index c935da5a4a..7dc707cf91 100644 --- a/scripts/generators/countriesGenerator.ts +++ b/scripts/generators/countriesGenerator.ts @@ -1,25 +1,26 @@ -import { Generator } from './generator' -import { Collection, Storage, Logger } from '@freearhey/core' import { Country, Subdivision, Stream, Playlist } from '../models' +import { Collection, Storage, File } from '@freearhey/core' import { PUBLIC_DIR } from '../constants' +import { Generator } from './generator' +import { EOL } from 'node:os' type CountriesGeneratorProps = { streams: Collection countries: Collection - logger: Logger + logFile: File } export class CountriesGenerator implements Generator { streams: Collection countries: Collection storage: Storage - logger: Logger + logFile: File - constructor({ streams, countries, logger }: CountriesGeneratorProps) { + constructor({ streams, countries, logFile }: CountriesGeneratorProps) { this.streams = streams this.countries = countries this.storage = new Storage(PUBLIC_DIR) - this.logger = logger + this.logFile = logFile } async generate(): Promise { @@ -36,8 +37,8 @@ export class CountriesGenerator implements Generator { const playlist = new Playlist(countryStreams, { public: true }) const filepath = `countries/${country.code.toLowerCase()}.m3u` await this.storage.save(filepath, playlist.toString()) - this.logger.info( - JSON.stringify({ type: 'country', filepath, count: playlist.streams.count() }) + this.logFile.append( + JSON.stringify({ type: 'country', filepath, count: playlist.streams.count() }) + EOL ) country.getSubdivisions().forEach(async (subdivision: Subdivision) => { @@ -50,8 +51,8 @@ export class CountriesGenerator implements Generator { const playlist = new Playlist(subdivisionStreams, { public: true }) const filepath = `subdivisions/${subdivision.code.toLowerCase()}.m3u` await this.storage.save(filepath, playlist.toString()) - this.logger.info( - JSON.stringify({ type: 'subdivision', filepath, count: playlist.streams.count() }) + this.logFile.append( + JSON.stringify({ type: 'subdivision', filepath, count: playlist.streams.count() }) + EOL ) }) }) @@ -60,12 +61,12 @@ export class CountriesGenerator implements Generator { const undefinedPlaylist = new Playlist(undefinedStreams, { public: true }) const undefinedFilepath = 'countries/undefined.m3u' await this.storage.save(undefinedFilepath, undefinedPlaylist.toString()) - this.logger.info( + this.logFile.append( JSON.stringify({ type: 'country', filepath: undefinedFilepath, count: undefinedPlaylist.streams.count() - }) + }) + EOL ) } } diff --git a/scripts/generators/indexCategoryGenerator.ts b/scripts/generators/indexCategoryGenerator.ts index 529ee83360..665f4cb0cf 100644 --- a/scripts/generators/indexCategoryGenerator.ts +++ b/scripts/generators/indexCategoryGenerator.ts @@ -1,22 +1,23 @@ -import { Generator } from './generator' -import { Collection, Storage, Logger } from '@freearhey/core' +import { Collection, Storage, File } from '@freearhey/core' import { Stream, Playlist, Category } from '../models' import { PUBLIC_DIR } from '../constants' +import { Generator } from './generator' +import { EOL } from 'node:os' type IndexCategoryGeneratorProps = { streams: Collection - logger: Logger + logFile: File } export class IndexCategoryGenerator implements Generator { streams: Collection storage: Storage - logger: Logger + logFile: File - constructor({ streams, logger }: IndexCategoryGeneratorProps) { + constructor({ streams, logFile }: IndexCategoryGeneratorProps) { this.streams = streams this.storage = new Storage(PUBLIC_DIR) - this.logger = logger + this.logFile = logFile } async generate(): Promise { @@ -48,6 +49,8 @@ export class IndexCategoryGenerator implements Generator { const playlist = new Playlist(groupedStreams, { public: true }) const filepath = 'index.category.m3u' await this.storage.save(filepath, playlist.toString()) - this.logger.info(JSON.stringify({ type: 'index', filepath, count: playlist.streams.count() })) + this.logFile.append( + JSON.stringify({ type: 'index', filepath, count: playlist.streams.count() }) + EOL + ) } } diff --git a/scripts/generators/indexCountryGenerator.ts b/scripts/generators/indexCountryGenerator.ts index c65a43734d..82eb335efd 100644 --- a/scripts/generators/indexCountryGenerator.ts +++ b/scripts/generators/indexCountryGenerator.ts @@ -1,22 +1,23 @@ -import { Generator } from './generator' -import { Collection, Storage, Logger } from '@freearhey/core' +import { Collection, Storage, File } from '@freearhey/core' import { Stream, Playlist, Country } from '../models' import { PUBLIC_DIR } from '../constants' +import { Generator } from './generator' +import { EOL } from 'node:os' type IndexCountryGeneratorProps = { streams: Collection - logger: Logger + logFile: File } export class IndexCountryGenerator implements Generator { streams: Collection storage: Storage - logger: Logger + logFile: File - constructor({ streams, logger }: IndexCountryGeneratorProps) { + constructor({ streams, logFile }: IndexCountryGeneratorProps) { this.streams = streams this.storage = new Storage(PUBLIC_DIR) - this.logger = logger + this.logFile = logFile } async generate(): Promise { @@ -56,6 +57,8 @@ export class IndexCountryGenerator implements Generator { const playlist = new Playlist(groupedStreams, { public: true }) const filepath = 'index.country.m3u' await this.storage.save(filepath, playlist.toString()) - this.logger.info(JSON.stringify({ type: 'index', filepath, count: playlist.streams.count() })) + this.logFile.append( + JSON.stringify({ type: 'index', filepath, count: playlist.streams.count() }) + EOL + ) } } diff --git a/scripts/generators/indexGenerator.ts b/scripts/generators/indexGenerator.ts index fafda061f1..5cfa86c666 100644 --- a/scripts/generators/indexGenerator.ts +++ b/scripts/generators/indexGenerator.ts @@ -1,22 +1,23 @@ -import { Collection, Logger, Storage } from '@freearhey/core' +import { Collection, File, Storage } from '@freearhey/core' import { Stream, Playlist } from '../models' -import { Generator } from './generator' import { PUBLIC_DIR } from '../constants' +import { Generator } from './generator' +import { EOL } from 'node:os' type IndexGeneratorProps = { streams: Collection - logger: Logger + logFile: File } export class IndexGenerator implements Generator { streams: Collection storage: Storage - logger: Logger + logFile: File - constructor({ streams, logger }: IndexGeneratorProps) { + constructor({ streams, logFile }: IndexGeneratorProps) { this.streams = streams this.storage = new Storage(PUBLIC_DIR) - this.logger = logger + this.logFile = logFile } async generate(): Promise { @@ -27,6 +28,8 @@ export class IndexGenerator implements Generator { const playlist = new Playlist(sfwStreams, { public: true }) const filepath = 'index.m3u' await this.storage.save(filepath, playlist.toString()) - this.logger.info(JSON.stringify({ type: 'index', filepath, count: playlist.streams.count() })) + this.logFile.append( + JSON.stringify({ type: 'index', filepath, count: playlist.streams.count() }) + EOL + ) } } diff --git a/scripts/generators/indexLanguageGenerator.ts b/scripts/generators/indexLanguageGenerator.ts index 1116eb7408..3df9f71f2e 100644 --- a/scripts/generators/indexLanguageGenerator.ts +++ b/scripts/generators/indexLanguageGenerator.ts @@ -1,22 +1,23 @@ -import { Generator } from './generator' -import { Collection, Storage, Logger } from '@freearhey/core' +import { Collection, Storage, File } from '@freearhey/core' import { Stream, Playlist, Language } from '../models' import { PUBLIC_DIR } from '../constants' +import { Generator } from './generator' +import { EOL } from 'node:os' type IndexLanguageGeneratorProps = { streams: Collection - logger: Logger + logFile: File } export class IndexLanguageGenerator implements Generator { streams: Collection storage: Storage - logger: Logger + logFile: File - constructor({ streams, logger }: IndexLanguageGeneratorProps) { + constructor({ streams, logFile }: IndexLanguageGeneratorProps) { this.streams = streams this.storage = new Storage(PUBLIC_DIR) - this.logger = logger + this.logFile = logFile } async generate(): Promise { @@ -47,6 +48,8 @@ export class IndexLanguageGenerator implements Generator { const playlist = new Playlist(groupedStreams, { public: true }) const filepath = 'index.language.m3u' await this.storage.save(filepath, playlist.toString()) - this.logger.info(JSON.stringify({ type: 'index', filepath, count: playlist.streams.count() })) + this.logFile.append( + JSON.stringify({ type: 'index', filepath, count: playlist.streams.count() }) + EOL + ) } } diff --git a/scripts/generators/indexNsfwGenerator.ts b/scripts/generators/indexNsfwGenerator.ts index a89cf0a100..e1e98375b6 100644 --- a/scripts/generators/indexNsfwGenerator.ts +++ b/scripts/generators/indexNsfwGenerator.ts @@ -1,22 +1,23 @@ -import { Collection, Logger, Storage } from '@freearhey/core' +import { Collection, File, Storage } from '@freearhey/core' import { Stream, Playlist } from '../models' -import { Generator } from './generator' import { PUBLIC_DIR } from '../constants' +import { Generator } from './generator' +import { EOL } from 'node:os' type IndexNsfwGeneratorProps = { streams: Collection - logger: Logger + logFile: File } export class IndexNsfwGenerator implements Generator { streams: Collection storage: Storage - logger: Logger + logFile: File - constructor({ streams, logger }: IndexNsfwGeneratorProps) { + constructor({ streams, logFile }: IndexNsfwGeneratorProps) { this.streams = streams this.storage = new Storage(PUBLIC_DIR) - this.logger = logger + this.logFile = logFile } async generate(): Promise { @@ -25,6 +26,8 @@ export class IndexNsfwGenerator implements Generator { const playlist = new Playlist(allStreams, { public: true }) const filepath = 'index.nsfw.m3u' await this.storage.save(filepath, playlist.toString()) - this.logger.info(JSON.stringify({ type: 'index', filepath, count: playlist.streams.count() })) + this.logFile.append( + JSON.stringify({ type: 'index', filepath, count: playlist.streams.count() }) + EOL + ) } } diff --git a/scripts/generators/indexRegionGenerator.ts b/scripts/generators/indexRegionGenerator.ts index 94537c9af0..c462fcfceb 100644 --- a/scripts/generators/indexRegionGenerator.ts +++ b/scripts/generators/indexRegionGenerator.ts @@ -1,25 +1,26 @@ -import { Generator } from './generator' -import { Collection, Storage, Logger } from '@freearhey/core' +import { Collection, Storage, File } from '@freearhey/core' import { Stream, Playlist, Region } from '../models' import { PUBLIC_DIR } from '../constants' +import { Generator } from './generator' +import { EOL } from 'node:os' type IndexRegionGeneratorProps = { streams: Collection regions: Collection - logger: Logger + logFile: File } export class IndexRegionGenerator implements Generator { streams: Collection regions: Collection storage: Storage - logger: Logger + logFile: File - constructor({ streams, regions, logger }: IndexRegionGeneratorProps) { + constructor({ streams, regions, logFile }: IndexRegionGeneratorProps) { this.streams = streams this.regions = regions this.storage = new Storage(PUBLIC_DIR) - this.logger = logger + this.logFile = logFile } async generate(): Promise { @@ -58,6 +59,8 @@ export class IndexRegionGenerator implements Generator { const playlist = new Playlist(groupedStreams, { public: true }) const filepath = 'index.region.m3u' await this.storage.save(filepath, playlist.toString()) - this.logger.info(JSON.stringify({ type: 'index', filepath, count: playlist.streams.count() })) + this.logFile.append( + JSON.stringify({ type: 'index', filepath, count: playlist.streams.count() }) + EOL + ) } } diff --git a/scripts/generators/languagesGenerator.ts b/scripts/generators/languagesGenerator.ts index 114fcddb2b..f7ae9976e4 100644 --- a/scripts/generators/languagesGenerator.ts +++ b/scripts/generators/languagesGenerator.ts @@ -1,19 +1,20 @@ -import { Generator } from './generator' -import { Collection, Storage, Logger } from '@freearhey/core' +import { Collection, Storage, File } from '@freearhey/core' import { Playlist, Language, Stream } from '../models' import { PUBLIC_DIR } from '../constants' +import { Generator } from './generator' +import { EOL } from 'node:os' -type LanguagesGeneratorProps = { streams: Collection; logger: Logger } +type LanguagesGeneratorProps = { streams: Collection; logFile: File } export class LanguagesGenerator implements Generator { streams: Collection storage: Storage - logger: Logger + logFile: File - constructor({ streams, logger }: LanguagesGeneratorProps) { + constructor({ streams, logFile }: LanguagesGeneratorProps) { this.streams = streams this.storage = new Storage(PUBLIC_DIR) - this.logger = logger + this.logFile = logFile } async generate(): Promise { @@ -38,8 +39,8 @@ export class LanguagesGenerator implements Generator { const playlist = new Playlist(languageStreams, { public: true }) const filepath = `languages/${language.code}.m3u` await this.storage.save(filepath, playlist.toString()) - this.logger.info( - JSON.stringify({ type: 'language', filepath, count: playlist.streams.count() }) + this.logFile.append( + JSON.stringify({ type: 'language', filepath, count: playlist.streams.count() }) + EOL ) }) @@ -50,8 +51,8 @@ export class LanguagesGenerator implements Generator { const playlist = new Playlist(undefinedStreams, { public: true }) const filepath = 'languages/undefined.m3u' await this.storage.save(filepath, playlist.toString()) - this.logger.info( - JSON.stringify({ type: 'language', filepath, count: playlist.streams.count() }) + this.logFile.append( + JSON.stringify({ type: 'language', filepath, count: playlist.streams.count() }) + EOL ) } } diff --git a/scripts/generators/regionsGenerator.ts b/scripts/generators/regionsGenerator.ts index fb0a5d6882..4d649a3517 100644 --- a/scripts/generators/regionsGenerator.ts +++ b/scripts/generators/regionsGenerator.ts @@ -1,25 +1,26 @@ -import { Generator } from './generator' -import { Collection, Storage, Logger } from '@freearhey/core' +import { Collection, Storage, File } from '@freearhey/core' import { Playlist, Region, Stream } from '../models' import { PUBLIC_DIR } from '../constants' +import { Generator } from './generator' +import { EOL } from 'node:os' type RegionsGeneratorProps = { streams: Collection regions: Collection - logger: Logger + logFile: File } export class RegionsGenerator implements Generator { streams: Collection regions: Collection storage: Storage - logger: Logger + logFile: File - constructor({ streams, regions, logger }: RegionsGeneratorProps) { + constructor({ streams, regions, logFile }: RegionsGeneratorProps) { this.streams = streams this.regions = regions this.storage = new Storage(PUBLIC_DIR) - this.logger = logger + this.logFile = logFile } async generate(): Promise { @@ -35,8 +36,8 @@ export class RegionsGenerator implements Generator { const playlist = new Playlist(regionStreams, { public: true }) const filepath = `regions/${region.code.toLowerCase()}.m3u` await this.storage.save(filepath, playlist.toString()) - this.logger.info( - JSON.stringify({ type: 'region', filepath, count: playlist.streams.count() }) + this.logFile.append( + JSON.stringify({ type: 'region', filepath, count: playlist.streams.count() }) + EOL ) }) @@ -44,18 +45,20 @@ export class RegionsGenerator implements Generator { const internationalPlaylist = new Playlist(internationalStreams, { public: true }) const internationalFilepath = 'regions/int.m3u' await this.storage.save(internationalFilepath, internationalPlaylist.toString()) - this.logger.info( + this.logFile.append( JSON.stringify({ type: 'region', filepath: internationalFilepath, count: internationalPlaylist.streams.count() - }) + }) + EOL ) const undefinedStreams = streams.filter((stream: Stream) => !stream.hasBroadcastArea()) const playlist = new Playlist(undefinedStreams, { public: true }) const filepath = 'regions/undefined.m3u' await this.storage.save(filepath, playlist.toString()) - this.logger.info(JSON.stringify({ type: 'region', filepath, count: playlist.streams.count() })) + this.logFile.append( + JSON.stringify({ type: 'region', filepath, count: playlist.streams.count() }) + EOL + ) } } diff --git a/scripts/models/feed.ts b/scripts/models/feed.ts index 03ae31184e..2b1fa9d34d 100644 --- a/scripts/models/feed.ts +++ b/scripts/models/feed.ts @@ -144,8 +144,8 @@ export class Feed { this.broadcastRegions = regions.filter((region: Region) => { if (region.code === 'INT') return false - - return region.countryCodes.intersects(countriesCodes) + const intersected = region.countryCodes.intersects(countriesCodes) + return intersected.notEmpty() }) return this From 5ae1d81c4deb15838c3d36c3ed95af3ef84c7bdb Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 23 Apr 2025 20:58:21 +0300 Subject: [PATCH 34/40] Update dependencies --- package-lock.json | 13 +++++++------ package.json | 1 + yarn.lock | 8 ++++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7f48efc865..e09fd39497 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,6 +32,7 @@ "commander": "^8.3.0", "console-table-printer": "^2.12.1", "eslint": "^9.17.0", + "glob": "^11.0.2", "globals": "^16.0.0", "iptv-checker": "^0.29.1", "iptv-playlist-parser": "^0.13.0", @@ -4038,9 +4039,9 @@ } }, "node_modules/glob": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.1.tgz", - "integrity": "sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw==", + "version": "11.0.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.2.tgz", + "integrity": "sha512-YT7U7Vye+t5fZ/QMkBFrTJ7ZQxInIUjwyAjVj84CYXqgBdv30MFUPGnBR6sQaVq6Is15wYJUsnzTuWaGRBhBAQ==", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^4.0.1", @@ -9580,9 +9581,9 @@ } }, "glob": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.1.tgz", - "integrity": "sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw==", + "version": "11.0.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.2.tgz", + "integrity": "sha512-YT7U7Vye+t5fZ/QMkBFrTJ7ZQxInIUjwyAjVj84CYXqgBdv30MFUPGnBR6sQaVq6Is15wYJUsnzTuWaGRBhBAQ==", "requires": { "foreground-child": "^3.1.0", "jackspeak": "^4.0.1", diff --git a/package.json b/package.json index c03d75ccc4..8b957e01c5 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "commander": "^8.3.0", "console-table-printer": "^2.12.1", "eslint": "^9.17.0", + "glob": "^11.0.2", "globals": "^16.0.0", "iptv-checker": "^0.29.1", "iptv-playlist-parser": "^0.13.0", diff --git a/yarn.lock b/yarn.lock index 1491b68a9a..188beea60e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2082,10 +2082,10 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob@^11.0.0, glob@^11.0.1: - version "11.0.1" - resolved "https://registry.npmjs.org/glob/-/glob-11.0.1.tgz" - integrity sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw== +glob@^11.0.0, glob@^11.0.1, glob@^11.0.2: + version "11.0.2" + resolved "https://registry.npmjs.org/glob/-/glob-11.0.2.tgz" + integrity sha512-YT7U7Vye+t5fZ/QMkBFrTJ7ZQxInIUjwyAjVj84CYXqgBdv30MFUPGnBR6sQaVq6Is15wYJUsnzTuWaGRBhBAQ== dependencies: foreground-child "^3.1.0" jackspeak "^4.0.1" From a8d68acd7bf09d2c962fb30fbec8dd9d88475084 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 23 Apr 2025 21:25:18 +0300 Subject: [PATCH 35/40] Update test.test.ts --- tests/commands/playlist/test.test.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/commands/playlist/test.test.ts b/tests/commands/playlist/test.test.ts index 515dbf824c..813ed401d4 100644 --- a/tests/commands/playlist/test.test.ts +++ b/tests/commands/playlist/test.test.ts @@ -1,5 +1,4 @@ import { execSync } from 'child_process' -import path from 'node:path' import os from 'node:os' type ExecError = { @@ -19,12 +18,8 @@ describe('playlist:test', () => { execSync(cmd, { encoding: 'utf8' }) } catch (error) { if (process.env.DEBUG === 'true') console.log(cmd, error) - expect((error as ExecError).stdout).toContain(slash('playlist_test/ag.m3u')) + expect((error as ExecError).stdout).toContain('playlist_test/ag.m3u') expect((error as ExecError).stdout).toContain('2 problems (1 errors, 1 warnings)') } }) }) - -function slash(filepath: string) { - return filepath.split(path.sep).join(path.posix.sep) -} From b0a299fad7e45f33d654215902dd83a06f6b156b Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 23 Apr 2025 23:34:43 +0300 Subject: [PATCH 36/40] Update scripts --- scripts/commands/playlist/test.ts | 7 ++++++- scripts/core/streamTester.ts | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/commands/playlist/test.ts b/scripts/commands/playlist/test.ts index a37b7ecd02..a5add7cb68 100644 --- a/scripts/commands/playlist/test.ts +++ b/scripts/commands/playlist/test.ts @@ -154,9 +154,14 @@ function drawTable() { } } -function onFinish() { +function onFinish(error) { clearInterval(interval) + if (error) { + console.error(error) + process.exit(1) + } + drawTable() console.log(chalk.red(`\n${errors + warnings} problems (${errors} errors, ${warnings} warnings)`)) diff --git a/scripts/core/streamTester.ts b/scripts/core/streamTester.ts index 89c44de746..860844b403 100644 --- a/scripts/core/streamTester.ts +++ b/scripts/core/streamTester.ts @@ -18,8 +18,8 @@ export class StreamTester { return this.checker.checkStream({ url: stream.url, http: { - referrer: stream.getHttpReferrer(), - 'user-agent': stream.getHttpUserAgent() + referrer: stream.getReferrer(), + 'user-agent': stream.getUserAgent() } }) } From 01c5aecb46c730704ac2e827a05114436dad241e Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 23 Apr 2025 23:51:39 +0300 Subject: [PATCH 37/40] Update scripts --- scripts/commands/playlist/test.ts | 10 +++++++--- scripts/commands/playlist/validate.ts | 18 ++++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/scripts/commands/playlist/test.ts b/scripts/commands/playlist/test.ts index a5add7cb68..777c19f8d8 100644 --- a/scripts/commands/playlist/test.ts +++ b/scripts/commands/playlist/test.ts @@ -164,10 +164,14 @@ function onFinish(error) { drawTable() - console.log(chalk.red(`\n${errors + warnings} problems (${errors} errors, ${warnings} warnings)`)) + if (errors > 0 || warnings > 0) { + console.log( + chalk.red(`\n${errors + warnings} problems (${errors} errors, ${warnings} warnings)`) + ) - if (errors > 0) { - process.exit(1) + if (errors > 0) { + process.exit(1) + } } process.exit(0) diff --git a/scripts/commands/playlist/validate.ts b/scripts/commands/playlist/validate.ts index e089f7eff8..f1f7742eb9 100644 --- a/scripts/commands/playlist/validate.ts +++ b/scripts/commands/playlist/validate.ts @@ -109,16 +109,18 @@ async function main() { } } - console.log( - chalk.red( - `\n${ - errors.count() + warnings.count() - } problems (${errors.count()} errors, ${warnings.count()} warnings)` + if (errors.count() || warnings.count()) { + console.log( + chalk.red( + `\n${ + errors.count() + warnings.count() + } problems (${errors.count()} errors, ${warnings.count()} warnings)` + ) ) - ) - if (errors.count()) { - process.exit(1) + if (errors.count()) { + process.exit(1) + } } } From 5ea9359463a9b4b09d3c1a483cd75d613390b60c Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Thu, 24 Apr 2025 04:09:04 +0300 Subject: [PATCH 38/40] Update update.ts --- scripts/commands/playlist/update.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/commands/playlist/update.ts b/scripts/commands/playlist/update.ts index 55551b67d0..50cad5dde1 100644 --- a/scripts/commands/playlist/update.ts +++ b/scripts/commands/playlist/update.ts @@ -9,7 +9,7 @@ import validUrl from 'valid-url' let processedIssues = new Collection() async function main() { - const logger = new Logger({ disabled: true }) + const logger = new Logger({ level: -999 }) const issueLoader = new IssueLoader() logger.info('loading issues...') From 5efdcfe1faad89b0a6facdb8a2a58e461d411165 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Thu, 24 Apr 2025 19:33:10 +0300 Subject: [PATCH 39/40] Update us_pluto.m3u --- streams/us_pluto.m3u | 2 -- 1 file changed, 2 deletions(-) diff --git a/streams/us_pluto.m3u b/streams/us_pluto.m3u index ae92a133b4..60870ce6b1 100644 --- a/streams/us_pluto.m3u +++ b/streams/us_pluto.m3u @@ -729,8 +729,6 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fa8176b9884200074ef5ae/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c4cd4-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ff963292-6aa2-4806-857d-39ad6f5f0e4a #EXTINF:-1 tvg-id="TheWeatherChannelenEspanol.us",The Weather Channel en Español http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/627ae4fcf001df00074d6e5b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c4cd5-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=df13c2c6-8880-4f3d-b7b6-a18acfcb3069 -#EXTINF:-1 tvg-id="TheGrioTV.us@SD",TheGrio -http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f1efad04320070007dbb60b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c4cd6-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f172462b-904d-4db7-9ec4-3b737f9c18c2 #EXTINF:-1 tvg-id="ThisOldHouse.us",This Old House http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d51e791b7dba3b2ae990ab2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2c4cd7-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9483c3b5-d057-42f4-8da0-57c5bf2344ab #EXTINF:-1 tvg-id="ThreesCompany.us",Three's Company From 466d8484f5599bd75b71cc0525ec6fde298e0625 Mon Sep 17 00:00:00 2001 From: Alstruit <34786806+Alstruit@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:31:47 -0500 Subject: [PATCH 40/40] Fix lint. --- streams/cl.m3u | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streams/cl.m3u b/streams/cl.m3u index 3fc460296d..3a80a129e7 100644 --- a/streams/cl.m3u +++ b/streams/cl.m3u @@ -317,7 +317,7 @@ https://panel.miplay.cl:8082/spectrumchannel/index.m3u8 https://stv.janus.cl/playlist/stream.m3u8 #EXTINF:-1 tvg-id="Subela.cl",Súbela (720p) https://mdstrm.com/live-stream-playlist/5fad9b1d978fe1080e3ac4a8.m3u8 -#EXTINF:-1 tvg-id="SuyaiTV.cl" http-referrer="https://suyaitv.cl", Suyai TV (1080p) +#EXTINF:-1 tvg-id="SuyaiTV.cl" http-referrer="https://suyaitv.cl",Suyai TV (1080p) #EXTVLCOPT:http-referrer=https://suyaitv.cl https://signal.suyaitv.cl/live/35/playlist.m3u8?username=ZZDemoIPTVGH&password=9PcdCnFxUe #EXTINF:-1 tvg-id="T13.cl",T13 (720p)