From 4f563956ae07b5ae39f6dfb5f029c77bd8d96c21 Mon Sep 17 00:00:00 2001 From: boomski Date: Sun, 8 Sep 2019 11:16:08 +0200 Subject: [PATCH 01/16] Update br.m3u --- channels/br.m3u | 2 ++ 1 file changed, 2 insertions(+) diff --git a/channels/br.m3u b/channels/br.m3u index 0275b6994..b92518461 100644 --- a/channels/br.m3u +++ b/channels/br.m3u @@ -1,4 +1,6 @@ #EXTM3U x-tvg-url="http://infinitytv.xyz/guide.xml" +#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ykEHJoE.png" group-title="Sport",All Sports +https://59f1cbe63db89.streamlock.net:1443/dgrau/_definst_/dgrau/media.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zX5c4CG.png" group-title="",Boa Vontade TV http://api.new.livestream.com/accounts/15107153/events/4338771/live.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/De6ty9h.png" group-title="",Canal Ricos From aea1f081c65eb6165c5a80b24f0057af536d44af Mon Sep 17 00:00:00 2001 From: freearhey Date: Sun, 8 Sep 2019 15:43:45 +0300 Subject: [PATCH 02/16] Update index.js - increased timeout up to 60 seconds - changed valid response status code range - removed errors type check --- test/index.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/test/index.js b/test/index.js index 09aa41d6f..6f79064d8 100644 --- a/test/index.js +++ b/test/index.js @@ -5,7 +5,7 @@ const https = require('https') const verbose = process.env.npm_config_debug || false const errorLog = 'error.log' const config = { - timeout: 1000, + timeout: 60000, delay: 200 } @@ -21,7 +21,7 @@ const instance = axios.create({ rejectUnauthorized: false }), validateStatus: function (status) { - return status >= 200 && status < 404 + return status >= 200 && status < 400 }, headers: { 'Accept': '*/*', @@ -81,13 +81,9 @@ async function test() { } catch (err) { - if(err.response || (err.request && ['ENOTFOUND'].indexOf(err.code) > -1)) { - - stats.failures++ + stats.failures++ - writeToLog(country.url, err.message, item.url) - - } + writeToLog(country.url, err.message, item.url) } From 54243a5d62d911afb72274cf5abfa2f01381d26a Mon Sep 17 00:00:00 2001 From: freearhey Date: Sun, 8 Sep 2019 15:45:28 +0300 Subject: [PATCH 03/16] Update ru.m3u - removed 29 dead links - removed Brodilo TV channel (unstable stream) --- channels/ru.m3u | 60 ------------------------------------------------- 1 file changed, 60 deletions(-) diff --git a/channels/ru.m3u b/channels/ru.m3u index fa9ae99cc..e38703c8f 100644 --- a/channels/ru.m3u +++ b/channels/ru.m3u @@ -19,8 +19,6 @@ http://176.99.110.252/stream8/playlist.m3u8 http://v1.proofix.ru/live-tv8/stream1/playlist.m3u8 #EXTINF:-1 tvg-id="8kanal-krasnoyarsk" tvg-name="8 канал Красноярский край" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/8kanal_ru.jpg" group-title="Local",8 Канал (Красноярский край) http://80.65.18.213/perviy_molodeginyi_3100kb.m3u8 -#EXTINF:-1 tvg-id="8kanal-krasnoyarsk" tvg-name="8 канал Красноярский край" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/8kanal_ru.jpg" group-title="Local",8 Канал (Красноярский край) -https://str-4.mediabay.tv/8TV_Krasnoyarsk/playlist.m3u8?token=bf39642040854d4ebd796a7e321be19548f770c4-46cb5ba8857d3a1d00a643b6310fdb2b-1566588394-1566577594 #EXTINF:-1 tvg-id="amedia1" tvg-name="А1" tvg-logo="https://i.imgur.com/lXlwfyw.png" group-title="Movies",A1 http://92.43.140.249/s45/04.m3u8 #EXTINF:-1 tvg-id="amedia1" tvg-name="А1" tvg-logo="https://i.imgur.com/lXlwfyw.png" group-title="Movies",A1 @@ -43,13 +41,9 @@ http://ott-cdn.ucom.am/s64/index.m3u8 http://ott-cdn.ucom.am/s34/04.m3u8 #EXTINF:-1 tvg-id="bridge-tv" tvg-name="Bridge TV" tvg-logo="https://i.imgur.com/L71iY9t.png" group-title="Music",Bridge TV http://ott-cdn.ucom.am/s34/index.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GO1eZtc.png" group-title="",Brodilo TV -http://brodilo.tv/channel.php #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Buy Home TV http://hls-edge.cdn.buy-home.tv/bhtvlive/_definst_/live/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Kids",Cartoon Network -http://91.238.192.169/cartoonnetwork/tracks-v1a1/index.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Kids",Cartoon Network http://s1.only4.tv/802/video.m3u8?token=3KC9QUbdE7 #EXTINF:-1 tvg-id="deutsche-welle-de" tvg-name="Deutsche Welle Deutsch" tvg-logo="https://iptvx.one/icn/dw.png" group-title="News",Deutsche Welle http://ott-cdn.ucom.am/s26/index.m3u8 @@ -61,8 +55,6 @@ http://evronovosti.mediacdn.ru/sr1/evronovosti/playlist.m3u8 http://ott-cdn.ucom.am/s89/index.m3u8?fluxustv.m3u8 #EXTINF:-1 tvg-id="euronews" tvg-name="EuroNews" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/euronews.jpg" group-title="News",Euronews https://strm.yandex.ru/kal/euronews_supres/euronews_supres0.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/Eurosport1.uk.png" group-title="Sport",Eurosport 1 Россия -http://212.112.101.69:8081/stream44/output.m3u8 #EXTINF:-1 tvg-id="fastfunbox-hd" tvg-name="Fast&FunBox HD" tvg-logo="https://spiintl.com/data/files/kcfinderUploadDir/images/logo/fastandfunbox-logo.png" group-title="Sport",Fast & Fun Box Русский http://ott-cdn.ucom.am/s79/04.m3u8 #EXTINF:-1 tvg-id="fastfunbox-hd" tvg-name="Fast&FunBox HD" tvg-logo="https://spiintl.com/data/files/kcfinderUploadDir/images/logo/fastandfunbox-logo.png" group-title="Sport",Fast & Fun Box Русский @@ -123,15 +115,11 @@ http://92.43.140.249/s59/04.m3u8 http://ott-cdn.ucom.am/s59/index.m3u8 #EXTINF:-1 tvg-id="tiop-shop-tv" tvg-name="Top Shop TV" tvg-logo="" group-title="Shop",Top Shop TV http://tv-topshop.netrack.ru/hls/topshop.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tvpro-online.ru/images/logo.png" group-title="",TV PRO -http://rtmp.lovedrink.ru/hls/ch1.m3u8 #EXTINF:-1 tvg-id="tv1000-action" tvg-name="TV1000 Action" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/viasat_tv1000_action_east.jpg" group-title="Movies",TV1000 Action http://ott-cdn.ucom.am/s91/index.m3u8 #EXTINF:-1 tvg-id="tvmchannel" tvg-name="TVMChannel" tvg-logo="" group-title="Music",TVMChannel http://149.154.68.132:8081/HOLA/stream/playlist.m3u8 #EXTINF:-1 tvg-id="tvmchannel" tvg-name="TVMChannel" tvg-logo="" group-title="Music",TVMChannel -https://str-4.mediabay.tv/TVMChannel/playlist.m3u8?token=2ef4acf617a0cc3a9e91416db73e6d03c35fd9e7-9fdfe0b590d22cf61049fbd162551e89-1566590534-1566579734 -#EXTINF:-1 tvg-id="tvmchannel" tvg-name="TVMChannel" tvg-logo="" group-title="Music",TVMChannel https://strm.yandex.ru/kal/tvm_supres/tvm_supres0.m3u8 #EXTINF:-1 tvg-id="univer-tv" tvg-name="Univer TV" tvg-logo="" group-title="Local",Univer TV http://cdn.universmotri.ru/live/hq.sdp/playlist.m3u8 @@ -186,8 +174,6 @@ http://belnovosti.cdn.easyhoster.ru:8080/stream.m3u8 #EXTINF:-1 tvg-id="box-tv" tvg-name="Бокс ТВ" tvg-logo="https://iptvx.one/icn/box-tv.png" group-title="Sport",Бокс ТВ http://hls.boxingtvru.cdnvideo.ru/boxingtvru/smil:boxingtvru.smil/playlist.m3u8 #EXTINF:-1 tvg-id="bolshaya-azia" tvg-name="Большая Азия" tvg-logo="" group-title="",Большая Азия -https://str-3.mediabay.tv/BigAsia/playlist.m3u8?token=bd715da92b3f6a04ccf8372294052977db959006-6eb5e0d8c16838f5e565afc3909f2730-1566588460-1566577660 -#EXTINF:-1 tvg-id="bolshaya-azia" tvg-name="Большая Азия" tvg-logo="" group-title="",Большая Азия https://strm.yandex.ru/kal/bigasia/bigasia0.m3u8 #EXTINF:-1 tvg-id="vetta24" tvg-name="Ветта 24 Пермь" tvg-logo="" group-title="Local",Ветта 24 (Пермь) http://serv24.vintera.tv:8081/vetta/vetta_office/playlist.m3u8 @@ -195,8 +181,6 @@ http://serv24.vintera.tv:8081/vetta/vetta_office/playlist.m3u8 http://v1.proofix.ru/live-vitrina-tv/stream1-ru/playlist.m3u8 #EXTINF:-1 tvg-id="vkusnoe-tv" tvg-name="Вкусное TV" tvg-logo="" group-title="Food",Вкусное ТВ http://live.planeta-online.tv:1935/public/channel_133/playlist.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Вместе-РФ -https://str-3.mediabay.tv/VmesteRF/playlist.m3u8?token=cd4ed3619afbf408afd92a23b473cbadb8bba663-127cd9bcf70965c53bbfe602b193aecd-1566589839-1566579039 #EXTINF:-1 tvg-id="volgograd-1" tvg-name="Волгоград 1" tvg-logo="" group-title="Local",Волгоград 1 https://strm.yandex.ru/kal/volgograd1/volgograd10.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.volplus.ru/assets/img/logo_vlz_plus.png" group-title="Local",Волжский Плюс @@ -206,11 +190,7 @@ http://hls-mycdn0539860594.cdnvideo.ru/mycdn0539860594/allufaru2/playlist.m3u8 #EXTINF:-1 tvg-id="grozny" tvg-name="Грозный" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/gtrk_groznyj.jpg" group-title="Local",Грозный http://live2.mediacdn.ru/sr1/grozny/playlist.m3u8 #EXTINF:-1 tvg-id="grozny" tvg-name="Грозный" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/gtrk_groznyj.jpg" group-title="Local",Грозный -https://str-4.mediabay.tv/Grozniy/playlist.m3u8?token=c5b2fd6dd924587ea248d0f443250432db7ee5f5-591459f03417d55e4eeb515b93f699eb-1566589302-1566578502 -#EXTINF:-1 tvg-id="grozny" tvg-name="Грозный" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/gtrk_groznyj.jpg" group-title="Local",Грозный https://strm.yandex.ru/kal/grozny_supres/grozny_supres0.m3u8 -#EXTINF:-1 tvg-id="gubernia" tvg-name="Губерния" tvg-logo="" group-title="Local",Губерния -https://str-3.mediabay.tv/GuberniaTV/playlist.m3u8?token=1b42d68673af007ff0fc9130f14712c893991554-a5d283a7fe9cc266bc69d66fd9a886b7-1566589934-1566579134 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Губерния (Воронеж) http://tvgubernia-htlive.cdn.ngenix.net/live/mp4:tv-gubernia-live/playlist.m3u8 #EXTINF:-1 tvg-id="gubernia-samara" tvg-name="Губерния Самара" tvg-logo="https://www.guberniatv.ru/img/logo.png" group-title="",Губерния (Самара) @@ -271,8 +251,6 @@ http://edge2.uk.kab.tv/rtplive/kabtv-rus-medium.stream/playlist.m3u8 http://serv24.vintera.tv:8081/kaledoskop/kaledoskop/playlist.m3u8 #EXTINF:-1 tvg-id="karapuz-tv" tvg-name="Карапуз ТВ" tvg-logo="https://iptvx.one/icn/karapuz-tv.png" group-title="Kids",Карапуз ТВ http://online.karapuztv.ru/content/33418/index.m3u8 -#EXTINF:-1 tvg-id="karapuz-tv" tvg-name="Карапуз ТВ" tvg-logo="https://iptvx.one/icn/karapuz-tv.png" group-title="Kids",Карапуз ТВ -https://str-4.mediabay.tv/KarapuzTV/playlist.m3u8?token=e99fc72508a750267ff381d31dc21d7d56fc30ff-729ea2edfa8ae3ac11908057d8f15776-1566590149-1566579349 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.katun24.ru/bitrix/templates/k24/images/logo.png" group-title="Local",Катунь 24 https://live.katun24.ru:8082/katun/katun/index.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/bG6kBxM.png" group-title="Local",Кварц ТВ (Подольск) @@ -287,10 +265,6 @@ https://strm.yandex.ru/kal/kinoclassic/kinoclassic0.m3u8 http://91.223.105.236:8081/hlsx/473/473.m3u8?id=1188&p=12326fa256d9bf86 #EXTINF:-1 tvg-id="krasnaya-linia" tvg-name="Красная линия" tvg-logo="" group-title="General",Красная линия http://kprf-htlive.cdn.ngenix.net/live/_definst_/stream_high/playlist.m3u8 -#EXTINF:-1 tvg-id="krasnaya-linia" tvg-name="Красная линия" tvg-logo="" group-title="General",Красная линия -https://str-3.mediabay.tv/Krasnaya_Liniya/playlist.m3u8?token=d25936c0f472d6f2ea85c165fcd0daa3cfb6fb2d-ccdf6c2ecfd09b2d70f582defa90aa12-1566589472-1566578672 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Краснодар -https://str-2.mediabay.tv/Krasnodar/playlist.m3u8?token=4777535620772e9003f662be592d10b2a1c859aa-cfd97e815dc2ed9e88458c60e8184fac-1566590318-1566579518 #EXTINF:-1 tvg-id="krik-tv" tvg-name="Крик-ТВ" tvg-logo="http://ricekb.ru/img/logo.png" group-title="",Крик-ТВ http://hls-rictv.cdnvideo.ru/rictv/rictv.sdp/playlist.m3u8 #EXTINF:-1 tvg-id="krym24" tvg-name="Крым 24" tvg-logo="http://1tvcrimea.ru/assets/images/live_crimea24.png" group-title="",Крым 24 @@ -351,8 +325,6 @@ http://212.77.128.179:8089/www_mezhdunet/mezhdunet/playlist.m3u8 http://live-migtv.cdnvideo.ru/migtv/migtv.sdp/playlist.m3u8 #EXTINF:-1 tvg-id="ministerstvo-idey" tvg-name="Министерство идей" tvg-logo="" group-title="Entertainment",Министерство идей http://live-minidey.cdnvideo.ru/minidey/minidey.sdp/playlist.m3u8 -#EXTINF:-1 tvg-id="ministerstvo-idey" tvg-name="Министерство идей" tvg-logo="" group-title="Entertainment",Министерство идей -https://str-4.mediabay.tv/Min-idey/playlist.m3u8?token=19b687bd9e7ad5055402d97859b9b33284b33e97-02a428d395078358a92e4b7948ff4e51-1566589339-1566578539 #EXTINF:-1 tvg-id="mir" tvg-name="Мир" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/mir_ru.jpg" group-title="General",Мир http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv_2500/playlist.m3u8 #EXTINF:-1 tvg-id="mir-pl4" tvg-name="Мир +4" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/mir_ru.jpg" group-title="General",Мир (+4) @@ -381,8 +353,6 @@ http://ott-cdn.ucom.am/s28/index.m3u8 https://strm.yandex.ru/kal/muztv_supres/muztv_supres0.m3u8 #EXTINF:-1 tvg-id="muzsoyuz" tvg-name="МузСоюз" tvg-logo="" group-title="Music",МузСоюз http://hls.tvsoyuz.cdnvideo.ru/tvsoyuz2/muzsoyuz.6fw0-58xp-acts-esy0/chunklist.m3u8 -#EXTINF:-1 tvg-id="muzsoyuz" tvg-name="МузСоюз" tvg-logo="" group-title="Music",МузСоюз -https://str-3.mediabay.tv/MuzSoyuz/playlist.m3u8?token=010a8c5b773b16ab27c6e886d401848d28f29bb7-d0f33c6eb5b4d2dae576a9531bbcd9eb-1566590397-1566579597 #EXTINF:-1 tvg-id="mult" tvg-name="Мульт" tvg-logo="http://kt.kg/upload/medialibrary/802/ozkqyoc/0orqjt.jpg" group-title="Kids",Мульт http://92.43.140.249/s58/04.m3u8 #EXTINF:-1 tvg-id="mult" tvg-name="Мульт" tvg-logo="https://iptv.live/images/logo/channel/crops/0f9f2d92c2583ef952556e1f382d0974.png" group-title="Kids",Мульт @@ -393,8 +363,6 @@ http://ott-cdn.ucom.am/s58/index.m3u8 http://live-tvhope.cdnvideo.ru/tvhope-pull/tvhope_1/playlist.m3u8 #EXTINF:-1 tvg-id="nadezhda" tvg-name="Надежда" tvg-logo="https://hopetv.ru/wp-content/themes/hope.ua/public/img/header-hopeLogo.png" group-title="Religious",Надежда http://tvhope.cdnvideo.ru/tvhope-pull/tvhope_1/playlist.m3u8 -#EXTINF:-1 tvg-id="nadezhda" tvg-name="Надежда" tvg-logo="" group-title="Religious",Надежда -https://str-3.mediabay.tv/HopeTV/playlist.m3u8?token=a85ac953cd11f137df0967686bf3b19a6a238e1e-b14ce2565ad433970657b93d2f8b4283-1566590484-1566579684 #EXTINF:-1 tvg-id="nastoyaschee-vremia" tvg-name="Настоящее время HD" tvg-logo="https://iptvx.one/icn/nastoiaschee-vremia.png" group-title="News",Настоящее время http://rfe-lh.akamaihd.net/i/rfe_tvmc5@383630/master.m3u8 #EXTINF:-1 tvg-id="nauka-20" tvg-name="Наука 2.0" tvg-logo="https://upload.wikimedia.org/wikipedia/uk/thumb/2/29/TV_Nauka_2.0.svg/220px-TV_Nauka_2.0.svg.png" group-title="Education",Наука 2.0 @@ -433,12 +401,8 @@ http://ott-cdn.ucom.am/s17/index.m3u8 http://live-ntm13.cdnvideo.ru/ntm13/smil:ntm13.smil/chunklist_b3128000.m3u8 #EXTINF:-1 tvg-id="ntm" tvg-name="НТМ" tvg-logo="http://saransk-tv.ru/assets/images/slider/170321-pic-01.jpg" group-title="Local",НТМ (Мордовия) http://live-ntm13.cdnvideo.ru/ntm13/smil:ntm13.smil/playlist.m3u8 -#EXTINF:-1 tvg-id="ntm" tvg-name="НТМ" tvg-logo="http://saransk-tv.ru/assets/images/slider/170321-pic-01.jpg" group-title="Local",НТМ (Мордовия) -https://str-2.mediabay.tv/NTM/playlist.m3u8?token=1ef4fba5c50212d4acc8464b069d3c0479431935-7ffae9695166c2ec332d842c7549bf75-1566588525-1566577725 #EXTINF:-1 tvg-id="ntrk-ingushetia" tvg-name="НТРК Ингушетия" tvg-logo="" group-title="Local",НТРК Ингушетия http://live-ntk.cdnvideo.ru/ntk-publish/ntk.sdp/playlist.m3u8 -#EXTINF:-1 tvg-id="ntrk-ingushetia" tvg-name="НТРК Ингушетия" tvg-logo="" group-title="Local",НТРК Ингушетия -https://str-2.mediabay.tv/Ingushetia/playlist.m3u8?token=f32a8d2db6b53837cefb15f1e7ee0208c9c1a945-17aa761c3b6eaca7790a713b2a3667f8-1566590280-1566579480 #EXTINF:-1 tvg-id="o2tv" tvg-name="О2ТВ" tvg-logo="" group-title="",О2ТВ https://strm.yandex.ru/kal/o2/o20.m3u8 #EXTINF:-1 tvg-id="o2tv" tvg-name="О2ТВ" tvg-logo="https://ustanovca-tricorol-tv.ru/wp-content/uploads/2017/12/o-tv.png" group-title="",О2ТВ @@ -451,10 +415,6 @@ http://185.18.4.16/live/3m/playlist.m3u8 http://now03.eaglecdn.com/stream_transcoded_720/irystontv_irystontvstream1_hi/index.m3u8 #EXTINF:-1 tvg-id="otv24" tvg-name="ОТВ 24" tvg-logo="" group-title="News",ОТВ 24 https://strm.yandex.ru/kal/otv24/otv240.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Открытый -http://hls.opentv.online/7200k/open_7200k.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ixATz1J.png" group-title="Music",Открытый -http://hls.opentv.online/7200k/open_7200k.m3u8?fluxustv.m3u8 #EXTINF:-1 tvg-id="otr" tvg-name="ОТР" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/OTR_2013_logo.svg/330px-OTR_2013_logo.svg.png" group-title="General",ОТР http://live-otronline.cdnvideo.ru/otr-decklink/otr/playlist.m3u8 #EXTINF:-1 tvg-id="otr" tvg-name="ОТР" tvg-logo="https://iptvx.one/icn/otr_ru.png" group-title="General",ОТР @@ -473,16 +433,12 @@ http://ott-cdn.ucom.am/s62/04.m3u8 http://ott-cdn.ucom.am/s62/index.m3u8 #EXTINF:-1 tvg-id="oxotnik-i-rybolov-int" tvg-name="Охотник и Рыболов Международный" tvg-logo="" group-title="Hobby",Охотник и Рыболов Международный https://strm.yandex.ru/kal/ohotnik/ohotnik0.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iW5vhkb.png" group-title="General",Первый канал -https://str-2.mediabay.tv/ORT/playlist.m3u8?token=a468fd4b0634e1a465cc36217bdefad5d90ff04b-140e0a1216550ef0f90334f3d4ab86f9-1566588654-1566577854 #EXTINF:-1 tvg-id="pervy-kanal-csi" tvg-name="Первый канал СНГ" tvg-logo="https://i.imgur.com/iW5vhkb.png" group-title="General",Первый канал (СНГ) http://ott-cdn.ucom.am/s14/04.m3u8 #EXTINF:-1 tvg-id="pervy-kanal-csi" tvg-name="Первый канал СНГ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/perviy_1_kanal.jpg" group-title="General",Первый канал (СНГ) http://ott-cdn.ucom.am/s14/index.m3u8 #EXTINF:-1 tvg-id="pervy-krymsky" tvg-name="Первый крымский" tvg-logo="http://1tvcrimea.ru/assets/images/live_1tvcrimea.png" group-title="",Первый крымский http://mrlive.1tvcrimea.ru:8080/1tvcrimea.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Первый Тульский -https://str-4.mediabay.tv/Tulskiy1/playlist.m3u8?token=29ae84edf4780d963e06c443b5f34d71a0d6d680-cec7ae9a0e1fa71f556f6cda07b4f26b-1566589376-1566578576 #EXTINF:-1 tvg-id="pobeda" tvg-name="Победа" tvg-logo="https://iptvx.one/icn/pobeda.png" group-title="Entertainment",Победа http://92.43.140.249/s47/04.m3u8 #EXTINF:-1 tvg-id="pobeda" tvg-name="Победа" tvg-logo="https://iptvx.one/icn/pobeda.png" group-title="Entertainment",Победа @@ -493,8 +449,6 @@ http://live.planeta-online.tv:1935/public/channel_5/playlist.m3u8 http://ott-cdn.ucom.am/s99/04.m3u8 #EXTINF:-1 tvg-id="prikluchenia-hd" tvg-name="Приключения HD" tvg-logo="https://upload.wikimedia.org/wikipedia/ru/thumb/8/8d/PriklucheniaHDLogo2017.png/1200px-PriklucheniaHDLogo2017.png" group-title="Travel",Приключения HD http://ott-cdn.ucom.am/s99/index.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Business",Про Бизнес -https://str-2.mediabay.tv/ProBusiness/playlist.m3u8?token=58982bf6a4f8b9103d66684c730be2a27a52ff4b-38921e9d90a4f18de1101f20c9c4da1b-1566588576-1566577776 #EXTINF:-1 tvg-id="prodvizhenie" tvg-name="Продвижение" tvg-logo="" group-title="",Продвижение https://strm.yandex.ru/kal/prodvizheniye/prodvizheniye0.m3u8 #EXTINF:-1 tvg-id="piatnica-pl2" tvg-name="Пятница +2" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a8/%D0%9F%D1%8F%D1%82%D0%BD%D0%B8%D1%86%D0%B0_%28%D1%81_2013%29.svg/1200px-%D0%9F%D1%8F%D1%82%D0%BD%D0%B8%D1%86%D0%B0_%28%D1%81_2013%29.svg.png" group-title="",Пятница! (+2) @@ -557,16 +511,12 @@ http://ott-cdn.ucom.am/s21/index.m3u8 http://tv-online.gtrkchita.ru:8080/hls/r24-chita_360p.m3u8 #EXTINF:-1 tvg-id="rossia-24" tvg-name="Россия 24" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rossiya_24.jpg" group-title="News",Россия 24 http://uiptv.do.am/1ufc/000000006/playlist.m3u8 -#EXTINF:-1 tvg-id="rossia-24" tvg-name="Россия 24" tvg-logo="http://fanat.tv/images/tv/rossiya-24.png" group-title="News",Россия 24 -https://str-3.mediabay.tv/Russia24/playlist.m3u8?token=89a108b1907b38190399e283dcb2b82f357ede36-ca8b65e4aabd9309bef417e72cabe4bc-1566589208-1566578408 #EXTINF:-1 tvg-id="rossia-k" tvg-name="Россия К" tvg-logo="http://fanat.tv/images/tv/rossiya-k.png" group-title="",Россия К http://a3569458063-s26881.cdn.ngenix.net/live/smil:russiak.smil/chunklist_b1600000.m3u8 #EXTINF:-1 tvg-id="rossia-k" tvg-name="Россия К" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rossiya_kultura.jpg" group-title="",Россия К http://ott-cdn.ucom.am/s16/index.m3u8 #EXTINF:-1 tvg-id="rossia-k" tvg-name="Россия К" tvg-logo="" group-title="",Россия К http://uiptv.do.am/1ufc/000000005/playlist.m3u8 -#EXTINF:-1 tvg-id="russkaya-noch" tvg-name="Русская ночь" tvg-logo="https://iptvx.one/icn/russkaya-noch.png" group-title="XXX",Русская ночь -http://46.32.68.167/s/live/708/86.169.51.136/0/0.m3u8 #EXTINF:-1 tvg-id="russky-sever" tvg-name="Русский Север" tvg-logo="" group-title="Local",Русский Север (Вологда) http://rusevertv.ru/576/rs_crf28_.m3u8 #EXTINF:-1 tvg-id="ryzhy" tvg-name="Рыжий" tvg-logo="http://ryzhiy.tv/assets/logo-header-7bc8b56496d769e22e7ace3b711e3c5825145f5feb03b4153d235d3459ed4998.png" group-title="Kids",Рыжий @@ -578,8 +528,6 @@ https://sitv.ru/hls/stv1024.m3u8 #EXTINF:-1 tvg-id="saratov-24" tvg-name="Саратов 24" tvg-logo="" group-title="Local",Саратов 24 http://46.165.235.6:8083/hls/saratov24/index.m3u8 #EXTINF:-1 tvg-id="saratov-24" tvg-name="Саратов 24" tvg-logo="" group-title="Local",Саратов 24 -https://str-2.mediabay.tv/Saratov24/playlist.m3u8?token=af364d18bd6c402805b941534637c94e43ce32fe-5e12f32245508422bb17417bd0519014-1566589433-1566578633 -#EXTINF:-1 tvg-id="saratov-24" tvg-name="Саратов 24" tvg-logo="" group-title="Local",Саратов 24 https://strm.yandex.ru/kal/saratov24_supres/saratov24_supres0.m3u8 #EXTINF:-1 tvg-id="sarafan" tvg-name="Сарафан" tvg-logo="http://sarafan-tv.ru/upload/medialibrary/44c/Glavnaya_banner_logo.jpg" group-title="",Сарафан http://ott-cdn.ucom.am/s38/04.m3u8 @@ -593,8 +541,6 @@ http://live.mediacdn.ru:80/sr1/sever/playlist.m3u8 http://live2.mediacdn.ru/sr1/sever-mobile/playlist.m3u8 #EXTINF:-1 tvg-id="sever" tvg-name="Север" tvg-logo="" group-title="Local",Север (Нарьян-Мар) http://live2.mediacdn.ru/sr1/sever/playlist.m3u8 -#EXTINF:-1 tvg-id="sever" tvg-name="Север" tvg-logo="http://www.visitnao.ru/upload/iblock/1c0/1c0bd0c468ce71c2c0deab8ee728440a.png" group-title="Local",Север (Нарьян-Мар) -https://str-3.mediabay.tv/SeverTV/playlist.m3u8?token=dc5e7cbb7b47de57e60fc79994e3c98c94f09a56-32ae62700a05f97e0ae4228a0c6887c5-1566589741-1566578941 #EXTINF:-1 tvg-id="sila" tvg-name="Сила" tvg-logo="" group-title="Sport",Сила http://gcore.silatv.ru/streams/3431_1488/480n/index.m3u8 #EXTINF:-1 tvg-id="sila" tvg-name="Сила" tvg-logo="" group-title="Sport",Сила @@ -603,8 +549,6 @@ https://gcore.silatv.ru/streams/3431_1488/1080n/index.m3u8 https://gcore.silatv.ru/streams/3431_1488/720n/index.m3u8 #EXTINF:-1 tvg-id="sinergia-tv" tvg-name="Синергия ТВ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/synergy_tv_ru.jpg" group-title="Business",Синергия ТВ http://live-synergytv.cdnvideo.ru/synergytv/synergytv.sdp/playlist.m3u8 -#EXTINF:-1 tvg-id="sinergia-tv" tvg-name="Синергия ТВ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/synergy_tv_ru.jpg" group-title="Business",Синергия ТВ -https://str-3.mediabay.tv/SynergyTV/playlist.m3u8?token=8cb7e7d2cd80b07a19cdc0c6f445eebd93e58faa-ea7ecbcb72cc435a53ae38ba7c15acdf-1566589702-1566578902 #EXTINF:-1 tvg-id="skazki-zayki" tvg-name="Сказки Зайки" tvg-logo="https://pp.userapi.com/c605926/v605926465/5557/g0bL-ADWjOI.jpg" group-title="",Сказки Зайки http://skazki.vintera.tv:8081/skazki/zaj/playlist.m3u8 #EXTINF:-1 tvg-id="smaylik-tv" tvg-name="Смайлик ТВ" tvg-logo="http://smilik.tv/wp-content/uploads/2016/02/Desktop_-1.png" group-title="",Смайлик ТВ @@ -614,8 +558,6 @@ http://hls.solntv.cdnvideo.ru/solntv/solntv.sdp/playlist.m3u8 #EXTINF:-1 tvg-id="soyuz" tvg-name="Союз" tvg-logo="https://tv-soyuz.ru/static/img/logo.png" group-title="Religious",Союз http://tvsoyuz.cdnvideo.ru/tvsoyuz/soyuz/playlist.m3u8 #EXTINF:-1 tvg-id="soyuz" tvg-name="Союз" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/soyuz.jpg" group-title="Religious",Союз -https://str-4.mediabay.tv/Soyuz/playlist.m3u8?token=83936ee4649ee0d2ef4780ca4c65c47564550ac2-7c399099ef4bd9e17381a672a599df06-1566590365-1566579565 -#EXTINF:-1 tvg-id="soyuz" tvg-name="Союз" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/soyuz.jpg" group-title="Religious",Союз https://strm.yandex.ru/kal/soyuz_supres/soyuz_supres0.m3u8 #EXTINF:-1 tvg-id="start" tvg-name="Старт" tvg-logo="" group-title="Sport",Старт https://strm.yandex.ru/kal/start/start0.m3u8 @@ -659,8 +601,6 @@ http://ott-cdn.ucom.am/s19/04.m3u8 http://91.234.108.26/hls-live/livepkgr/_definst_/liveevent1/vazlivestream1.m3u8 #EXTINF:-1 tvg-id="tochka-tv" tvg-name="Точка" tvg-logo="http://i.otzovik.com/objects/b/510000/502811.png" group-title="",Точка http://serv24.vintera.tv:8081/tochka/tochkatv/playlist.m3u8 -#EXTINF:-1 tvg-id="tochka-tv" tvg-name="Точка" tvg-logo="http://i.otzovik.com/objects/b/510000/502811.png" group-title="",Точка -https://str-2.mediabay.tv/TochkaTV/playlist.m3u8?token=a33cd1f57be0cc8f926828a45b6e4ce7de4a14ee-f4109a5eadb90e926a6a18914e4b3e9b-1566590429-1566579629 #EXTINF:-1 tvg-id="tri-angela" tvg-name="Три Ангела" tvg-logo="https://www.3angels.ru/assets/img/themes/logo-menu.png" group-title="",Три Ангела http://hls.tv.3angels.ru/stream/HQ.m3u8 #EXTINF:-1 tvg-id="trofey" tvg-name="Трофей" tvg-logo="https://www.tvradiomd.ru/wp-content/uploads/2016/12/trofey.png" group-title="Hobby",Трофей From db770f4562c80f05c64b86d3e6eb47e66d30650d Mon Sep 17 00:00:00 2001 From: boomski Date: Sun, 8 Sep 2019 17:21:57 +0200 Subject: [PATCH 04/16] Update so.m3u --- channels/so.m3u | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/channels/so.m3u b/channels/so.m3u index 7ca6c5bfa..a858f35b9 100644 --- a/channels/so.m3u +++ b/channels/so.m3u @@ -1,8 +1,16 @@ #EXTM3U +#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AeCpDw4.png" group-title="",Dacwa TV +https://ap01.iqplay.tv:81/iqb8002/d13w1.m3u8 +#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hCqKKn8.png" group-title="",Dalka TV +https://ap01.iqplay.tv:8082/iq/d11k1web/chunks.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/71UKcdB.png" group-title="",Horn Cable TV http://cdn.mediavisionuae.com:1935/live/hctvlive.stream/chunklist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/sF00ODA.png" group-title="",Jubbaland TV http://cdn02.iqbroadcast.tv/1345/iqb/3748782c336460247a0ea0b592d4130c.sdp/tracks-v1a1/mono.m3u8 +#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Q6o33hr.png" group-title="",Puntland TV +https://ap01.iqplay.tv:81/iqb8002/p2t25.m3u8 +#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/WtGMmeI.png" group-title="",SBC +http://62.210.251.188:1935/live/sbctv.stream/chunks.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/yZhnlvK.jpg" group-title="",SLNTV http://213.162.202.9:8000/play/a01o/index.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ED0e97e.png" group-title="",SNTV From 997b41cf1d386b5ea12ab390bc3a278a5f89dff9 Mon Sep 17 00:00:00 2001 From: boomski Date: Sun, 8 Sep 2019 17:27:40 +0200 Subject: [PATCH 05/16] Update gn.m3u --- channels/gn.m3u | 2 ++ 1 file changed, 2 insertions(+) diff --git a/channels/gn.m3u b/channels/gn.m3u index 550402918..2db202c79 100644 --- a/channels/gn.m3u +++ b/channels/gn.m3u @@ -1,3 +1,5 @@ #EXTM3U #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/EX4DCTN.png" group-title="",CIS TV http://162.212.178.131:1935/CDNLIVE/CISTV/master.m3u8 +#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/moTF5EE.jpg" group-title="",RTG KOLOMA +https://dcunilive38-lh.akamaihd.net/i/dclive_1@690091/index_150_av-p.m3u8?sd=10&rebase=on From c25f661544f78b436f8b96841b6de32a29343761 Mon Sep 17 00:00:00 2001 From: boomski Date: Sun, 8 Sep 2019 17:51:25 +0200 Subject: [PATCH 06/16] Update af.m3u --- channels/af.m3u | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/channels/af.m3u b/channels/af.m3u index ac2acdbdc..423eb87f2 100644 --- a/channels/af.m3u +++ b/channels/af.m3u @@ -1,12 +1,10 @@ #EXTM3U #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Qi0aqZY.jpg" group-title="",1TV -http://173.208.166.179/1tv-live-ca7a6c579c-der-da-spy-zoy-ye-bastard-dala-dawusa_bastard/tracks-v1a1/mono.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GjXcECX.jpg" group-title="",Afghan TV -https://cdn4.mjunoon.tv:8087/channels/AfghanTV-140/live/140L/chunks.m3u8 +http://173.208.166.179/1tv-live-ca7a6c579c-der-da-spy-zoy-ye-kona-warkareya-dawusa_bastard/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PmX9Ca3.png" group-title="",Aghani Aghani https://svs.itworkscdn.net/aghanilive/aghanilive/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/S1DfLSr.png" group-title="",Arezo TV -http://173.208.166.179/afg_ar_tv_789-456-dont_copy_my_links-mother-fucker/tracks-v1a1/mono.m3u8 +http://173.208.166.179/afg_ar_tv_789-456-dont_copy_my_links-mother-fucker-kona-werakawa/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/x8mlbJM.jpg" group-title="",Ariana News https://d10rltuy0iweup.cloudfront.net/ATNNEWS/myStream/chunklist_w796472816.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8VbuI9n.png" group-title="",Ariana TV @@ -24,7 +22,7 @@ http://1-fss27-s0.streamhoster.com/lv_kabultv/_definst_/kabultvus/chunklist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XpR1VvZ.png" group-title="",Kayhan TV http://playout395.livestreamingcdn.com:1935/live/Stream1/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/89BGiNg.jpg" group-title="",Khurshid TV -http://173.208.166.179/khurshid_tv_live-motherkhata-a28b7_789abc_63664be7c2df49a4e888555-dont-copy/tracks-v1a1/mono.m3u8 +http://173.208.166.179/khurshid_tv_live-motherkhata-a28b7_789abc_636wwwww4e888555-dont-copy/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RNKujnB.jpg" group-title="",Lemar TV http://173.208.166.179/lemar_tv_live-kona-warkawa-dawosa-ma-use-kawa-bastard-Dozd_zxcv555/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/tcE6rUI.jpg" group-title="",Mitra TV @@ -33,8 +31,10 @@ http://173.208.166.179/mitra_tv_live-4a64668668a3b6599d1_asdf-935f99f7896449d697 http://live.pamir.tv/ptv/d0dbe915091d400bd8ee7f27f0791303.sdp/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/oC5Xnxh.png" group-title="",Payam-E-Afghan TV http://g5nl6xx5lpq6-hls-live.5centscdn.com/602/live12345/payameafghantv.stream/tracks-v1a1/mono.m3u8 +#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RyzzSxJ.jpg" group-title="",RTA +http://173.208.166.179/rta_tv_live-789jkl456hgf_789_defgh/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/MaMG5ix.png" group-title="",TOLO News -http://173.208.166.179/tolo_news_live-1c104a79_dawus-khairatkhor_bastard-off_a3b6599d1935f99f6e409555/tracks-v1a1/mono.m3u8 +http://173.208.166.179/tolo_news_live-1c104a79_dawus-khairatkhor_bastard-off_a3b65f99f6e409555/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JerfIBt.jpg" group-title="",Tuti https://rrsatrtmp.tulix.tv/livecdn827/myStream.sdp/chunklist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jcjlypA.jpg" group-title="",Watan HD @@ -43,5 +43,7 @@ http://51.15.236.137/hls/stream.m3u8 http://live.wesalhaq.tv/live/whaq_360p/gmswf.m3u8?v= #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SZWyE76.jpg" group-title="",Wesalhaq TV rtmp://live.noorlive.com:1935/wesal/wesal1 +#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/b280MWe.png" group-title="",Zan TV +http://173.208.166.179/zan_tv_live_456qwer586_stop_tyui123ikm159-fuck-off/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dl13q0r.jpg" group-title="",Zhwandoon TV -http://173.208.166.179/zhwandoon_tv_live-ca76ca2c8763_bastard-you664be7-dozd-lanati-kona-warkawa-c2df49a4/tracks-v1a1/mono.m3u8 +http://173.208.166.179/zhwandoon_tv_live-ca76ca2c8763_bastard-koni-dozd-lanati-kona-warkawa-c2df49a4/tracks-v1a1/mono.m3u8 From 5c893f61cf882af27656b1637eea516612e9f4dc Mon Sep 17 00:00:00 2001 From: freearhey Date: Sun, 8 Sep 2019 18:58:17 +0300 Subject: [PATCH 07/16] Update af.m3u Removed 6 dead links --- channels/af.m3u | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/channels/af.m3u b/channels/af.m3u index ac2acdbdc..bc6397531 100644 --- a/channels/af.m3u +++ b/channels/af.m3u @@ -1,12 +1,6 @@ #EXTM3U -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Qi0aqZY.jpg" group-title="",1TV -http://173.208.166.179/1tv-live-ca7a6c579c-der-da-spy-zoy-ye-bastard-dala-dawusa_bastard/tracks-v1a1/mono.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GjXcECX.jpg" group-title="",Afghan TV -https://cdn4.mjunoon.tv:8087/channels/AfghanTV-140/live/140L/chunks.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PmX9Ca3.png" group-title="",Aghani Aghani https://svs.itworkscdn.net/aghanilive/aghanilive/playlist.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/S1DfLSr.png" group-title="",Arezo TV -http://173.208.166.179/afg_ar_tv_789-456-dont_copy_my_links-mother-fucker/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/x8mlbJM.jpg" group-title="",Ariana News https://d10rltuy0iweup.cloudfront.net/ATNNEWS/myStream/chunklist_w796472816.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8VbuI9n.png" group-title="",Ariana TV @@ -23,8 +17,6 @@ http://173.208.166.179/jahan_numa_tv_live-486asdf456_fuck_ghjk123zxcv458wxyz-fuc http://1-fss27-s0.streamhoster.com/lv_kabultv/_definst_/kabultvus/chunklist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XpR1VvZ.png" group-title="",Kayhan TV http://playout395.livestreamingcdn.com:1935/live/Stream1/playlist.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/89BGiNg.jpg" group-title="",Khurshid TV -http://173.208.166.179/khurshid_tv_live-motherkhata-a28b7_789abc_63664be7c2df49a4e888555-dont-copy/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RNKujnB.jpg" group-title="",Lemar TV http://173.208.166.179/lemar_tv_live-kona-warkawa-dawosa-ma-use-kawa-bastard-Dozd_zxcv555/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/tcE6rUI.jpg" group-title="",Mitra TV @@ -33,8 +25,6 @@ http://173.208.166.179/mitra_tv_live-4a64668668a3b6599d1_asdf-935f99f7896449d697 http://live.pamir.tv/ptv/d0dbe915091d400bd8ee7f27f0791303.sdp/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/oC5Xnxh.png" group-title="",Payam-E-Afghan TV http://g5nl6xx5lpq6-hls-live.5centscdn.com/602/live12345/payameafghantv.stream/tracks-v1a1/mono.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/MaMG5ix.png" group-title="",TOLO News -http://173.208.166.179/tolo_news_live-1c104a79_dawus-khairatkhor_bastard-off_a3b6599d1935f99f6e409555/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JerfIBt.jpg" group-title="",Tuti https://rrsatrtmp.tulix.tv/livecdn827/myStream.sdp/chunklist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jcjlypA.jpg" group-title="",Watan HD @@ -43,5 +33,3 @@ http://51.15.236.137/hls/stream.m3u8 http://live.wesalhaq.tv/live/whaq_360p/gmswf.m3u8?v= #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SZWyE76.jpg" group-title="",Wesalhaq TV rtmp://live.noorlive.com:1935/wesal/wesal1 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dl13q0r.jpg" group-title="",Zhwandoon TV -http://173.208.166.179/zhwandoon_tv_live-ca76ca2c8763_bastard-you664be7-dozd-lanati-kona-warkawa-c2df49a4/tracks-v1a1/mono.m3u8 From 0c2dcc46ad2f117cbbf616caa351c38a5252e1e7 Mon Sep 17 00:00:00 2001 From: freearhey Date: Sun, 8 Sep 2019 18:58:26 +0300 Subject: [PATCH 08/16] Update ar.m3u Removed 2 dead links --- channels/ar.m3u | 4 ---- 1 file changed, 4 deletions(-) diff --git a/channels/ar.m3u b/channels/ar.m3u index 134344eb4..2d824ab3e 100644 --- a/channels/ar.m3u +++ b/channels/ar.m3u @@ -83,8 +83,6 @@ http://59c5c86e10038.streamlock.net:1935/6605140/6605140/playlist.m3u8?fluxustv. http://server1.mgmultimedios.com:8080/uai/live/chunks.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/75UgF.png" group-title="",CPEtv http://dcunilive28-lh.akamaihd.net/i/dclive_1@533583/index_150_av-p.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Del Aire -http://www.radiosargentina.com.ar/php/tvm3u.php?id=DIAR0079 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7osLgHP.png" group-title="",DESIERTO TV (Chile) http://unlimited6-cl.dps.live/desiertotv/desiertotv.smil/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OgVCgbw.jpg" group-title="",El Garage @@ -131,8 +129,6 @@ http://201.219.100.30:1935/camara-bunge/camara-bunge.stream_720p/master.m3u8 http://wowza.telpin.com.ar:1935/live-powerTV/power.stream/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9wwq64s.jpg" group-title="",Radio del Aire 89.5 FM La Plata http://streamyes.alsolnet.com/radiodelairetv/live/playlist.m3u8?fluxustv.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8JpXh85.png" group-title="",Radio Sur 105.1 FM Berisso -http://video1.veemesoft.com.ar:1935/8436/8436/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/daMqavf.jpg" group-title="",RTN TV http://media.neuquen.gov.ar/rtn/television/chunklist_w1330236482.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/daMqavf.jpg" group-title="",RTN TV From 457b2e44a595b63f2fe6c56366e8a7ab7729d2ae Mon Sep 17 00:00:00 2001 From: boomski Date: Sun, 8 Sep 2019 17:58:35 +0200 Subject: [PATCH 09/16] Update lb.m3u --- channels/lb.m3u | 2 ++ 1 file changed, 2 insertions(+) diff --git a/channels/lb.m3u b/channels/lb.m3u index 4e0ad26f7..e927fb16f 100644 --- a/channels/lb.m3u +++ b/channels/lb.m3u @@ -19,6 +19,8 @@ http://futuretv.cdn.mangomolo.com/futuretv/smil:futuretv.smil/gmswf.m3u8 http://futuretv.cdn.mangomolo.com/futuretv/smil:futuretv.smil/master.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.hawacom.tv/android-chrome-256x256.png" group-title="",Hawacom http://livecdnh3.tvanywhere.ae/hls/hawacom/04.m3u8 +#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GBDfc8p.jpg" group-title="",Lana TV +https://svs.itworkscdn.net/lanatvlive/lana/chunklist_DVR.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PTOeIjz.png" group-title="",LBC (New!) http://livecdnh2.tvanywhere.ae/hls/lbc_int/04.m3u8?fluxustv.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/b/b2/LDC_logo_new.png/93px-LDC_logo_new.png" group-title="",LBC International From 9f45d9f06a5077d16c70b5c41366fb79aef9c9be Mon Sep 17 00:00:00 2001 From: freearhey Date: Sun, 8 Sep 2019 18:58:36 +0300 Subject: [PATCH 10/16] Update dz.m3u Removed 1 dead link --- channels/dz.m3u | 2 -- 1 file changed, 2 deletions(-) diff --git a/channels/dz.m3u b/channels/dz.m3u index 525d09ef5..a7ef8e3da 100644 --- a/channels/dz.m3u +++ b/channels/dz.m3u @@ -5,5 +5,3 @@ http://player.mslivestream.net/mslive/27a2733c4bc60825f0386b5b333fac0e.sdp/track http://www.elahmad.com/tv/m3u8/fr_xoyky_49.m3u8?id=algerie #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/T6bEOQt.png" group-title="",Chaine Nord-Africaine http://str81.creacast.com/cna/live.sdp/playlist.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1x1ifx8.png" group-title="",Ennahar TV -http://144.217.76.52:8080/ENNAHAR/tracks-v1a1/mono.m3u8 From 5352f4d7de25b2b38a056c490e0d1cc942b44b2f Mon Sep 17 00:00:00 2001 From: boomski Date: Sun, 8 Sep 2019 18:14:03 +0200 Subject: [PATCH 11/16] Update ph.m3u --- channels/ph.m3u | 2 ++ 1 file changed, 2 insertions(+) diff --git a/channels/ph.m3u b/channels/ph.m3u index c9bb80f77..02bcf62cd 100644 --- a/channels/ph.m3u +++ b/channels/ph.m3u @@ -19,6 +19,8 @@ https://d3cbe0gidjd4k2.cloudfront.net/channel_6/channel6/chunklist_w1653262029.m https://d3cbe0gidjd4k2.cloudfront.net/channel_2/channel2/chunklist_w1932655832.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RUQASCU.png" group-title="Shop",Shop TV https://d3cbe0gidjd4k2.cloudfront.net/channel_1/channel1/chunklist_w743726554.m3u8 +#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/l2JSQme.png" group-title="",SMNI +http://api.new.livestream.com/accounts/19079954/events/7831871/live.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ylgQY9Y.png" group-title="",TV5 (Opt-1) http://stream1.news5.ph/n5e/tv5_2/chunklist_w1942959991.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ylgQY9Y.png" group-title="",TV5 (Opt-2) From 8213dcd6975c0750720364fed4a08e13a4c6463d Mon Sep 17 00:00:00 2001 From: freearhey Date: Sun, 8 Sep 2019 19:51:59 +0300 Subject: [PATCH 12/16] Moved skipPlaylist() to test/index.js --- helpers/util.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/helpers/util.js b/helpers/util.js index bd25a85a9..8187223e8 100644 --- a/helpers/util.js +++ b/helpers/util.js @@ -229,14 +229,6 @@ function validateUrl(channelUrl) { return blacklist.indexOf(host) === -1 } -function skipPlaylist(filename) { - let test_country = process.env.npm_config_country - if (test_country && filename !== 'channels/' + test_country + '.m3u') { - return true; - } - return false; -} - module.exports = { parsePlaylist, sortByTitleAndUrl, @@ -249,6 +241,5 @@ module.exports = { addToCache, checkCache, clearCache, - validateUrl, - skipPlaylist + validateUrl } \ No newline at end of file From bfc2eeb452466ea00545aef4d7e6e0e7028c8467 Mon Sep 17 00:00:00 2001 From: freearhey Date: Sun, 8 Sep 2019 19:52:49 +0300 Subject: [PATCH 13/16] Update index.js - added skipPlaylist() function - added exclude option to script --- test/index.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/test/index.js b/test/index.js index 6f79064d8..87bac81f6 100644 --- a/test/index.js +++ b/test/index.js @@ -41,7 +41,7 @@ async function test() { for(let country of countries) { - if (util.skipPlaylist(country.url)) { + if (skipPlaylist(country.url)) { continue } @@ -114,3 +114,16 @@ function writeToLog(country, msg, url) { util.appendToFile(errorLog, now.toISOString() + ' ' + line + '\n') console.log(`Error: ${msg} '${url}'`) } + +function skipPlaylist(filename) { + let testCountry = process.env.npm_config_country + let excludeCountries = process.env.npm_config_exclude.split(',') + + if (testCountry && filename !== 'channels/' + testCountry + '.m3u') return true + + for(const countryCode of excludeCountries) { + if (filename === 'channels/' + countryCode + '.m3u') return true + } + + return false +} \ No newline at end of file From 68dd98cbe4be314e150ff79414c66bdefcf0300f Mon Sep 17 00:00:00 2001 From: freearhey Date: Sun, 8 Sep 2019 20:59:13 +0300 Subject: [PATCH 14/16] Update af.m3u Removed 1 dead link --- channels/af.m3u | 2 -- 1 file changed, 2 deletions(-) diff --git a/channels/af.m3u b/channels/af.m3u index 423eb87f2..722a38393 100644 --- a/channels/af.m3u +++ b/channels/af.m3u @@ -25,8 +25,6 @@ http://playout395.livestreamingcdn.com:1935/live/Stream1/playlist.m3u8 http://173.208.166.179/khurshid_tv_live-motherkhata-a28b7_789abc_636wwwww4e888555-dont-copy/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RNKujnB.jpg" group-title="",Lemar TV http://173.208.166.179/lemar_tv_live-kona-warkawa-dawosa-ma-use-kawa-bastard-Dozd_zxcv555/tracks-v1a1/mono.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/tcE6rUI.jpg" group-title="",Mitra TV -http://173.208.166.179/mitra_tv_live-4a64668668a3b6599d1_asdf-935f99f7896449d697f-fuck-off/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/305iEl2.png" group-title="",Pamir TV http://live.pamir.tv/ptv/d0dbe915091d400bd8ee7f27f0791303.sdp/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/oC5Xnxh.png" group-title="",Payam-E-Afghan TV From 1f08ed38af51cdc4a5308685a6507828cf3a81a1 Mon Sep 17 00:00:00 2001 From: freearhey Date: Sun, 8 Sep 2019 20:59:21 +0300 Subject: [PATCH 15/16] Update ba.m3u Removed 2 dead links --- channels/ba.m3u | 4 ---- 1 file changed, 4 deletions(-) diff --git a/channels/ba.m3u b/channels/ba.m3u index d4442a290..4c55c826b 100644 --- a/channels/ba.m3u +++ b/channels/ba.m3u @@ -3,9 +3,5 @@ http://aljazeera-balkans-apple-live.adaptive.level3.net/apple/aljazeera/balkans/160.m3u8 #EXTINF:-1 tvg-id="BN Televizija-EXYU" tvg-name="BN Televizija-EXYU" tvg-logo="https://i.imgur.com/8UD164r.png" group-title="",BN Televizija http://tvstream.rtvbn.com:1935/live/stream/chunklist_w1957700324.m3u8 -#EXTINF:-1 tvg-id="OBN-EXYU" tvg-name="OBN-EXYU" tvg-logo="https://i.imgur.com/zkcs4P9.png" group-title="",OBN -http://bos.00387.info:27979/OBNSAT/index.m3u8 -#EXTINF:-1 tvg-id="RTV USK-EXYU" tvg-name="RTV USK-EXYU" tvg-logo="https://i.imgur.com/1Btvotr.png" group-title="",RTV USK -http://ott.dobratv.net:8888/rtvusk/tracks-v1a1/mono.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hdwjkYa.png" group-title="",Televizija 5 http://37.59.21.217:8809/live/tv5web.m3u8 From 62fdbdd331845be360021444b84a9e81529c171e Mon Sep 17 00:00:00 2001 From: freearhey Date: Sun, 8 Sep 2019 20:59:29 +0300 Subject: [PATCH 16/16] Update by.m3u Removed 1 dead link --- channels/by.m3u | 2 -- 1 file changed, 2 deletions(-) diff --git a/channels/by.m3u b/channels/by.m3u index 455eedee4..d68bf82e6 100644 --- a/channels/by.m3u +++ b/channels/by.m3u @@ -5,8 +5,6 @@ https://nimble01edge01.hoster.by/belarus24hd/livehd/chunks.m3u8 http://streams.tv.mts.by/belmustv/1/index.m3u8 #EXTINF:-1 tvg-id="tro" tvg-name="ТРО" tvg-logo="https://iptvx.one/icn/belros.png" group-title="",БелРос ТВ http://live2.mediacdn.ru/sr1/tro/playlist.m3u8 -#EXTINF:-1 tvg-id="tro" tvg-name="ТРО" tvg-logo="https://iptvx.one/icn/belros.png" group-title="",БелРос ТВ -https://str-3.mediabay.tv/BelRos/playlist.m3u8?token=3cf292c37b71d118c72c5c9d0261de59821ccf34-6e8b70fd9eca8148004e3fa9cd1b9759-1566590194-1566579394 #EXTINF:-1 tvg-id="ont-by" tvg-name="ОНТ" tvg-logo="https://iptvx.one/icn/ont-by.png" group-title="General",ОНТ http://stream.ont.by:1935/ont/live576p/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Радио ХИТ (Орск)