From 56de7b732fd774616dd499a62d0b4c6e51447af7 Mon Sep 17 00:00:00 2001 From: what-a <88639906+what-a@users.noreply.github.com> Date: Wed, 5 Jan 2022 17:38:59 -0800 Subject: [PATCH 1/4] Update us.m3u Scrubbed PBS naming and logos. There was duplicate entry (i.e. same stream listed twice) for PBS Allentown PA, so I deleted one. --- channels/us.m3u | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/channels/us.m3u b/channels/us.m3u index 1ac3c89f28..7a19171373 100644 --- a/channels/us.m3u +++ b/channels/us.m3u @@ -1095,7 +1095,7 @@ https://a.jsrdn.com/broadcast/256ad9e679/+0000/c.m3u8 https://broadcast.mytvtogo.net/movee4u/movee4u/playlist.m3u8 #EXTINF:-1 tvg-id="MovieKingdom.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pIuJqYk.png" group-title="Movies",Movie Kingdom (720p) https://a.jsrdn.com/broadcast/e9b4093a41/+0000/c.m3u8 -#EXTINF:-1 tvg-id="MPT.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/kt0R7ua.jpg" group-title="General",MPT PBS Owings Mills MD (1088p) +#EXTINF:-1 tvg-id="MPT.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/bento3-prod/kwcm-bento-live-pbs/Logos/PBS%20National/PBS%20logo/aaac26c5b7_PBS_P-Head-01.png" group-title="Local;Education",PBS MPT Baltimore MD (WMPB) (1088p) https://2-fss-2.streamhoster.com/pl_138/amlst:201814-1291584/playlist.m3u8 #EXTINF:-1 tvg-id="MSNBC.us" tvg-country="US" tvg-language="English" tvg-logo="https://static-s.aa-cdn.net/img/ios/396885309/4ad7161a83db264f3ba4b62ef1ab662a?v=1" group-title="News",MSNBC (720p) [Not 24/7] http://1111296894.rsc.cdn77.org/LS-ATL-54548-10/playlist.m3u8 @@ -1296,19 +1296,17 @@ http://g5nl6xx5lpq6-hls-live.5centscdn.com/live1234/2621b29e501b445fabf227b08612 http://uni6rtmp.tulix.tv:1935/ucur1/Payvand/playlist.m3u8 #EXTINF:-1 tvg-id="PBCTapeshTV.us" tvg-country="US;IR" tvg-language="Persian" tvg-logo="https://i.imgur.com/Yry3FXW.png" group-title="General",PBC Tapesh TV (720p) [Offline] https://iptv.tapesh.tv/tapesh/playlist.m3u8 -#EXTINF:-1 tvg-id="WorldChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBSWorld_972x972.png?raw=true" group-title="Entertainment",PBS | World Channel (480p) +#EXTINF:-1 tvg-id="WorldChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBSWorld_972x972.png?raw=true" group-title="Education",PBS World Channel (480p) https://cs.ebmcdn.net/eastbay-live-hs-1/apt/mp4:apt-world/playlist.m3u8 -#EXTINF:-1 tvg-id="WLVTTV" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBS.png?raw=true" group-title="General",PBS 39 Allentown PA (WLVT) (720p) +#EXTINF:-1 tvg-id="WLVTTV" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/bento3-prod/kwcm-bento-live-pbs/Logos/PBS%20National/PBS%20logo/aaac26c5b7_PBS_P-Head-01.png" group-title="Local;Education",PBS 39 Allentown PA (WLVT) (720p) https://forerunnerrtmp.livestreamingcdn.com/output18/output18.stream/playlist.m3u8 -#EXTINF:-1 tvg-id="WPPT.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBS.png?raw=true" group-title="General",PBS 39 Extra Philadelphia PA (WPPT) (480p) +#EXTINF:-1 tvg-id="WPPT.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/bento3-prod/kwcm-bento-live-pbs/Logos/PBS%20National/PBS%20logo/aaac26c5b7_PBS_P-Head-01.png" group-title="Local;Education",PBS 39 Extra Philadelphia PA (WPPT) (480p) https://forerunnerrtmp.livestreamingcdn.com/output18-2/output18-2.stream/playlist.m3u8 -#EXTINF:-1 tvg-id="WLVTTV.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="General",PBS Allentown-PA (WLVT-TV1) (720p) -https://forerunnerrtmp.livestreamingcdn.com/output18/output18.stream/playlist.m3u8 -#EXTINF:-1 tvg-id="KLCSDT3.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jmaNzgg.jpg" group-title="Entertainment",PBS Create Los Angeles CA (KLCS-DT3) (720p) [Geo-blocked] +#EXTINF:-1 tvg-id="KLCSDT3.us" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/22.2-Create.png" group-title="Education",PBS Create Los Angeles CA (KLCS-DT3) (720p) [Geo-blocked] https://d1mxoeplf1ak5a.cloudfront.net/index.m3u8 -#EXTINF:-1 tvg-id="KERATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjYxNjkxMTBf/PBS.png" group-title="General",PBS Dallas TX (KERA) (1080p) [Geo-blocked] +#EXTINF:-1 tvg-id="KERATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/bento3-prod/kwcm-bento-live-pbs/Logos/PBS%20National/PBS%20logo/aaac26c5b7_PBS_P-Head-01.png" group-title="Local;Education",PBS Dallas TX (KERA) (1080p) [Geo-blocked] https://kera-flash.streamguys1.com/live/eventStream/playlist.m3u8 -#EXTINF:-1 tvg-id="WKMJTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/wkle-color-single-brand-logo-yJUbW1W.png" group-title="General",PBS KET 68.1 Louisville KY (WKMJ-TV) (720p) +#EXTINF:-1 tvg-id="WKMJTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/wkle-color-single-brand-logo-yJUbW1W.png" group-title="Local;Education",PBS KET Louisville KY (WKMJ-TV) (720p) https://2-fss-1.streamhoster.com/pl_134/amlst:200914-1282960/playlist.m3u8 #EXTINF:-1 tvg-id="PBSKidsAKST.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ambc9le.png" group-title="Education;Kids",PBS Kids Alaska (1080p) https://livestream.pbskids.org/out/v1/2963202df0c142c69b5254a546473308/akst.m3u8 @@ -1322,13 +1320,13 @@ https://livestream.pbskids.org/out/v1/19d1d62bf61b4aea9ec20f83b6450a4e/hast.m3u8 https://livestream.pbskids.org/out/v1/00a3b9014fa54c40bee6ca68a104a8a4/mst.m3u8 #EXTINF:-1 tvg-id="PBSKidsPST.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ambc9le.png" group-title="Education;Kids",PBS Kids Pacific (1080p) https://livestream.pbskids.org/out/v1/c707b9310f2848de849b336f9914adbc/pst.m3u8 -#EXTINF:-1 tvg-id="KCTSTV.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="General",PBS Seattle-WA (KCTS-TV1) (720p) +#EXTINF:-1 tvg-id="KCTSTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/bento3-prod/kwcm-bento-live-pbs/Logos/PBS%20National/PBS%20logo/aaac26c5b7_PBS_P-Head-01.png" group-title="Local;Education",PBS Seattle WA (KCTS-TV1) (720p) http://encodercdn1.frontline.ca/bespin/output/PBS_Seattle_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="KSPSTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://cdn.tvpassport.com/image/station/100x100/pbs.png" group-title="General",PBS Spokane-WA (KSPS-TV1) (720p) +#EXTINF:-1 tvg-id="KSPSTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/bento3-prod/kwcm-bento-live-pbs/Logos/PBS%20National/PBS%20logo/aaac26c5b7_PBS_P-Head-01.png" group-title="Local;Education",PBS Spokane WA (KSPS-TV1) (720p) http://encodercdn1.frontline.ca/encoder183/output/PBS_Spokane_720p/playlist.m3u8 #EXTINF:-1 tvg-id="PCCTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/9PEAPwY.png" group-title="Local",PCC-TV Pinellas County FL (480p) http://granicusliveus1-a.akamaihd.net/pinellas/G1551_004/playlist.m3u8 -#EXTINF:-1 tvg-id="Peachtree.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="General",Peachtree TV Atlanta-GA (WPCH-TV1) (720p) +#EXTINF:-1 tvg-id="Peachtree.us" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/b/b7/WPCH-TV_logo.svg/320px-WPCH-TV_logo.svg.png" group-title="General",Peachtree TV Atlanta GA (WPCH-TV1) (720p) http://encodercdn1.frontline.ca/encoder181/output/Peachtree_720p/playlist.m3u8 #EXTINF:-1 tvg-id="PeopleTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7SarjaU.png" group-title="Entertainment",People TV (1080p) https://d1qaz9zojo1ayt.cloudfront.net/playlist.m3u8 From f1280edd3d45c5aa6e3ff4c15966137b88505888 Mon Sep 17 00:00:00 2001 From: MapGuy11 <43685307+MapGuy11@users.noreply.github.com> Date: Thu, 6 Jan 2022 09:40:09 -0500 Subject: [PATCH 2/4] Official Logo Please --- channels/us.m3u | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/us.m3u b/channels/us.m3u index 45785fd050..990938019a 100644 --- a/channels/us.m3u +++ b/channels/us.m3u @@ -1095,7 +1095,7 @@ https://a.jsrdn.com/broadcast/256ad9e679/+0000/c.m3u8 https://broadcast.mytvtogo.net/movee4u/movee4u/playlist.m3u8 #EXTINF:-1 tvg-id="MovieKingdom.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pIuJqYk.png" group-title="Movies",Movie Kingdom (600p) https://a.jsrdn.com/broadcast/e9b4093a41/+0000/c.m3u8 -#EXTINF:-1 tvg-id="MPT.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/bento3-prod/kwcm-bento-live-pbs/Logos/PBS%20National/PBS%20logo/aaac26c5b7_PBS_P-Head-01.png" group-title="Local;Education",PBS MPT Baltimore MD (WMPB) (1088p) +#EXTINF:-1 tvg-id="MPT.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/wmpb-white-single-brand-logo-dwYo9OV.png" group-title="Local;Education",PBS MPT Baltimore MD (WMPB) (1088p) https://2-fss-2.streamhoster.com/pl_138/amlst:201814-1291584/playlist.m3u8 #EXTINF:-1 tvg-id="MSNBC.us" tvg-country="US" tvg-language="English" tvg-logo="https://static-s.aa-cdn.net/img/ios/396885309/4ad7161a83db264f3ba4b62ef1ab662a?v=1" group-title="News",MSNBC (720p) [Not 24/7] http://1111296894.rsc.cdn77.org/LS-ATL-54548-10/playlist.m3u8 From f3ec3af1a947af4fbd7c949d57246f1c8e76fd76 Mon Sep 17 00:00:00 2001 From: what-a <88639906+what-a@users.noreply.github.com> Date: Thu, 6 Jan 2022 19:51:37 -0800 Subject: [PATCH 3/4] Update us.m3u Referenced new logo location that is not Geo-blocked. https://i.ibb.co/2KqyGjL/PBS-logo.png --- channels/us.m3u | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/channels/us.m3u b/channels/us.m3u index 990938019a..a56d98e75e 100644 --- a/channels/us.m3u +++ b/channels/us.m3u @@ -1298,13 +1298,13 @@ http://uni6rtmp.tulix.tv:1935/ucur1/Payvand/playlist.m3u8 https://iptv.tapesh.tv/tapesh/playlist.m3u8 #EXTINF:-1 tvg-id="WorldChannel.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBSWorld_972x972.png?raw=true" group-title="Education",PBS World Channel (480p) https://cs.ebmcdn.net/eastbay-live-hs-1/apt/mp4:apt-world/playlist.m3u8 -#EXTINF:-1 tvg-id="WLVTTV" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/bento3-prod/kwcm-bento-live-pbs/Logos/PBS%20National/PBS%20logo/aaac26c5b7_PBS_P-Head-01.png" group-title="Local;Education",PBS 39 Allentown PA (WLVT) (720p) +#EXTINF:-1 tvg-id="WLVTTV" tvg-country="US" tvg-language="English" tvg-logo="https://i.ibb.co/2KqyGjL/PBS-logo.png" group-title="Local;Education",PBS 39 Allentown PA (WLVT) (720p) https://forerunnerrtmp.livestreamingcdn.com/output18/output18.stream/playlist.m3u8 -#EXTINF:-1 tvg-id="WPPT.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/bento3-prod/kwcm-bento-live-pbs/Logos/PBS%20National/PBS%20logo/aaac26c5b7_PBS_P-Head-01.png" group-title="Local;Education",PBS 39 Extra Philadelphia PA (WPPT) (480p) +#EXTINF:-1 tvg-id="WPPT.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.ibb.co/2KqyGjL/PBS-logo.png" group-title="Local;Education",PBS 39 Extra Philadelphia PA (WPPT) (480p) https://forerunnerrtmp.livestreamingcdn.com/output18-2/output18-2.stream/playlist.m3u8 #EXTINF:-1 tvg-id="KLCSDT3.us" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/22.2-Create.png" group-title="Education",PBS Create Los Angeles CA (KLCS-DT3) (720p) [Geo-blocked] https://d1mxoeplf1ak5a.cloudfront.net/index.m3u8 -#EXTINF:-1 tvg-id="KERATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/bento3-prod/kwcm-bento-live-pbs/Logos/PBS%20National/PBS%20logo/aaac26c5b7_PBS_P-Head-01.png" group-title="Local;Education",PBS Dallas TX (KERA) (1080p) [Geo-blocked] +#EXTINF:-1 tvg-id="KERATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.ibb.co/2KqyGjL/PBS-logo.png" group-title="Local;Education",PBS Dallas TX (KERA) (1080p) [Geo-blocked] https://kera-flash.streamguys1.com/live/eventStream/playlist.m3u8 #EXTINF:-1 tvg-id="WKMJTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/wkle-color-single-brand-logo-yJUbW1W.png" group-title="Local;Education",PBS KET Louisville KY (WKMJ-TV) (720p) https://2-fss-1.streamhoster.com/pl_134/amlst:200914-1282960/playlist.m3u8 @@ -1320,9 +1320,9 @@ https://livestream.pbskids.org/out/v1/19d1d62bf61b4aea9ec20f83b6450a4e/hast.m3u8 https://livestream.pbskids.org/out/v1/00a3b9014fa54c40bee6ca68a104a8a4/mst.m3u8 #EXTINF:-1 tvg-id="PBSKidsPST.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ambc9le.png" group-title="Education;Kids",PBS Kids Pacific (1080p) https://livestream.pbskids.org/out/v1/c707b9310f2848de849b336f9914adbc/pst.m3u8 -#EXTINF:-1 tvg-id="KCTSTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/bento3-prod/kwcm-bento-live-pbs/Logos/PBS%20National/PBS%20logo/aaac26c5b7_PBS_P-Head-01.png" group-title="Local;Education",PBS Seattle WA (KCTS-TV1) (720p) +#EXTINF:-1 tvg-id="KCTSTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.ibb.co/2KqyGjL/PBS-logo.png" group-title="Local;Education",PBS Seattle WA (KCTS-TV1) (720p) http://encodercdn1.frontline.ca/bespin/output/PBS_Seattle_720p/playlist.m3u8 -#EXTINF:-1 tvg-id="KSPSTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/bento3-prod/kwcm-bento-live-pbs/Logos/PBS%20National/PBS%20logo/aaac26c5b7_PBS_P-Head-01.png" group-title="Local;Education",PBS Spokane WA (KSPS-TV1) (720p) +#EXTINF:-1 tvg-id="KSPSTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.ibb.co/2KqyGjL/PBS-logo.png" group-title="Local;Education",PBS Spokane WA (KSPS-TV1) (720p) http://encodercdn1.frontline.ca/encoder183/output/PBS_Spokane_720p/playlist.m3u8 #EXTINF:-1 tvg-id="PCCTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/9PEAPwY.png" group-title="Local",PCC-TV Pinellas County FL (480p) http://granicusliveus1-a.akamaihd.net/pinellas/G1551_004/playlist.m3u8 From 65af2759b790c4544426543c68d861425ffc30f5 Mon Sep 17 00:00:00 2001 From: what-a <88639906+what-a@users.noreply.github.com> Date: Thu, 6 Jan 2022 19:54:58 -0800 Subject: [PATCH 4/4] Update us.m3u --- channels/us.m3u | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/us.m3u b/channels/us.m3u index a56d98e75e..859ef65f3c 100644 --- a/channels/us.m3u +++ b/channels/us.m3u @@ -1095,7 +1095,7 @@ https://a.jsrdn.com/broadcast/256ad9e679/+0000/c.m3u8 https://broadcast.mytvtogo.net/movee4u/movee4u/playlist.m3u8 #EXTINF:-1 tvg-id="MovieKingdom.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pIuJqYk.png" group-title="Movies",Movie Kingdom (600p) https://a.jsrdn.com/broadcast/e9b4093a41/+0000/c.m3u8 -#EXTINF:-1 tvg-id="MPT.us" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/wmpb-white-single-brand-logo-dwYo9OV.png" group-title="Local;Education",PBS MPT Baltimore MD (WMPB) (1088p) +#EXTINF:-1 tvg-id="MPT.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/kt0R7ua.jpg" group-title="Local;Education",PBS MPT Baltimore MD (WMPB) (1088p) https://2-fss-2.streamhoster.com/pl_138/amlst:201814-1291584/playlist.m3u8 #EXTINF:-1 tvg-id="MSNBC.us" tvg-country="US" tvg-language="English" tvg-logo="https://static-s.aa-cdn.net/img/ios/396885309/4ad7161a83db264f3ba4b62ef1ab662a?v=1" group-title="News",MSNBC (720p) [Not 24/7] http://1111296894.rsc.cdn77.org/LS-ATL-54548-10/playlist.m3u8