X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fpbs.py;h=604a0dd222a175a762a56735b2244b7391485c3e;hb=176ccefcd89af5393b7cab14237097c54dd0ee14;hp=3448736a258458ff1a2b4a2ee126ce703894e6dc;hpb=c571dea9532e468ba294b933d16d9366baf825d5;p=youtube-dl diff --git a/youtube_dl/extractor/pbs.py b/youtube_dl/extractor/pbs.py index 3448736a2..604a0dd22 100644 --- a/youtube_dl/extractor/pbs.py +++ b/youtube_dl/extractor/pbs.py @@ -8,22 +8,188 @@ from ..utils import ( ExtractorError, determine_ext, int_or_none, + strip_jsonp, unified_strdate, US_RATINGS, ) class PBSIE(InfoExtractor): + _STATIONS = ( + ('video.pbs.org', 'PBS: Public Broadcasting Service'), # http://www.pbs.org/ + ('video.aptv.org', 'APT - Alabama Public Television (WBIQ)'), # http://aptv.org/ + ('video.gpb.org', 'GPB/Georgia Public Broadcasting (WGTV)'), # http://www.gpb.org/ + ('video.mpbonline.org', 'Mississippi Public Broadcasting (WMPN)'), # http://www.mpbonline.org + ('video.wnpt.org', 'Nashville Public Television (WNPT)'), # http://www.wnpt.org + ('video.wfsu.org', 'WFSU-TV (WFSU)'), # http://wfsu.org/ + ('video.wsre.org', 'WSRE (WSRE)'), # http://www.wsre.org + ('video.wtcitv.org', 'WTCI (WTCI)'), # http://www.wtcitv.org + ('video.pba.org', 'WPBA/Channel 30 (WPBA)'), # http://pba.org/ + ('video.alaskapublic.org', 'Alaska Public Media (KAKM)'), # http://alaskapublic.org/kakm + # ('kuac.org', 'KUAC (KUAC)'), # http://kuac.org/kuac-tv/ + # ('ktoo.org', '360 North (KTOO)'), # http://www.ktoo.org/ + # ('azpm.org', 'KUAT 6 (KUAT)'), # http://www.azpm.org/ + ('video.azpbs.org', 'Arizona PBS (KAET)'), # http://www.azpbs.org + ('portal.knme.org', 'KNME-TV/Channel 5 (KNME)'), # http://www.newmexicopbs.org/ + ('video.vegaspbs.org', 'Vegas PBS (KLVX)'), # http://vegaspbs.org/ + ('watch.aetn.org', 'AETN/ARKANSAS ETV NETWORK (KETS)'), # http://www.aetn.org/ + ('video.ket.org', 'KET (WKLE)'), # http://www.ket.org/ + ('video.wkno.org', 'WKNO/Channel 10 (WKNO)'), # http://www.wkno.org/ + ('video.lpb.org', 'LPB/LOUISIANA PUBLIC BROADCASTING (WLPB)'), # http://www.lpb.org/ + ('videos.oeta.tv', 'OETA (KETA)'), # http://www.oeta.tv + ('video.optv.org', 'Ozarks Public Television (KOZK)'), # http://www.optv.org/ + ('watch.wsiu.org', 'WSIU Public Broadcasting (WSIU)'), # http://www.wsiu.org/ + ('video.keet.org', 'KEET TV (KEET)'), # http://www.keet.org + ('pbs.kixe.org', 'KIXE/Channel 9 (KIXE)'), # http://kixe.org/ + ('video.kpbs.org', 'KPBS San Diego (KPBS)'), # http://www.kpbs.org/ + ('video.kqed.org', 'KQED (KQED)'), # http://www.kqed.org + ('vids.kvie.org', 'KVIE Public Television (KVIE)'), # http://www.kvie.org + ('video.pbssocal.org', 'PBS SoCal/KOCE (KOCE)'), # http://www.pbssocal.org/ + ('video.valleypbs.org', 'ValleyPBS (KVPT)'), # http://www.valleypbs.org/ + ('video.cptv.org', 'CONNECTICUT PUBLIC TELEVISION (WEDH)'), # http://cptv.org + ('watch.knpb.org', 'KNPB Channel 5 (KNPB)'), # http://www.knpb.org/ + ('video.soptv.org', 'SOPTV (KSYS)'), # http://www.soptv.org + # ('klcs.org', 'KLCS/Channel 58 (KLCS)'), # http://www.klcs.org + # ('krcb.org', 'KRCB Television & Radio (KRCB)'), # http://www.krcb.org + # ('kvcr.org', 'KVCR TV/DT/FM :: Vision for the Future (KVCR)'), # http://kvcr.org + ('video.rmpbs.org', 'Rocky Mountain PBS (KRMA)'), # http://www.rmpbs.org + ('video.kenw.org', 'KENW-TV3 (KENW)'), # http://www.kenw.org + ('video.kued.org', 'KUED Channel 7 (KUED)'), # http://www.kued.org + ('video.wyomingpbs.org', 'Wyoming PBS (KCWC)'), # http://www.wyomingpbs.org + ('video.cpt12.org', 'Colorado Public Television / KBDI 12 (KBDI)'), # http://www.cpt12.org/ + ('video.kbyueleven.org', 'KBYU-TV (KBYU)'), # http://www.kbyutv.org/ + ('video.thirteen.org', 'Thirteen/WNET New York (WNET)'), # http://www.thirteen.org + ('video.wgbh.org', 'WGBH/Channel 2 (WGBH)'), # http://wgbh.org + ('video.wgby.org', 'WGBY (WGBY)'), # http://www.wgby.org + ('watch.njtvonline.org', 'NJTV Public Media NJ (WNJT)'), # http://www.njtvonline.org/ + # ('ripbs.org', 'Rhode Island PBS (WSBE)'), # http://www.ripbs.org/home/ + ('watch.wliw.org', 'WLIW21 (WLIW)'), # http://www.wliw.org/ + ('video.mpt.tv', 'mpt/Maryland Public Television (WMPB)'), # http://www.mpt.org + ('watch.weta.org', 'WETA Television and Radio (WETA)'), # http://www.weta.org + ('video.whyy.org', 'WHYY (WHYY)'), # http://www.whyy.org + ('video.wlvt.org', 'PBS 39 (WLVT)'), # http://www.wlvt.org/ + ('video.wvpt.net', 'WVPT - Your Source for PBS and More! (WVPT)'), # http://www.wvpt.net + ('video.whut.org', 'Howard University Television (WHUT)'), # http://www.whut.org + ('video.wedu.org', 'WEDU PBS (WEDU)'), # http://www.wedu.org + ('video.wgcu.org', 'WGCU Public Media (WGCU)'), # http://www.wgcu.org/ + # ('wjct.org', 'WJCT Public Broadcasting (WJCT)'), # http://www.wjct.org + ('video.wpbt2.org', 'WPBT2 (WPBT)'), # http://www.wpbt2.org + ('video.wucftv.org', 'WUCF TV (WUCF)'), # http://wucftv.org + ('video.wuft.org', 'WUFT/Channel 5 (WUFT)'), # http://www.wuft.org + ('watch.wxel.org', 'WXEL/Channel 42 (WXEL)'), # http://www.wxel.org/home/ + ('video.wlrn.org', 'WLRN/Channel 17 (WLRN)'), # http://www.wlrn.org/ + ('video.wusf.usf.edu', 'WUSF Public Broadcasting (WUSF)'), # http://wusf.org/ + ('video.scetv.org', 'ETV (WRLK)'), # http://www.scetv.org + ('video.unctv.org', 'UNC-TV (WUNC)'), # http://www.unctv.org/ + # ('pbsguam.org', 'PBS Guam (KGTF)'), # http://www.pbsguam.org/ + ('video.pbshawaii.org', 'PBS Hawaii - Oceanic Cable Channel 10 (KHET)'), # http://www.pbshawaii.org/ + ('video.idahoptv.org', 'Idaho Public Television (KAID)'), # http://idahoptv.org + ('video.ksps.org', 'KSPS (KSPS)'), # http://www.ksps.org/home/ + ('watch.opb.org', 'OPB (KOPB)'), # http://www.opb.org + ('watch.nwptv.org', 'KWSU/Channel 10 & KTNW/Channel 31 (KWSU)'), # http://www.kwsu.org + ('video.will.illinois.edu', 'WILL-TV (WILL)'), # http://will.illinois.edu/ + ('video.networkknowledge.tv', 'Network Knowledge - WSEC/Springfield (WSEC)'), # http://www.wsec.tv + ('video.wttw.com', 'WTTW11 (WTTW)'), # http://www.wttw.com/ + # ('wtvp.org', 'WTVP & WTVP.org, Public Media for Central Illinois (WTVP)'), # http://www.wtvp.org/ + ('video.iptv.org', 'Iowa Public Television/IPTV (KDIN)'), # http://www.iptv.org/ + ('video.ninenet.org', 'Nine Network (KETC)'), # http://www.ninenet.org + ('video.wfwa.org', 'PBS39 Fort Wayne (WFWA)'), # http://wfwa.org/ + ('video.wfyi.org', 'WFYI Indianapolis (WFYI)'), # http://www.wfyi.org + ('video.mptv.org', 'Milwaukee Public Television (WMVS)'), # http://www.mptv.org + ('video.wnin.org', 'WNIN (WNIN)'), # http://www.wnin.org/ + ('video.wnit.org', 'WNIT Public Television (WNIT)'), # http://www.wnit.org/ + ('video.wpt.org', 'WPT (WPNE)'), # http://www.wpt.org/ + ('video.wvut.org', 'WVUT/Channel 22 (WVUT)'), # http://wvut.org/ + ('video.weiu.net', 'WEIU/Channel 51 (WEIU)'), # http://www.weiu.net + ('video.wqpt.org', 'WQPT-TV (WQPT)'), # http://www.wqpt.org + ('video.wycc.org', 'WYCC PBS Chicago (WYCC)'), # http://www.wycc.org + # ('lakeshorepublicmedia.org', 'Lakeshore Public Television (WYIN)'), # http://lakeshorepublicmedia.org/ + ('video.wipb.org', 'WIPB-TV (WIPB)'), # http://wipb.org + ('video.indianapublicmedia.org', 'WTIU (WTIU)'), # http://indianapublicmedia.org/tv/ + ('watch.cetconnect.org', 'CET (WCET)'), # http://www.cetconnect.org + ('video.thinktv.org', 'ThinkTVNetwork (WPTD)'), # http://www.thinktv.org + ('video.wbgu.org', 'WBGU-TV (WBGU)'), # http://wbgu.org + ('video.wgvu.org', 'WGVU TV (WGVU)'), # http://www.wgvu.org/ + ('video.netnebraska.org', 'NET1 (KUON)'), # http://netnebraska.org + ('video.pioneer.org', 'Pioneer Public Television (KWCM)'), # http://www.pioneer.org + ('watch.sdpb.org', 'SDPB Television (KUSD)'), # http://www.sdpb.org + ('video.tpt.org', 'TPT (KTCA)'), # http://www.tpt.org + ('watch.ksmq.org', 'KSMQ (KSMQ)'), # http://www.ksmq.org/ + ('watch.kpts.org', 'KPTS/Channel 8 (KPTS)'), # http://www.kpts.org/ + ('watch.ktwu.org', 'KTWU/Channel 11 (KTWU)'), # http://ktwu.org + # ('shptv.org', 'Smoky Hills Public Television (KOOD)'), # http://www.shptv.org + # ('kcpt.org', 'KCPT Kansas City Public Television (KCPT)'), # http://kcpt.org/ + # ('blueridgepbs.org', 'Blue Ridge PBS (WBRA)'), # http://www.blueridgepbs.org/ + ('watch.easttennesseepbs.org', 'East Tennessee PBS (WSJK)'), # http://easttennesseepbs.org + ('video.wcte.tv', 'WCTE-TV (WCTE)'), # http://www.wcte.org + ('video.wljt.org', 'WLJT, Channel 11 (WLJT)'), # http://wljt.org/ + ('video.wosu.org', 'WOSU TV (WOSU)'), # http://wosu.org/ + ('video.woub.org', 'WOUB/WOUC (WOUB)'), # http://woub.org/tv/index.php?section=5 + ('video.wvpublic.org', 'WVPB (WVPB)'), # http://wvpublic.org/ + ('video.wkyupbs.org', 'WKYU-PBS (WKYU)'), # http://www.wkyupbs.org + # ('wyes.org', 'WYES-TV/New Orleans (WYES)'), # http://www.wyes.org + ('video.kera.org', 'KERA 13 (KERA)'), # http://www.kera.org/ + ('video.mpbn.net', 'MPBN (WCBB)'), # http://www.mpbn.net/ + ('video.mountainlake.org', 'Mountain Lake PBS (WCFE)'), # http://www.mountainlake.org/ + ('video.nhptv.org', 'NHPTV (WENH)'), # http://nhptv.org/ + ('video.vpt.org', 'Vermont PBS (WETK)'), # http://www.vpt.org + ('video.witf.org', 'witf (WITF)'), # http://www.witf.org + ('watch.wqed.org', 'WQED Multimedia (WQED)'), # http://www.wqed.org/ + ('video.wmht.org', 'WMHT Educational Telecommunications (WMHT)'), # http://www.wmht.org/home/ + ('video.deltabroadcasting.org', 'Q-TV (WDCQ)'), # http://www.deltabroadcasting.org + ('video.dptv.org', 'WTVS Detroit Public TV (WTVS)'), # http://www.dptv.org/ + ('video.wcmu.org', 'CMU Public Television (WCMU)'), # http://www.wcmu.org + ('video.wkar.org', 'WKAR-TV (WKAR)'), # http://wkar.org/ + ('wnmuvideo.nmu.edu', 'WNMU-TV Public TV 13 (WNMU)'), # http://wnmutv.nmu.edu + ('video.wdse.org', 'WDSE - WRPT (WDSE)'), # http://www.wdse.org/ + ('video.wgte.org', 'WGTE TV (WGTE)'), # http://www.wgte.org + ('video.lptv.org', 'Lakeland Public Television (KAWE)'), # http://www.lakelandptv.org + # ('prairiepublic.org', 'PRAIRIE PUBLIC (KFME)'), # http://www.prairiepublic.org/ + ('video.kmos.org', 'KMOS-TV - Channels 6.1, 6.2 and 6.3 (KMOS)'), # http://www.kmos.org/ + ('watch.montanapbs.org', 'MontanaPBS (KUSM)'), # http://montanapbs.org + ('video.krwg.org', 'KRWG/Channel 22 (KRWG)'), # http://www.krwg.org + ('video.kacvtv.org', 'KACV (KACV)'), # http://www.panhandlepbs.org/home/ + ('video.kcostv.org', 'KCOS/Channel 13 (KCOS)'), # www.kcostv.org + ('video.wcny.org', 'WCNY/Channel 24 (WCNY)'), # http://www.wcny.org + ('video.wned.org', 'WNED (WNED)'), # http://www.wned.org/ + ('watch.wpbstv.org', 'WPBS (WPBS)'), # http://www.wpbstv.org + ('video.wskg.org', 'WSKG Public TV (WSKG)'), # http://wskg.org + ('video.wxxi.org', 'WXXI (WXXI)'), # http://wxxi.org + ('video.wpsu.org', 'WPSU (WPSU)'), # http://www.wpsu.org + # ('wqln.org', 'WQLN/Channel 54 (WQLN)'), # http://www.wqln.org + ('on-demand.wvia.org', 'WVIA Public Media Studios (WVIA)'), # http://www.wvia.org/ + ('video.wtvi.org', 'WTVI (WTVI)'), # http://www.wtvi.org/ + # ('whro.org', 'WHRO (WHRO)'), # http://whro.org + ('video.westernreservepublicmedia.org', 'Western Reserve PBS (WNEO)'), # http://www.WesternReservePublicMedia.org/ + ('video.ideastream.org', 'WVIZ/PBS ideastream (WVIZ)'), # http://www.wviz.org/ + ('video.kcts9.org', 'KCTS 9 (KCTS)'), # http://kcts9.org/ + ('video.basinpbs.org', 'Basin PBS (KPBT)'), # http://www.basinpbs.org + ('video.houstonpbs.org', 'KUHT / Channel 8 (KUHT)'), # http://www.houstonpublicmedia.org/ + # ('tamu.edu', 'KAMU - TV (KAMU)'), # http://KAMU.tamu.edu + # ('kedt.org', 'KEDT/Channel 16 (KEDT)'), # http://www.kedt.org + ('video.klrn.org', 'KLRN (KLRN)'), # http://www.klrn.org + ('video.klru.tv', 'KLRU (KLRU)'), # http://www.klru.org + # ('kmbh.org', 'KMBH-TV (KMBH)'), # http://www.kmbh.org + # ('knct.org', 'KNCT (KNCT)'), # http://www.knct.org + # ('ktxt.org', 'KTTZ-TV (KTXT)'), # http://www.ktxt.org + ('video.wtjx.org', 'WTJX Channel 12 (WTJX)'), # http://www.wtjx.org/ + ('video.ideastations.org', 'WCVE PBS (WCVE)'), # http://ideastations.org/ + ('video.kbtc.org', 'KBTC Public Television (KBTC)'), # http://kbtc.org + ) + + IE_NAME = 'pbs' + IE_DESC = 'Public Broadcasting Service (PBS) and member stations: %s' % ', '.join(list(zip(*_STATIONS))[1]) + _VALID_URL = r'''(?x)https?:// (?: # Direct video URL - video\.pbs\.org/(?:viralplayer|video)/(?P[0-9]+)/? | + (?:%s)/(?:viralplayer|video)/(?P[0-9]+)/? | # Article with embedded player (or direct video) (?:www\.)?pbs\.org/(?:[^/]+/){2,5}(?P[^/]+?)(?:\.html)?/?(?:$|[?\#]) | # Player - video\.pbs\.org/(?:widget/)?partnerplayer/(?P[^/]+)/ + (?:video|player)\.pbs\.org/(?:widget/)?partnerplayer/(?P[^/]+)/ ) - ''' + ''' % '|'.join(re.escape(p) for p in list(zip(*_STATIONS))[0]) _TESTS = [ { @@ -153,6 +319,30 @@ class PBSIE(InfoExtractor): 'params': { 'skip_download': True, # requires ffmpeg }, + }, + { + # Frontline video embedded via flp2012.js + 'url': 'http://www.pbs.org/wgbh/pages/frontline/the-atomic-artists', + 'info_dict': { + 'id': '2070868960', + 'display_id': 'the-atomic-artists', + 'ext': 'mp4', + 'title': 'FRONTLINE - The Atomic Artists', + 'description': 'md5:f5bfbefadf421e8bb8647602011caf8e', + 'duration': 723, + 'thumbnail': 're:^https?://.*\.jpg$', + }, + 'params': { + 'skip_download': True, # requires ffmpeg + }, + }, + { + 'url': 'http://player.pbs.org/widget/partnerplayer/2365297708/?start=0&end=0&chapterbar=false&endscreen=false&topbar=true', + 'only_matching': True, + }, + { + 'url': 'http://watch.knpb.org/video/2365616055/', + 'only_matching': True, } ] _ERRORS = { @@ -183,6 +373,7 @@ class PBSIE(InfoExtractor): MEDIA_ID_REGEXES = [ r"div\s*:\s*'videoembed'\s*,\s*mediaid\s*:\s*'(\d+)'", # frontline video embed r'class="coveplayerid">([^<]+)<', # coveplayer + r']+data-coveid="(\d+)"', # coveplayer from http://www.pbs.org/wgbh/frontline/film/real-csi/ r'', # jwplayer ] @@ -191,9 +382,30 @@ class PBSIE(InfoExtractor): if media_id: return media_id, presumptive_id, upload_date - url = self._search_regex( - r'(?s)]+?(?:[a-z-]+?=["\'].*?["\'][^>]+?)*?\bsrc=["\']([^\'"]+partnerplayer[^\'"]+)["\']', - webpage, 'player URL') + # Fronline video embedded via flp + video_id = self._search_regex( + r'videoid\s*:\s*"([\d+a-z]{7,})"', webpage, 'videoid', default=None) + if video_id: + # pkg_id calculation is reverse engineered from + # http://www.pbs.org/wgbh/pages/frontline/js/flp2012.js + prg_id = self._search_regex( + r'videoid\s*:\s*"([\d+a-z]{7,})"', webpage, 'videoid')[7:] + if 'q' in prg_id: + prg_id = prg_id.split('q')[1] + prg_id = int(prg_id, 16) + getdir = self._download_json( + 'http://www.pbs.org/wgbh/pages/frontline/.json/getdir/getdir%d.json' % prg_id, + presumptive_id, 'Downloading getdir JSON', + transform_source=strip_jsonp) + return getdir['mid'], presumptive_id, upload_date + + for iframe in re.findall(r'(?s)', webpage): + url = self._search_regex( + r'src=(["\'])(?P.+?partnerplayer.+?)\1', iframe, + 'player URL', default=None, group='url') + if url: + break + mobj = re.match(self._VALID_URL, url) player_id = mobj.group('player_id') @@ -221,7 +433,7 @@ class PBSIE(InfoExtractor): return self.playlist_result(entries, display_id) info = self._download_json( - 'http://video.pbs.org/videoInfo/%s?format=json&type=partner' % video_id, + 'http://player.pbs.org/videoInfo/%s?format=json&type=partner' % video_id, display_id) formats = []