Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 15 insertions, 13 deletions

diff --git a/module/plugins/hooks/RPNetBizHook.py b/module/plugins/hooks/RPNetBizHook.py
index 10332948d..5d26b7f09 100644
--- a/module/plugins/hooks/RPNetBizHook.py
+++ b/module/plugins/hooks/RPNetBizHook.py
@@ -7,30 +7,32 @@ from module.plugins.internal.MultiHook import MultiHook
 class RPNetBizHook(MultiHook):
     __name__    = "RPNetBizHook"
     __type__    = "hook"
-    __version__ = "0.14"
+    __version__ = "0.16"
+    __status__  = "testing"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
-                  ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
-                  ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
-                  ("reload"        , "bool"               , "Reload plugin list"                  , True ),
-                  ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
+    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
+                  ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ),
+                  ("reload"        , "bool"               , "Reload plugin list"           , True ),
+                  ("reloadinterval", "int"                , "Reload interval in hours"     , 12   )]
 
     __description__ = """RPNet.biz hook plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Dman", "dmanugm@gmail.com")]
 
 
-    def getHosters(self):
-        # Get account data
-        user, data = self.account.selectAccount()
+    def get_hosters(self):
+        #: Get account data
+        user, info = self.account.select()
 
-        res = self.getURL("https://premium.rpnet.biz/client_api.php",
-                     get={'username': user, 'password': data['password'], 'action': "showHosterList"})
+        res = self.load("https://premium.rpnet.biz/client_api.php",
+                        get={'username': user,
+                             'password': info['login']['password'],
+                             'action'  : "showHosterList"})
         hoster_list = json_loads(res)
 
-        # If account is not valid thera are no hosters available
+        #: 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']