Update streams.

Fix streams.
Remove broken streams.
Update IDs.

streams/cn_cctv.m3u

@@ -4,100 +4,36 @@ https://cd-live-stream.news.cctvplus.com/live/smil:CHANNEL1.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CCTVPlus2.cn",CCTV+ 2 (600p) [Not 24/7]
 https://cd-live-stream.news.cctvplus.com/live/smil:CHANNEL2.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CCTV1.cn",CCTV-1综合 (1080p)
-http://183.196.25.171:808/hls/1/index.m3u8
-#EXTINF:-1 tvg-id="CCTV1.cn",CCTV-1综合 (1080p)
-https://live.goodiptv.club/api/cqyx.php?id=cctv1HD
-#EXTINF:-1 tvg-id="CCTV1.cn",CCTV-1综合 (1080p)
 https://node1.olelive.com:6443/live/CCTV1HD/hls.m3u8
 #EXTINF:-1 tvg-id="CCTV1.cn",CCTV-1综合 (576p)
 http://42.176.185.28:9901/tsfile/live/1022_1.m3u8
 #EXTINF:-1 tvg-id="CCTV2.cn",CCTV-2财经 (1080p)
-http://183.196.25.171:808/hls/2/index.m3u8
-#EXTINF:-1 tvg-id="CCTV2.cn",CCTV-2财经 (1080p)
-https://live.goodiptv.club/api/cqyx.php?id=cctv2HD
-#EXTINF:-1 tvg-id="CCTV2.cn",CCTV-2财经 (1080p)
 https://node1.olelive.com:6443/live/CCTV2HD/hls.m3u8
-#EXTINF:-1 tvg-id="CCTV3.cn",CCTV-3综艺 (1080p)
-http://183.196.25.171:808/hls/75/index.m3u8
 #EXTINF:-1 tvg-id="CCTV4America.cn",CCTV-4 America (1080p)
 https://global.cgtn.cicc.media.caton.cloud/master/cgtn-america.m3u8
 #EXTINF:-1 tvg-id="CCTV4Asia.cn",CCTV-4 Asia (480p)
 http://210.210.155.37/qwr9ew/s/s19/index.m3u8
-#EXTINF:-1 tvg-id="CCTV4K.cn",CCTV-4K超高清
-https://live.goodiptv.club/api/cqyx.php?id=CCTV4K
-#EXTINF:-1 tvg-id="CCTV5Plus.cn",CCTV-5+体育赛事 (1080p)
-https://live.goodiptv.club/api/cqyx.php?id=cctv5SportHD
 #EXTINF:-1 tvg-id="CCTV5Plus.cn",CCTV-5+体育赛事 (1080p)
 https://node1.olelive.com:6443/live/CCTV5PHD/hls.m3u8
 #EXTINF:-1 tvg-id="CCTV5.cn",CCTV-5体育 (1080p)
 http://1.85.0.62:808/hls/503/index.m3u8
 #EXTINF:-1 tvg-id="CCTV5.cn",CCTV-5体育 (1080p)
-http://183.196.25.171:808/hls/78/index.m3u8
-#EXTINF:-1 tvg-id="CCTV5.cn",CCTV-5体育 (1080p)
 http://220.178.228.153:1935/live/cctv5/playlist.m3u8
 #EXTINF:-1 tvg-id="CCTV5.cn",CCTV-5体育 (1080p)
 http://223.95.111.98:5555/newlive/live/hls/5/live.m3u8
 #EXTINF:-1 tvg-id="CCTV5.cn",CCTV-5体育 (1080p)
-https://live.goodiptv.club/api/cqyx.php?id=cctv5HD
-#EXTINF:-1 tvg-id="CCTV5.cn",CCTV-5体育 (1080p)
 https://node1.olelive.com:6443/live/CCTV5HD/hls.m3u8
 #EXTINF:-1 tvg-id="CCTV6.cn",CCTV-6电影 (1080p)
 http://1.85.0.62:808/hls/6/index.m3u8
-#EXTINF:-1 tvg-id="CCTV6.cn",CCTV-6电影 (1080p)
-http://183.196.25.171:808/hls/76/index.m3u8
-#EXTINF:-1 tvg-id="CCTV6.cn",CCTV-6电影 (1080p)
-https://live.goodiptv.club/api/cqyx.php?id=cctv6HD
-#EXTINF:-1 tvg-id="CCTV7.cn",CCTV-7国防军事 (1080p)
-http://183.196.25.171:808/hls/7/index.m3u8
-#EXTINF:-1 tvg-id="CCTV7.cn",CCTV-7国防军事 (1080p)
-https://live.goodiptv.club/api/cqyx.php?id=cctv7HD
 #EXTINF:-1 tvg-id="CCTV7.cn",CCTV-7国防军事 (1080p)
 https://node1.olelive.com:6443/live/CCTV7HD/hls.m3u8
 #EXTINF:-1 tvg-id="CCTV8.cn",CCTV-8电视剧 (1080p)
-http://183.196.25.171:808/hls/77/index.m3u8
-#EXTINF:-1 tvg-id="CCTV8.cn",CCTV-8电视剧 (1080p)
-https://live.goodiptv.club/api/cqyx.php?id=cctv8HD
-#EXTINF:-1 tvg-id="CCTV8.cn",CCTV-8电视剧 (1080p)
 https://node1.olelive.com:6443/live/CCTV8HD/hls.m3u8
 #EXTINF:-1 tvg-id="CCTV9.cn",CCTV-9纪录 (1080p)
-http://183.196.25.171:808/hls/9/index.m3u8
-#EXTINF:-1 tvg-id="CCTV9.cn",CCTV-9纪录 (1080p)
-https://live.goodiptv.club/api/cqyx.php?id=cctv9HD
-#EXTINF:-1 tvg-id="CCTV9.cn",CCTV-9纪录 (1080p)
 https://node1.olelive.com:6443/live/CCTV9HD/hls.m3u8
 #EXTINF:-1 tvg-id="CCTV10.cn",CCTV-10科教 (1080p)
-http://183.196.25.171:808/hls/10/index.m3u8
-#EXTINF:-1 tvg-id="CCTV10.cn",CCTV-10科教 (1080p)
-https://live.goodiptv.club/api/cqyx.php?id=cctv10HD
-#EXTINF:-1 tvg-id="CCTV10.cn",CCTV-10科教 (1080p)
 https://node1.olelive.com:6443/live/CCTV10HD/hls.m3u8
-#EXTINF:-1 tvg-id="CCTV11.cn",CCTV-11戏曲 (1080p)
-http://183.196.25.171:808/hls/11/index.m3u8
-#EXTINF:-1 tvg-id="CCTV11.cn",CCTV-11戏曲 (1080p)
-https://live.goodiptv.club/api/cqyx.php?id=cctv11HD
-#EXTINF:-1 tvg-id="CCTV12.cn",CCTV-12社会与法制 (1080p)
-http://183.196.25.171:808/hls/12/index.m3u8
-#EXTINF:-1 tvg-id="CCTV12.cn",CCTV-12社会与法制 (1080p)
-https://live.goodiptv.club/api/cqyx.php?id=cctv12HD
-#EXTINF:-1 tvg-id="CCTV13.cn",CCTV-13新闻 (1080p)
-http://183.196.25.171:808/hls/13/index.m3u8
 #EXTINF:-1 tvg-id="CCTV13.cn",CCTV-13新闻 (1080p)
 https://live-play.cctvnews.cctv.com/cctv/merge_cctv13.m3u8
 #EXTINF:-1 tvg-id="CCTV13.cn",CCTV-13新闻 (1080p)
-https://live.goodiptv.club/api/cqyx.php?id=CCTVNewsHD
-#EXTINF:-1 tvg-id="CCTV13.cn",CCTV-13新闻 (1080p)
 https://node1.olelive.com:6443/live/CCTV13HD/hls.m3u8
-#EXTINF:-1 tvg-id="CCTV14.cn",CCTV-14少儿 (1080p)
-http://183.196.25.171:808/hls/14/index.m3u8
-#EXTINF:-1 tvg-id="CCTV14.cn",CCTV-14少儿 (1080p)
-https://live.goodiptv.club/api/cqyx.php?id=cctvseHD
-#EXTINF:-1 tvg-id="CCTV15.cn",CCTV-15音乐 (1080p)
-http://183.196.25.171:808/hls/15/index.m3u8
-#EXTINF:-1 tvg-id="CCTV15.cn",CCTV-15音乐 (1080p)
-https://live.goodiptv.club/api/cqyx.php?id=cctv15HD
-#EXTINF:-1 tvg-id="CCTV16.cn",CCTV-16奥林匹克
-https://live.goodiptv.club/api/cqyx.php?id=CCTV16_4K
-#EXTINF:-1 tvg-id="CCTV17.cn",CCTV-17农业农村 (1080p)
-http://183.196.25.171:808/hls/93/index.m3u8
-#EXTINF:-1 tvg-id="CCTV17.cn",CCTV-17农业农村 (1080p)
-https://live.goodiptv.club/api/cqyx.php?id=cctv17HD

streams/cr.m3u

@@ -5,7 +5,7 @@ http://k3.usastreams.com/CableLatino/88stereo/playlist.m3u8
 https://cageu.bozztv.com/ssh101/ssh101/opacanal38/playlist.m3u8
 #EXTINF:-1 tvg-id="AgrotendenciaTV.cr",Agrotendencia TV (1080p)
 https://5fc584f3f19c9.streamlock.net/agrotendencia/videoagrotendencia_hls1/playlist.m3u8
-#EXTINF:-1 tvg-id="AnexionTV.cr",Anexión TV Canal 36 (1080p)
+#EXTINF:-1 tvg-id="Trivision36.cr",Anexión TV Canal 36 (1080p)
 https://liveingesta118.cdnmedia.tv/trivision36live/smil:dvrlive.smil/playlist.m3u8?DVR=
 #EXTINF:-1 tvg-id="AntenaSeisTV.cr",Antena Seis TV (720p) [Geo-blocked]
 http://inliveserver.com:1935/14510/14510/playlist.m3u8
@@ -55,7 +55,7 @@ https://627bb251f23c7.streamlock.net:444/ExtremaTV/ExtremaTV/playlist.m3u8
 https://59ef525c24caa.streamlock.net/garabitoTV/garabitotv/playlist.m3u8
 #EXTINF:-1 tvg-id="GuatusoTV.cr",Guatuso TV (720p)
 https://5cf4a2c2512a2.streamlock.net/8162/8162/master.m3u8
-#EXTINF:-1 tvg-id="HBTVTicaVision.cr",HBTV TicaVisión (1080p)
+#EXTINF:-1 tvg-id="TicaVision.cr",HBTV TicaVisión (1080p)
 https://62fc643fbf1aa.streamlock.net/HBTV/HBTV/playlist.m3u8
 #EXTINF:-1 tvg-id="IQChannel.cr",IQ Channel (720p)
 https://rtmp.info/iqtv/envivo/playlist.m3u8

streams/sv.m3u

@@ -7,7 +7,7 @@ https://streaming.grupocsanetwork.com:19360/canal11/canal11.m3u8
 https://d273tvzn6z86cs.cloudfront.net/Canal12SV/d8d7dedcfe37a9a9da9d9f69058b82b7.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="El15TV.sv",Canal 15 Usulután (720p) [Not 24/7]
 https://streaming.grupocsanetwork.com:19360/canal15/canal15.m3u8
-#EXTINF:-1 tvg-id="DiarioTRV.sv",Canal TRV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="CanalTRV.sv",Canal TRV (480p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/encoder44/playlist.m3u8
 #EXTINF:-1 tvg-id="ElCaminoTV.sv",El Camino TV (480p)
 https://5d32e2b9b7eed.streamlock.net:4443/ectv/ectv/playlist.m3u8

streams/us.m3u

@@ -844,7 +844,7 @@ https://playout4multirtmp.tulix.tv/live6/Stream1/playlist.m3u8
 https://a.jsrdn.com/broadcast/fabeab4b08/+0000/c.m3u8
 #EXTINF:-1 tvg-id="",Star 101 FM (KNUT Guam) [Not 24/7]
 https://live2.tensila.com/knut-v-1.choice/hls/master.m3u8
-#EXTINF:-1 tvg-id="StarTrek2.us",Star Trek 2
+#EXTINF:-1 tvg-id="MoreStarTrek.us",Star Trek 2
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/634dacf51d90320007fcd5fa/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="StocktonGovTV.us",Stockton GovTV (Stockton CA) (720p)
 https://cdn3.wowza.com/5/dk84U1p2UUdoMGxT/stockton/G0044_008/playlist.m3u8