commit 50c9949d7ae8f76d7a105481e0e692de3448c385
parent 376817c6d48b0915502e687655e266d80cb45a7a
Author: Sergey M․ <dstftw@gmail.com>
Date: Tue, 3 Mar 2015 21:39:04 +0600
[youporn] Imrove JSON regex and preserve the old one
Diffstat:
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/youtube_dl/extractor/youporn.py b/youtube_dl/extractor/youporn.py
@@ -47,7 +47,8 @@ class YouPornIE(InfoExtractor):
# Get JSON parameters
json_params = self._search_regex(
- r'var videoJason = (.*)[,;]',
+ [r'var\s+videoJa?son\s*=\s*({.+?});',
+ r'var\s+currentVideo\s*=\s*new\s+Video\((.+?)\)[,;]'],
webpage, 'JSON parameters')
try:
params = json.loads(json_params)