Merge pull request #2 from pyload/stable

sync with stable

1 files changed, 13 insertions, 5 deletions

diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py
index 9c0956668..50d849a98 100644
--- a/module/plugins/accounts/DebridItaliaCom.py
+++ b/module/plugins/accounts/DebridItaliaCom.py
@@ -9,9 +9,13 @@ from module.plugins.internal.Account import Account
 class DebridItaliaCom(Account):
     __name__    = "DebridItaliaCom"
     __type__    = "account"
-    __version__ = "0.15"
+    __version__ = "0.17"
     __status__  = "testing"
 
+    __config__ = [("mh_mode"    , "all;listed;unlisted", "Filter hosters to use"        , "all"),
+                  ("mh_list"    , "str"                , "Hoster list (comma separated)", ""   ),
+                  ("mh_interval", "int"                , "Reload interval in minutes"   , 60   )]
+
     __description__ = """Debriditalia.com account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("stickell", "l.stickell@yahoo.it"),
@@ -21,13 +25,17 @@ class DebridItaliaCom(Account):
     WALID_UNTIL_PATTERN = r'Premium valid till: (.+?) \|'
 
 
-    def parse_info(self, user, password, data, req):
+    def grab_hosters(self, user, password, data):
+        return self.load("http://debriditalia.com/api.php", get={'hosts': ""}).replace('"', '').split(',')
+
+
+    def grab_info(self, user, password, data):
         info = {'premium': False, 'validuntil': None, 'trafficleft': None}
         html = self.load("http://debriditalia.com/")
 
         if 'Account premium not activated' not in html:
             m = re.search(self.WALID_UNTIL_PATTERN, html)
-            if m:
+            if m is not None:
                 validuntil = time.mktime(time.strptime(m.group(1), "%d/%m/%Y %H:%M"))
                 info = {'premium': True, 'validuntil': validuntil, 'trafficleft': -1}
             else:
@@ -36,10 +44,10 @@ class DebridItaliaCom(Account):
         return info
 
 
-    def login(self, user, password, data, req):
+    def signin(self, user, password, data):
         html = self.load("https://debriditalia.com/login.php",
                          get={'u': user,
                               'p': password})
 
         if 'NO' in html:
-            self.login_fail()
+            self.fail_login()