From d22a070170c5db2e9c4134aafd887eb23faf7645 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Fri, 27 Sep 2013 13:54:06 -0700
Subject: Merge pull request #284 from anderi/patch-1

Zippyshare: fixed #281
(cherry picked from commit 5569a1419d56b495b9b06527501108bfaa52795a)
---
 pyload/plugins/hoster/ZippyshareCom.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'pyload')

diff --git a/pyload/plugins/hoster/ZippyshareCom.py b/pyload/plugins/hoster/ZippyshareCom.py
index 3c7b68bb6..875a247a9 100644
--- a/pyload/plugins/hoster/ZippyshareCom.py
+++ b/pyload/plugins/hoster/ZippyshareCom.py
@@ -26,7 +26,7 @@ class ZippyshareCom(SimpleHoster):
     FILE_INFO_PATTERN = r'document\.getElementById\(\'dlbutton\'\)\.href = "[^;]*/(?P<N>[^"]+)";'
     FILE_OFFLINE_PATTERN = r'>File does not exist on this server</div>'
 
-    DOWNLOAD_URL_PATTERN = r"<script type=\"text/javascript\">([^<]*?)document\.getElementById\('dlbutton'\).href = ([^;]+);"
+    DOWNLOAD_URL_PATTERN = r"<script type=\"text/javascript\">([^<]*?)(document\.getElementById\('dlbutton'\).href = [^;]+;)"
     SEED_PATTERN = r'swfobject.embedSWF\("([^"]+)".*?seed: (\d+)'
     CAPTCHA_KEY_PATTERN = r'Recaptcha.create\("([^"]+)"'
     CAPTCHA_SHORTENCODE_PATTERN = r"shortencode: '([^']+)'"
@@ -69,10 +69,11 @@ class ZippyshareCom(SimpleHoster):
         if found:
             #Method #1: JS eval
             js = "\n".join(found.groups())
-            regex = r"document.getElementById\(\\*'dlbutton\\*'\).omg"
-            omg = re.search(regex + r" = ([^;]+);", js).group(1)
-            js = re.sub(regex + r" = ([^;]+);", '', js)
-            js = re.sub(regex, omg, js)
+            d = re.search(r'span id="omg" class="(\d*)"', self.html).group(1)
+            regex = r"document.getElementById\('omg'\).getAttribute\('class'\)"
+            js = re.sub(regex, d, js)
+            regex = r"document.getElementById\(\\*'dlbutton\\*'\).href = "
+            js = re.sub(regex, '', js)
             url = self.js.eval(js)
         else:
             #Method #2: SWF eval
-- 
cgit v1.2.3