Spare fixes and code cosmetics

10 files changed, 61 insertions, 16 deletions

diff --git a/module/plugins/hooks/DownloadScheduler.py b/module/plugins/hooks/DownloadScheduler.py
index e4b09f049..ed43683fa 100644
--- a/module/plugins/hooks/DownloadScheduler.py
+++ b/module/plugins/hooks/DownloadScheduler.py
@@ -72,9 +72,9 @@ class DownloadScheduler(Hook):
 
             if speed > 0:
                 self.log_info(_("Setting download speed to %d kB/s") % speed)
-                self.core.api.setConfigValue("download", "limit_speed", 1)
-                self.core.api.setConfigValue("download", "max_speed", speed)
+                self.core.config.set("download", "limit_speed", 1)
+                self.core.config.set("download", "max_speed", speed)
             else:
                 self.log_info(_("Setting download speed to FULL"))
-                self.core.api.setConfigValue("download", "limit_speed", 0)
-                self.core.api.setConfigValue("download", "max_speed", -1)
+                self.core.config.set("download", "limit_speed", 0)
+                self.core.config.set("download", "max_speed", -1)
diff --git a/module/plugins/hooks/EasybytezComHook.py b/module/plugins/hooks/EasybytezComHook.py
index e4374d37c..69f3a2a34 100644
--- a/module/plugins/hooks/EasybytezComHook.py
+++ b/module/plugins/hooks/EasybytezComHook.py
@@ -21,9 +21,9 @@ class EasybytezComHook(MultiHook):
 
 
     def get_hosters(self):
-        user, data = self.account.selectAccount()
+        user, data = self.account.select_account()
 
-        req  = self.account.getAccountRequest(user)
+        req  = self.account.get_account_request(user)
         html = self.load("http://www.easybytez.com", req=req)
 
         return re.search(r'</textarea>\s*Supported sites:(.*)', html).group(1).split(',')
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index 73782ed95..9ca7bf854 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -162,7 +162,7 @@ class ExtractArchive(Hook):
             try:
                 module = self.core.pluginManager.loadModule("internal", p)
                 klass  = getattr(module, p)
-                if klass.isUsable():
+                if klass.is_usable():
                     self.extractors.append(klass)
                 if klass.REPAIR:
                     self.repair = self.get_config('repair')
@@ -210,6 +210,15 @@ class ExtractArchive(Hook):
         self.extracting = False
 
 
+    #: Deprecated method, use `extract_package` instead
+    @Expose
+    def extractPackage(self, *args, **kwargs):
+        """
+        See `extract_package`
+        """
+        return self.extract_package(*args, **kwargs)
+
+
     @Expose
     def extract_package(self, *ids):
         """
@@ -301,7 +310,7 @@ class ExtractArchive(Hook):
                                  if filter(lambda ext: fname.lower().endswith(ext), extensions)]
 
                 for Extractor in self.extractors:
-                    targets = Extractor.getTargets(files_ids)
+                    targets = Extractor.get_targets(files_ids)
                     if targets:
                         self.log_debug("Targets for %s: %s" % (Extractor.__name__, targets))
                         matched = True
@@ -513,6 +522,15 @@ class ExtractArchive(Hook):
         raise Exception(_("Extract failed"))
 
 
+    #: Deprecated method, use `get_passwords` instead
+    @Expose
+    def getPasswords(self, *args, **kwargs):
+        """
+        See `get_passwords`
+        """
+        return self.get_passwords(*args, **kwargs)
+
+
     @Expose
     def get_passwords(self, reload=True):
         """
@@ -540,6 +558,15 @@ class ExtractArchive(Hook):
             self.passwords = passwords
 
 
+    #: Deprecated method, use `add_password` instead
+    @Expose
+    def addPassword(self, *args, **kwargs):
+        """
+        See `add_password`
+        """
+        return self.add_password(*args, **kwargs)
+
+
     @Expose
     def add_password(self, password):
         """
diff --git a/module/plugins/hooks/FreeWayMeHook.py b/module/plugins/hooks/FreeWayMeHook.py
index 093dd82d3..48af011d4 100644
--- a/module/plugins/hooks/FreeWayMeHook.py
+++ b/module/plugins/hooks/FreeWayMeHook.py
@@ -19,6 +19,6 @@ class FreeWayMeHook(MultiHook):
 
 
     def get_hosters(self):
-        user, data = self.account.selectAccount()
+        user, data = self.account.select_account()
         hostis = self.load("http://www.free-way.bz/ajax/jd.php", get={"id": 3, "user": user, "pass": data['password']}).replace("\"", "")  #@TODO: Revert to `https` in 0.4.10
         return [x.strip() for x in hostis.split(",") if x.strip()]
diff --git a/module/plugins/hooks/PremiumToHook.py b/module/plugins/hooks/PremiumToHook.py
index dd85cb903..937064087 100644
--- a/module/plugins/hooks/PremiumToHook.py
+++ b/module/plugins/hooks/PremiumToHook.py
@@ -21,7 +21,7 @@ class PremiumToHook(MultiHook):
 
 
     def get_hosters(self):
-        user, data = self.account.selectAccount()
+        user, data = self.account.select_account()
         html = self.load("http://premium.to/api/hosters.php",
                       get={'username': user, 'password': data['password']})
         return [x.strip() for x in html.replace("\"", "").split(";")]
diff --git a/module/plugins/hooks/PremiumizeMeHook.py b/module/plugins/hooks/PremiumizeMeHook.py
index 24d091454..94fc1d59c 100644
--- a/module/plugins/hooks/PremiumizeMeHook.py
+++ b/module/plugins/hooks/PremiumizeMeHook.py
@@ -21,7 +21,7 @@ class PremiumizeMeHook(MultiHook):
 
     def get_hosters(self):
         #: Get account data
-        user, data = self.account.selectAccount()
+        user, data = self.account.select_account()
 
         #: Get supported hosters list from premiumize.me using the
         #: json API v1 (see https://secure.premiumize.me/?show=api)
diff --git a/module/plugins/hooks/RPNetBizHook.py b/module/plugins/hooks/RPNetBizHook.py
index be472af26..19975a0cd 100644
--- a/module/plugins/hooks/RPNetBizHook.py
+++ b/module/plugins/hooks/RPNetBizHook.py
@@ -21,7 +21,7 @@ class RPNetBizHook(MultiHook):
 
     def get_hosters(self):
         #: Get account data
-        user, data = self.account.selectAccount()
+        user, data = self.account.select_account()
 
         res = self.load("https://premium.rpnet.biz/client_api.php",
                      get={'username': user, 'password': data['password'], 'action': "showHosterList"})
diff --git a/module/plugins/hooks/RehostToHook.py b/module/plugins/hooks/RehostToHook.py
index 016377e15..67f3a6e8a 100644
--- a/module/plugins/hooks/RehostToHook.py
+++ b/module/plugins/hooks/RehostToHook.py
@@ -19,8 +19,8 @@ class RehostToHook(MultiHook):
 
 
     def get_hosters(self):
-        user, data = self.account.selectAccount()
+        user, data = self.account.select_account()
         html = self.load("http://rehost.to/api.php",
                            get={'cmd'     : "get_supported_och_dl",
-                                'long_ses': self.account.getAccountInfo(user)['session']})
+                                'long_ses': self.account.get_account_info(user)['session']})
         return [x.strip() for x in html.replace("\"", "").split(",")]
diff --git a/module/plugins/hooks/SmoozedComHook.py b/module/plugins/hooks/SmoozedComHook.py
index d1cbd8126..2d4fb564e 100644
--- a/module/plugins/hooks/SmoozedComHook.py
+++ b/module/plugins/hooks/SmoozedComHook.py
@@ -19,5 +19,5 @@ class SmoozedComHook(MultiHook):
 
 
     def get_hosters(self):
-        user, data = self.account.selectAccount()
-        return self.account.getAccountInfo(user)["hosters"]
+        user, data = self.account.select_account()
+        return self.account.get_account_info(user)["hosters"]
diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py
index 488b300b8..50e818c66 100644
--- a/module/plugins/hooks/UpdateManager.py
+++ b/module/plugins/hooks/UpdateManager.py
@@ -95,6 +95,15 @@ class UpdateManager(Hook):
             self.update()
 
 
+    #: Deprecated method, use `autoreload_plugins` instead
+    @Expose
+    def autoreloadPlugins(self, *args, **kwargs):
+        """
+        See `autoreload_plugins`
+        """
+        return self.autoreload_plugins(*args, **kwargs)
+
+
     @Expose
     def autoreload_plugins(self):
         """
@@ -292,6 +301,15 @@ class UpdateManager(Hook):
         return exitcode
 
 
+    #: Deprecated method, use `remove_plugins` instead
+    @Expose
+    def removePlugins(self, *args, **kwargs):
+        """
+        See `remove_plugins`
+        """
+        return self.remove_plugins(*args, **kwargs)
+
+
     @Expose
     def remove_plugins(self, type_plugins):
         """