From 81ea2356e9cdef7bd7e9c0c8929311366589d70c Mon Sep 17 00:00:00 2001 From: krandor Date: Tue, 7 Jan 2025 16:39:58 -0500 Subject: [PATCH] apply patch from @dirkf --- yt_dlp/extractor/pbs.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/yt_dlp/extractor/pbs.py b/yt_dlp/extractor/pbs.py index 686796491d..659789023b 100644 --- a/yt_dlp/extractor/pbs.py +++ b/yt_dlp/extractor/pbs.py @@ -47,7 +47,7 @@ class PBSIE(InfoExtractor): (r'video\.kpbs\.org', 'KPBS San Diego (KPBS)'), # http://www.kpbs.org/ (r'video\.kqed\.org', 'KQED (KQED)'), # http://www.kqed.org (r'vids\.kvie\.org', 'KVIE Public Television (KVIE)'), # http://www.kvie.org - (r'video\.pbssocal\.org', 'PBS SoCal/KOCE (KOCE)'), # http://www.pbssocal.org/ + (r'(?:video\.|www\.)pbssocal\.org', 'PBS SoCal/KOCE (KOCE)'), # http://www.pbssocal.org/ (r'video\.valleypbs\.org', 'ValleyPBS (KVPT)'), # http://www.valleypbs.org/ (r'video\.cptv\.org', 'CONNECTICUT PUBLIC TELEVISION (WEDH)'), # http://cptv.org (r'watch\.knpb\.org', 'KNPB Channel 5 (KNPB)'), # http://www.knpb.org/ @@ -185,14 +185,15 @@ class PBSIE(InfoExtractor): _VALID_URL = r'''(?x)https?:// (?: - # Direct video URL - (?:{})/(?:(?:vir|port)alplayer|video)/(?P[0-9]+)(?:[?/]|$) | - # Article with embedded player (or direct video) - (?:www\.)?pbs\.org/(?:[^/]+/){{1,5}}(?P[^/]+?)(?:\.html)?/?(?:$|[?\#]) | - # Player - (?:video|player)\.pbs\.org/(?:widget/)?partnerplayer/(?P[^/]+) + # Player + (?:video|player)\.pbs\.org/(?:widget/)?partnerplayer/(?P[^/]+) | + # Direct video URL, or article with embedded player + (?:%s)/(?: + (?:(?:vir|port)alplayer|video)/(?P[0-9]+)(?:[?/]|$) | + (?:[^/]+/){1,5}(?P[^/]+?)(?:\.html)?/?(?:$|[?\#]) + ) ) - '''.format('|'.join(next(zip(*_STATIONS)))) + ''' % '|'.join(next(zip(*_STATIONS))) _GEO_COUNTRIES = ['US']