DepositfilesCom premium

1 files changed, 15 insertions, 20 deletions

diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index 45ba42544..0f4f680c8 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -8,23 +8,30 @@ from module.plugins.Hoster import Hoster
 class DepositfilesCom(Hoster):
     __name__ = "DepositfilesCom"
     __type__ = "hoster"
-    __pattern__ = r"http://depositfiles.com/.{2,}/files/"
+    __pattern__ = r"http://[\\w\\.]*?depositfiles\\.com(/\\w{1,3})?/files/[\\w]+"
     __version__ = "0.1"
     __description__ = """Depositfiles.com Download Hoster"""
     __author_name__ = ("spoob")
     __author_mail__ = ("spoob@pyload.org")
 
     def setup(self):
-        self.multiDL = False
+        self.req.canContinue = self.multiDL = True if self.account else False
         
     def process(self, pyfile):
-        self.pyfile = pyfile
-        self.prepare()            
-        pyfile.name = self.get_file_name()
-        self.download(self.get_file_url())
+        self.html = self.load(self.pyfile.url, cookies=False if self.account else False)
+        
+        if re.search(r"Such file does not exist or it has been removed for infringement of copyrights", self.html):
+            self.offline()
+        
+        if not self.account:
+            self.handleFree()
+        
+        pyfile.name = re.search('File name: <b title="(.*)">', self.html).group(1)
+        
+        link = urllib.unquote(re.search('<form action="(http://.+?\.depositfiles.com/.+?)" method="get"', self.html).group(1))
+        self.download(link)
 
-    def prepare(self):
-        self.html = self.load(self.pyfile.url)
+    def handleFree(self):
         if re.search(r'File is checked, please try again in a minute.', self.html) != None:
             self.log.info("DepositFiles.com: The file is being checked. Waiting 1 minute.")
             self.setWait(61)
@@ -37,15 +44,3 @@ class DepositfilesCom(Hoster):
         wait_time = int(re.search(r'<span id="download_waiter_remain">(.*?)</span>', self.html).group(1))
         self.setWait(wait_time)
         self.log.debug("DepositFiles.com: Waiting %d seconds." % wait_time)
-        
-    def get_file_url(self):
-        return urllib.unquote(re.search('<form action="(http://.+?\.depositfiles.com/.+?)" method="get"', self.html).group(1))
-
-    def get_file_name(self):
-        return re.search('File name: <b title="(.*)">', self.html).group(1)
-
-    def file_exists(self):
-        self.html = self.load(self.parent.url)
-        if re.search(r"Such file does not exist or it has been removed for infringement of copyrights", self.html) != None:
-            return False
-        return True