diff options
| author | Sergey M․ <dstftw@gmail.com> | 2017-05-04 22:42:49 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2017-05-04 22:42:49 +0700 |
| commit | 4947f13cd0e541bd2223187df19389c8b721c665 (patch) | |
| tree | f90408086d00f519e028916a0ae3de3a9330a422 | |
| parent | 7f09e523e87ab6fcf5713fbcd6767d00d98039e1 (diff) | |
| download | youtube-dl-4947f13cd0e541bd2223187df19389c8b721c665.tar.gz youtube-dl-4947f13cd0e541bd2223187df19389c8b721c665.tar.xz youtube-dl-4947f13cd0e541bd2223187df19389c8b721c665.zip | |
[pbs] Improve multipart video support (closes #12981)
| -rw-r--r-- | youtube_dl/extractor/pbs.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/youtube_dl/extractor/pbs.py b/youtube_dl/extractor/pbs.py index 0727e381b..16cc667d0 100644 --- a/youtube_dl/extractor/pbs.py +++ b/youtube_dl/extractor/pbs.py @@ -10,6 +10,7 @@ from ..utils import ( int_or_none, float_or_none, js_to_json, + orderedSet, strip_jsonp, strip_or_none, unified_strdate, @@ -265,6 +266,13 @@ class PBSIE(InfoExtractor): '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/', 'info_dict': { 'id': '2276541483', @@ -382,10 +390,10 @@ class PBSIE(InfoExtractor): # tabbed frontline videos MULTI_PART_REGEXES = ( 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: - tabbed_videos = re.findall(p, webpage) + tabbed_videos = orderedSet(re.findall(p, webpage)) if tabbed_videos: return tabbed_videos, presumptive_id, upload_date, description |