Yen Chi Hsuan
8 years ago
No known key found for this signature in database
GPG Key ID: 7F902A182457CA23
3 changed files with
11 additions and
3 deletions
-
ChangeLog
-
youtube_dl/extractor/generic.py
-
youtube_dl/extractor/theplatform.py
|
|
@ -1,6 +1,7 @@ |
|
|
|
version <unreleased> |
|
|
|
|
|
|
|
Extractors |
|
|
|
+ [theplatform] Recognize URLs with whitespaces (#12044) |
|
|
|
+ [generic] Support complex JWPlayer embedded videos (#12030) |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1501,7 +1501,12 @@ class GenericIE(InfoExtractor): |
|
|
|
'skip_download': True, |
|
|
|
}, |
|
|
|
'add_ie': [VideoPressIE.ie_key()], |
|
|
|
} |
|
|
|
}, |
|
|
|
{ |
|
|
|
# ThePlatform embedded with whitespaces in URLs |
|
|
|
'url': 'http://www.golfchannel.com/topics/shows/golftalkcentral.htm', |
|
|
|
'only_matching': True, |
|
|
|
}, |
|
|
|
# { |
|
|
|
# # TODO: find another test |
|
|
|
# # http://schema.org/VideoObject |
|
|
|
|
|
@ -179,10 +179,12 @@ class ThePlatformIE(ThePlatformBaseIE, AdobePassIE): |
|
|
|
if m: |
|
|
|
return [m.group('url')] |
|
|
|
|
|
|
|
# Are whitesapces ignored in URLs? |
|
|
|
# https://github.com/rg3/youtube-dl/issues/12044 |
|
|
|
matches = re.findall( |
|
|
|
r'<(?:iframe|script)[^>]+src=(["\'])((?:https?:)?//player\.theplatform\.com/p/.+?)\1', webpage) |
|
|
|
r'(?s)<(?:iframe|script)[^>]+src=(["\'])((?:https?:)?//player\.theplatform\.com/p/.+?)\1', webpage) |
|
|
|
if matches: |
|
|
|
return list(zip(*matches))[1] |
|
|
|
return [re.sub(r'\s', '', list(zip(*matches))[1][0])] |
|
|
|
|
|
|
|
@staticmethod |
|
|
|
def _sign_url(url, sig_key, sig_secret, life=600, include_qs=False): |
|
|
|