Merge pull request #1 from pyload/stable

sync stable

1 files changed, 12 insertions, 17 deletions

diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py
index d20afb620..4f64215fa 100644
--- a/module/plugins/hoster/DebridItaliaCom.py
+++ b/module/plugins/hoster/DebridItaliaCom.py
@@ -8,11 +8,12 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 class DebridItaliaCom(MultiHoster):
     __name__    = "DebridItaliaCom"
     __type__    = "hoster"
-    __version__ = "0.14"
+    __version__ = "0.17"
 
-    __pattern__ = r'http://s\d+\.debriditalia\.com/dl/\d+'
+    __pattern__ = r'https?://(?:www\.|s\d+\.)?debriditalia\.com/dl/\d+'
+    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Debriditalia.com hoster plugin"""
+    __description__ = """Debriditalia.com multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
@@ -21,29 +22,23 @@ class DebridItaliaCom(MultiHoster):
     URL_REPLACEMENTS = [("https://", "http://")]
 
 
-    def setup(self):
-        self.chunkLimit     = 1
-        self.resumeDownload = True
-
-
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         self.html = self.load("http://www.debriditalia.com/api.php",
-                              get={'generate': "on", 'link': self.pyfile.url, 'p': self.getPassword()})
+                              get={'generate': "on", 'link': pyfile.url, 'p': self.getPassword()})
 
         if "ERROR:" not in self.html:
             self.link = self.html.strip()
         else:
-            errmsg = re.search(r'ERROR:(.*)', self.html).group(1).strip()
+            self.info['error'] = re.search(r'ERROR:(.*)', self.html).group(1).strip()
 
             self.html = self.load("http://debriditalia.com/linkgen2.php",
                                   post={'xjxfun'   : "convertiLink",
-                                        'xjxargs[]': "S<![CDATA[%s]]>" % self.pyfile.url,
+                                        'xjxargs[]': "S<![CDATA[%s]]>" % pyfile.url,
                                         'xjxargs[]': "S%s" % self.getPassword()})
-
-            self.link = re.search(r'<a href="(.+?)"', self.html).group(1)
-
-        if not self.link:
-            self.fail(errmsg)
+            try:
+                self.link = re.search(r'<a href="(.+?)"', self.html).group(1)
+            except AttributeError:
+                pass
 
 
 getInfo = create_getInfo(DebridItaliaCom)