projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Clarify ytplayer.config extraction rationale
[youtube-dl]
/
youtube_dl
/
extractor
/
pbs.py
diff --git
a/youtube_dl/extractor/pbs.py
b/youtube_dl/extractor/pbs.py
index a690f9c29f11fe2f04a60995ab1f5f2189a2e880..b787e2a73c66a0ff1bf2d17b9f20c13bf166aae7 100644
(file)
--- a/
youtube_dl/extractor/pbs.py
+++ b/
youtube_dl/extractor/pbs.py
@@
-22,7
+22,7
@@
class PBSIE(InfoExtractor):
# Article with embedded player (or direct video)
(?:www\.)?pbs\.org/(?:[^/]+/){2,5}(?P<presumptive_id>[^/]+?)(?:\.html)?/?(?:$|[?\#]) |
# Player
# Article with embedded player (or direct video)
(?:www\.)?pbs\.org/(?:[^/]+/){2,5}(?P<presumptive_id>[^/]+?)(?:\.html)?/?(?:$|[?\#]) |
# Player
-
video
\.pbs\.org/(?:widget/)?partnerplayer/(?P<player_id>[^/]+)/
+
(?:video|player)
\.pbs\.org/(?:widget/)?partnerplayer/(?P<player_id>[^/]+)/
)
'''
)
'''
@@
-170,6
+170,10
@@
class PBSIE(InfoExtractor):
'params': {
'skip_download': True, # requires ffmpeg
},
'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,
}
]
_ERRORS = {
}
]
_ERRORS = {
@@
-210,7
+214,7
@@
class PBSIE(InfoExtractor):
# Fronline video embedded via flp
video_id = self._search_regex(
# Fronline video embedded via flp
video_id = self._search_regex(
- r'videoid\s*:\s*"([\d+a-z]{7,})"', webpage, 'videoid')
+ 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
if video_id:
# pkg_id calculation is reverse engineered from
# http://www.pbs.org/wgbh/pages/frontline/js/flp2012.js
@@
-259,7
+263,7
@@
class PBSIE(InfoExtractor):
return self.playlist_result(entries, display_id)
info = self._download_json(
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 = []
display_id)
formats = []