Merge pull request #1 from pyload/stable

sync stable

1 files changed, 9 insertions, 10 deletions

diff --git a/module/plugins/hoster/SendspaceCom.py b/module/plugins/hoster/SendspaceCom.py
index 12f966e31..0ab20949d 100644
--- a/module/plugins/hoster/SendspaceCom.py
+++ b/module/plugins/hoster/SendspaceCom.py
@@ -8,9 +8,10 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class SendspaceCom(SimpleHoster):
     __name__    = "SendspaceCom"
     __type__    = "hoster"
-    __version__ = "0.16"
+    __version__ = "0.17"
 
     __pattern__ = r'https?://(?:www\.)?sendspace\.com/file/\w+'
+    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """Sendspace.com hoster plugin"""
     __license__     = "GPLv3"
@@ -21,20 +22,20 @@ class SendspaceCom(SimpleHoster):
     SIZE_PATTERN    = r'<div class="file_description reverse margin_center">\s*<b>File Size:</b>\s*(?P<S>[\d.,]+)(?P<U>[\w^_]+)\s*</div>'
     OFFLINE_PATTERN = r'<div class="msg error" style="cursor: default">Sorry, the file you requested is not available.</div>'
 
-    LINK_PATTERN = r'<a id="download_button" href="([^"]+)"'
+    LINK_FREE_PATTERN = r'<a id="download_button" href="(.+?)"'
 
-    CAPTCHA_PATTERN      = r'<td><img src="(/captchas/captcha\.php?captcha=([^"]+))"></td>'
-    USER_CAPTCHA_PATTERN = r'<td><img src="/captchas/captcha\.php?user=([^"]+))"></td>'
+    CAPTCHA_PATTERN      = r'<td><img src="(/captchas/captcha\.php?captcha=(.+?))"></td>'
+    USER_CAPTCHA_PATTERN = r'<td><img src="/captchas/captcha\.php?user=(.+?))"></td>'
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         params = {}
         for _i in xrange(3):
-            m = re.search(self.LINK_PATTERN, self.html)
+            m = re.search(self.LINK_FREE_PATTERN, self.html)
             if m:
                 if 'captcha_hash' in params:
                     self.correctCaptcha()
-                download_url = m.group(1)
+                self.link = m.group(1)
                 break
 
             m = re.search(self.CAPTCHA_PATTERN, self.html)
@@ -51,11 +52,9 @@ class SendspaceCom(SimpleHoster):
                 params = {'download': "Regular Download"}
 
             self.logDebug(params)
-            self.html = self.load(self.pyfile.url, post=params)
+            self.html = self.load(pyfile.url, post=params)
         else:
             self.fail(_("Download link not found"))
 
-        self.download(download_url)
-
 
 getInfo = create_getInfo(SendspaceCom)