From: Sergey M․ <dstftw@gmail.com>
Date: Tue, 3 Mar 2015 15:39:04 +0000 (+0600)
Subject: [youporn] Imrove JSON regex and preserve the old one
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=50c9949d7ae8f76d7a105481e0e692de3448c385;p=youtube-dl

[youporn] Imrove JSON regex and preserve the old one
---

diff --git a/youtube_dl/extractor/youporn.py b/youtube_dl/extractor/youporn.py
index a278386d4..e4c855ee0 100644
--- 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)