"New Year" Update: hoster plugins

1 files changed, 18 insertions, 18 deletions

diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py
index bbf75c94a..636e5824d 100644
--- a/module/plugins/hoster/ShareonlineBiz.py
+++ b/module/plugins/hoster/ShareonlineBiz.py
@@ -14,7 +14,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ShareonlineBiz(SimpleHoster):
     __name__    = "ShareonlineBiz"
     __type__    = "hoster"
-    __version__ = "0.46"
+    __version__ = "0.47"
 
     __pattern__ = r'https?://(?:www\.)?(share-online\.biz|egoshare\.com)/(download\.php\?id=|dl/)(?P<ID>\w+)'
 
@@ -32,7 +32,7 @@ class ShareonlineBiz(SimpleHoster):
 
     RECAPTCHA_KEY = "6LdatrsSAAAAAHZrB70txiV5p-8Iv8BtVxlTtjKX"
 
-    ERROR_INFO_PATTERN = r'<p class="b">Information:</p>\s*<div>\s*<strong>(.*?)</strong>'
+    ERROR_PATTERN = r'<p class="b">Information:</p>\s*<div>\s*<strong>(.*?)</strong>'
 
 
     @classmethod
@@ -88,12 +88,12 @@ class ShareonlineBiz(SimpleHoster):
             self.fail(_("No valid captcha solution received"))
 
 
-    def handleFree(self):
-        self.html = self.load(self.pyfile.url, cookies=True)  #: refer, stuff
-
+    def handleFree(self, pyfile):
         self.wait(3)
 
-        self.html = self.load("%s/free/" % self.pyfile.url, post={"dl_free": "1", "choice": "free"}, decode=True)
+        self.html = self.load("%s/free/" % pyfile.url,
+                              post={'dl_free': "1", 'choice': "free"},
+                              decode=True)
 
         self.checkErrors()
 
@@ -110,12 +110,8 @@ class ShareonlineBiz(SimpleHoster):
 
 
     def checkFile(self):
-        super(ShareonlineBiz, self).checkFile()
-
-        check = self.checkDownload({
-            'cookie': re.compile(r'<div id="dl_failure"'),
-            'fail'  : re.compile(r"<title>Share-Online")
-        })
+        check = self.checkDownload({'cookie': re.compile(r'<div id="dl_failure"'),
+                                    'fail'  : re.compile(r"<title>Share-Online")})
 
         if check == "cookie":
             self.invalidCaptcha()
@@ -125,11 +121,15 @@ class ShareonlineBiz(SimpleHoster):
             self.invalidCaptcha()
             self.retry(5, 5 * 60, _("Download failed"))
 
+        return super(ShareonlineBiz, self).checkFile()
+
 
-    def handlePremium(self):  #: should be working better loading (account) api internally
+    def handlePremium(self, pyfile):  #: should be working better loading (account) api internally
         html = self.load("http://api.share-online.biz/account.php",
-                        {"username": self.user, "password": self.account.accounts[self.user]['password'],
-                         "act": "download", "lid": self.info['fileid']})
+                         get={'username': self.user,
+                              'password': self.account.getAccountData(self.user)['password'],
+                              'act'     : "download",
+                              'lid'     : self.info['fileid']})
 
         self.api_data = dlinfo = {}
 
@@ -142,8 +142,8 @@ class ShareonlineBiz(SimpleHoster):
         if not dlinfo['status'] == "online":
             self.offline()
         else:
-            self.pyfile.name = dlinfo['name']
-            self.pyfile.size = int(dlinfo['size'])
+            pyfile.name = dlinfo['name']
+            pyfile.size = int(dlinfo['size'])
 
             dlLink = dlinfo['url']
 
@@ -163,7 +163,7 @@ class ShareonlineBiz(SimpleHoster):
         errmsg = m.group(1).lower()
 
         try:
-            self.logError(errmsg, re.search(self.ERROR_INFO_PATTERN, self.html).group(1))
+            self.logError(errmsg, re.search(self.ERROR_PATTERN, self.html).group(1))
         except:
             self.logError("Unknown error occurred", errmsg)