1 files changed, 59 insertions, 29 deletions
diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 67b384c5f..c47ac4fe1 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -1,64 +1,94 @@
 # -*- coding: utf-8 -*-
 
 import re
+import urllib
 
-from urlparse import urljoin
+from BeautifulSoup import BeautifulSoup
 
+from module.plugins.internal.CaptchaService import ReCaptcha
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.63"
+    __version__ = "0.78"
 
-    __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
+    __pattern__ = r'http://www\d{0,2}\.zippyshare\.com/v(/|iew\.jsp.*key=)(?P<KEY>[\w^_]+)'
+    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """Zippyshare.com hoster plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"),
+                       ("sebdelsol", "seb.morin@gmail.com")]
 
 
-    NAME_PATTERN = r'("\d{6,}/"[ ]*\+.+?"/|<title>Zippyshare.com - )(?P<N>.+?)("|</title>)'
-    SIZE_PATTERN = r'>Size:.+?">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
+    COOKIES = [("zippyshare.com", "ziplocale", "en")]
 
-    OFFLINE_PATTERN = r'>File does not exist on this server<'
+    NAME_PATTERN    = r'(<title>Zippyshare.com - |"/)(?P<N>[^/]+)(</title>|";)'
+    SIZE_PATTERN    = r'>Size:.+?">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
+    OFFLINE_PATTERN = r'does not exist (anymore )?on this server<'
 
-    COOKIES = [("zippyshare.com", "ziplocale", "en")]
+    LINK_PREMIUM_PATTERN = r"document.location = '(.+?)'"
 
 
     def setup(self):
-        self.multiDL = True
-        self.chunkLimit = -1
+        self.chunkLimit     = -1
+        self.multiDL        = True
         self.resumeDownload = True
 
 
-    def handleFree(self):
-        url = self.get_link()
-        self.download(url)
+    def handleFree(self, pyfile):
+        recaptcha   = ReCaptcha(self)
+        captcha_key = recaptcha.detect_key()
 
+        if captcha_key:
+            try:
+                self.link = re.search(self.LINK_PREMIUM_PATTERN, self.html)
+                recaptcha.challenge()
 
-    def get_checksum(self):
-        try:
-            m = re.search(r'\+[ ]*\((\d+)[ ]*\%[ ]*(\d+)[ ]*\+[ ]*(\d+)[ ]*\%[ ]*(\d+)\)[ ]*\+', self.html)
-            if m:
-                a1, a2, c1, c2 = map(int, m.groups())
-            else:
-                a1, a2 = map(int, re.search(r'\(\'downloadB\'\).omg = (\d+)%(\d+)', self.html).groups())
-                c1, c2 = map(int, re.search(r'\(\'downloadB\'\).omg\) \* \((\d+)%(\d+)', self.html).groups())
+            except Exception, e:
+                self.error(e)
 
-            b = (a1 % a2) * (c1 % c2)
-        except:
-            self.error(_("Unable to calculate checksum"))
         else:
-            return b + 18
+            self.link = self.get_link()
+
+        if self.link and pyfile.name == 'file.html':
+            pyfile.name = urllib.unquote(self.link.split('/')[-1])
 
 
     def get_link(self):
-        checksum = self.get_checksum()
-        p_url    = '/'.join(("d", self.info['pattern']['KEY'], str(checksum), self.pyfile.name))
-        dl_link  = urljoin(self.info['pattern']['HOST'], p_url)
-        return dl_link
+        # get all the scripts inside the html body
+        soup = BeautifulSoup(self.html)
+        scripts = (s.getText().strip() for s in soup.body.findAll('script', type='text/javascript'))
+
+        # meant to be populated with the initialization of all the DOM elements found in the scripts
+        initScripts = set()
+
+        def replElementById(element):
+            id   = element.group(1)  # id might be either 'x' (a real id) or x (a variable)
+            attr = element.group(4)  # attr might be None
+
+            varName = re.sub(r'-', '', 'GVAR[%s+"_%s"]' %(id, attr))
+
+            realid = id.strip('"\'')
+            if id != realid: #id is not a variable, so look for realid.attr in the html
+                initValues = filter(None, [elt.get(attr, None) for elt in soup.findAll(id=realid)])
+                initValue  = '"%s"' % initValues[-1] if initValues else 'null'
+                initScripts.add('%s = %s;' % (varName, initValue))
+
+            return varName
+
+        # handle all getElementById
+        reVar = r'document.getElementById\(([\'"\w-]+)\)(\.)?(getAttribute\([\'"])?(\w+)?([\'"]\))?'
+        scripts = [re.sub(reVar, replElementById, script) for script in scripts if script]
+
+        # add try/catch in JS to handle deliberate errors
+        scripts = ['\n'.join(('try{', script, '} catch(err){}')) for script in scripts]
+
+        # get the file's url by evaluating all the scripts
+        scripts = ['var GVAR = {}'] + list(initScripts)  + scripts + ['GVAR["dlbutton_href"]']
+        return self.js.eval('\n'.join(scripts))
 
 
 getInfo = create_getInfo(ZippyshareCom)