Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[pbs] Simplify and speed up player URL search

Browse Source
This commit is contained in:
Sergey M․ 2015-11-06 23:45:26 +06:00
parent 472404953a
commit 0fa6b17dcc
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/pbs.py
View File

@ -191,9 +191,13 @@ class PBSIE(InfoExtractor):
if media_id: if media_id:
return media_id, presumptive_id, upload_date return media_id, presumptive_id, upload_date
url = self._search_regex( for iframe in re.findall(r'(?s)<iframe(.+?)></iframe>', webpage):
r'(?s)<iframe[^>]+?(?:[a-z-]+?=["\'].*?["\'][^>]+?)*?\bsrc=["\']([^\'"]+partnerplayer[^\'"]+)["\']', url = self._search_regex(
webpage, 'player URL') r'src=(["\'])(?P<url>.+?partnerplayer.+?)\1', iframe,
'player URL', default=None, group='url')
if url:
break
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
player_id = mobj.group('player_id') player_id = mobj.group('player_id')