Merge pull request #1 from pyload/stable

Merge

1 files changed, 22 insertions, 20 deletions

diff --git a/module/plugins/hooks/RPNetBiz.py b/module/plugins/hooks/RPNetBiz.py
index 54f814231..5af355fcc 100644
--- a/module/plugins/hooks/RPNetBiz.py
+++ b/module/plugins/hooks/RPNetBiz.py
@@ -1,24 +1,25 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.MultiHoster import MultiHoster
 from module.common.json_layer import json_loads
-from module.network.RequestFactory import getURL
+from module.plugins.internal.MultiHook import MultiHook
 
 
-class RPNetBiz(MultiHoster):
-    __name__ = "RPNetBiz"
-    __version__ = "0.1"
-    __type__ = "hook"
-    __description__ = """RPNet.biz hook plugin"""
-    __config__ = [("activated", "bool", "Activated", False),
-                  ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"),
-                  ("hosterList", "str", "Hoster list (comma separated)", ""),
-                  ("unloadFailing", "bool", "Revert to stanard download if download fails", False),
+class RPNetBiz(MultiHook):
+    __name__    = "RPNetBiz"
+    __type__    = "hook"
+    __version__ = "0.12"
+
+    __config__ = [("mode", "all;listed;unlisted", "Use for hosters (if supported):", "all"),
+                  ("pluginlist", "str", "Hoster list (comma separated)", ""),
+                  ("revertfailed", "bool", "Revert to stanard download if download fails", False),
                   ("interval", "int", "Reload interval in hours (0 to disable)", 24)]
-    __author_name__ = "Dman"
-    __author_mail__ = "dmanugm@gmail.com"
 
-    def getHoster(self):
+    __description__ = """RPNet.biz hook plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Dman", "dmanugm@gmail.com")]
+
+
+    def getHosters(self):
         # No hosts supported if no account
         if not self.account or not self.account.canUse():
             return []
@@ -26,17 +27,18 @@ class RPNetBiz(MultiHoster):
         # Get account data
         (user, data) = self.account.selectAccount()
 
-        response = getURL("https://premium.rpnet.biz/client_api.php",
-                          get={"username": user, "password": data['password'], "action": "showHosterList"})
-        hoster_list = json_loads(response)
+        res = self.getURL("https://premium.rpnet.biz/client_api.php",
+                     get={'username': user, 'password': data['password'], 'action': "showHosterList"})
+        hoster_list = json_loads(res)
 
         # If account is not valid thera are no hosters available
         if 'error' in hoster_list:
             return []
 
-        # Extract hosters from json file 
+        # Extract hosters from json file
         return hoster_list['hosters']
 
+
     def coreReady(self):
         # Get account plugin and check if there is a valid account available
         self.account = self.core.accountManager.getAccountPlugin("RPNetBiz")
@@ -45,5 +47,5 @@ class RPNetBiz(MultiHoster):
             self.logError(_("Please enter your %s account or deactivate this plugin") % "rpnet")
             return
 
-        # Run the overwriten core ready which actually enables the multihoster hook 
-        return MultiHoster.coreReady(self)
+        # Run the overwriten core ready which actually enables the multihoster hook
+        return MultiHook.coreReady(self)