Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 22 insertions, 20 deletions

diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py
index 2228516aa..2e9ae4e48 100644
--- a/module/plugins/hoster/BasePlugin.py
+++ b/module/plugins/hoster/BasePlugin.py
@@ -5,14 +5,15 @@ import urllib
 import urlparse
 
 from module.network.HTTPRequest import BadHeader
-from module.plugins.internal.SimpleHoster import create_getInfo, getFileURL
-from module.plugins.Hoster import Hoster
+from module.plugins.internal.SimpleHoster import create_getInfo
+from module.plugins.internal.Hoster import Hoster
 
 
 class BasePlugin(Hoster):
     __name__    = "BasePlugin"
     __type__    = "hoster"
-    __version__ = "0.43"
+    __version__ = "0.45"
+    __status__  = "testing"
 
     __pattern__ = r'^unmatchable$'
 
@@ -23,7 +24,7 @@ class BasePlugin(Hoster):
 
 
     @classmethod
-    def getInfo(cls, url="", html=""):  #@TODO: Move to hoster class in 0.4.10
+    def get_info(cls, url="", html=""):  #@TODO: Move to hoster class in 0.4.10
         url   = urllib.unquote(url)
         url_p = urlparse.urlparse(url)
         return {'name'  : (url_p.path.split('/')[-1]
@@ -35,22 +36,23 @@ class BasePlugin(Hoster):
 
 
     def setup(self):
-        self.chunkLimit     = -1
+        self.chunk_limit     = -1
         self.multiDL        = True
-        self.resumeDownload = True
+        self.resume_download = True
 
 
     def process(self, pyfile):
-        """main function"""
-
-        pyfile.name = self.getInfo(pyfile.url)['name']
+        """
+        Main function
+        """
+        pyfile.name = self.get_info(pyfile.url)['name']
 
         if not pyfile.url.startswith("http"):
             self.fail(_("No plugin matched"))
 
         for _i in xrange(5):
             try:
-                link = getFileURL(self, urllib.unquote(pyfile.url))
+                link = self.direct_link(urllib.unquote(pyfile.url))
 
                 if link:
                     self.download(link, ref=False, disposition=True)
@@ -58,21 +60,21 @@ class BasePlugin(Hoster):
                     self.fail(_("File not found"))
 
             except BadHeader, e:
-                if e.code is 404:
+                if e.code == 404:
                     self.offline()
 
                 elif e.code in (401, 403):
-                    self.logDebug("Auth required", "Received HTTP status code: %d" % e.code)
+                    self.log_debug("Auth required", "Received HTTP status code: %d" % e.code)
 
-                    account = self.core.accountManager.getAccountPlugin('Http')
-                    servers = [x['login'] for x in account.getAllAccounts()]
+                    account = self.pyload.accountManager.getAccountPlugin('Http')
+                    servers = [x['login'] for x in account.getAllAccounts()]  #@TODO: Recheck in 0.4.10
                     server  = urlparse.urlparse(pyfile.url).netloc
 
                     if server in servers:
-                        self.logDebug("Logging on to %s" % server)
-                        self.req.addAuth(account.getAccountData(server)['password'])
+                        self.log_debug("Logging on to %s" % server)
+                        self.req.addAuth(account.get_info(server)['login']['password'])
                     else:
-                        pwd = self.getPassword()
+                        pwd = self.get_password()
                         if ':' in pwd:
                             self.req.addAuth(pwd)
                         else:
@@ -84,7 +86,7 @@ class BasePlugin(Hoster):
         else:
             self.fail(_("No file downloaded"))  #@TODO: Move to hoster class in 0.4.10
 
-        errmsg = self.checkDownload({'Empty file'   : re.compile(r'\A\s*\Z'),
+        errmsg = self.check_download({'Empty file'   : re.compile(r'\A\s*\Z'),
                                      'Html error'   : re.compile(r'\A(?:\s*<.+>)?((?:[\w\s]*(?:[Ee]rror|ERROR)\s*\:?)?\s*\d{3})(?:\Z|\s+)'),
                                      'Html file'    : re.compile(r'\A\s*<!DOCTYPE html'),
                                      'Request error': re.compile(r'([Aa]n error occured while processing your request)')})
@@ -92,11 +94,11 @@ class BasePlugin(Hoster):
             return
 
         try:
-            errmsg += " | " + self.lastCheck.group(1).strip()
+            errmsg += " | " + self.last_check.group(1).strip()
         except Exception:
             pass
 
-        self.logWarning("Check result: " + errmsg, "Waiting 1 minute and retry")
+        self.log_warning(_("Check result: ") + errmsg, _("Waiting 1 minute and retry"))
         self.retry(3, 60, errmsg)