mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-08-25 00:31:10 +02:00
[pbs] Improve multipart video support (closes #12981)
This commit is contained in:
parent
7f09e523e8
commit
4947f13cd0
@ -10,6 +10,7 @@
|
|||||||
int_or_none,
|
int_or_none,
|
||||||
float_or_none,
|
float_or_none,
|
||||||
js_to_json,
|
js_to_json,
|
||||||
|
orderedSet,
|
||||||
strip_jsonp,
|
strip_jsonp,
|
||||||
strip_or_none,
|
strip_or_none,
|
||||||
unified_strdate,
|
unified_strdate,
|
||||||
@ -264,6 +265,13 @@ class PBSIE(InfoExtractor):
|
|||||||
},
|
},
|
||||||
'playlist_count': 2,
|
'playlist_count': 2,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
'url': 'http://www.pbs.org/wgbh/americanexperience/films/great-war/',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'great-war',
|
||||||
|
},
|
||||||
|
'playlist_count': 3,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
'url': 'http://www.pbs.org/wgbh/americanexperience/films/death/player/',
|
'url': 'http://www.pbs.org/wgbh/americanexperience/films/death/player/',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
@ -382,10 +390,10 @@ def _extract_webpage(self, url):
|
|||||||
# tabbed frontline videos
|
# tabbed frontline videos
|
||||||
MULTI_PART_REGEXES = (
|
MULTI_PART_REGEXES = (
|
||||||
r'<div[^>]+class="videotab[^"]*"[^>]+vid="(\d+)"',
|
r'<div[^>]+class="videotab[^"]*"[^>]+vid="(\d+)"',
|
||||||
r'<a[^>]+href=["\']#video-\d+["\'][^>]+data-coveid=["\'](\d+)',
|
r'<a[^>]+href=["\']#(?:video-|part)\d+["\'][^>]+data-cove[Ii]d=["\'](\d+)',
|
||||||
)
|
)
|
||||||
for p in MULTI_PART_REGEXES:
|
for p in MULTI_PART_REGEXES:
|
||||||
tabbed_videos = re.findall(p, webpage)
|
tabbed_videos = orderedSet(re.findall(p, webpage))
|
||||||
if tabbed_videos:
|
if tabbed_videos:
|
||||||
return tabbed_videos, presumptive_id, upload_date, description
|
return tabbed_videos, presumptive_id, upload_date, description
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user