From fd105f8e51768ec1943cda2375bdfdbe5b0a3951 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 9 Jan 2015 00:35:51 +0100
Subject: "New Year" Update: hoster plugins

---
 module/plugins/hoster/DepositfilesCom.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'module/plugins/hoster/DepositfilesCom.py')

diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index 6588a3b37..9d060e75d 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class DepositfilesCom(SimpleHoster):
     __name__    = "DepositfilesCom"
     __type__    = "hoster"
-    __version__ = "0.51"
+    __version__ = "0.52"
 
     __pattern__ = r'https?://(?:www\.)?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/(?P<ID>\w+)'
 
@@ -32,14 +32,12 @@ class DepositfilesCom(SimpleHoster):
 
     COOKIES = [("dfiles.eu", "lang_current", "en")]
 
-    FREE_LINK_PATTERN      = r'<form id="downloader_file_form" action="(http://.+?\.(dfiles\.eu|depositfiles\.com)/.+?)" method="post"'
-    PREMIUM_LINK_PATTERN   = r'class="repeat"><a href="(.+?)"'
-    PREMIUM_MIRROR_PATTERN = r'class="repeat_mirror"><a href="(.+?)"'
+    LINK_FREE_PATTERN    = r'<form id="downloader_file_form" action="(http://.+?\.(dfiles\.eu|depositfiles\.com)/.+?)" method="post"'
+    LINK_PREMIUM_PATTERN = r'class="repeat"><a href="(.+?)"'
+    LINK_MIRROR_PATTERN  = r'class="repeat_mirror"><a href="(.+?)"'
 
 
-    def handleFree(self):
-        self.html = self.load(self.pyfile.url, post={"gateway_result": "1"}, cookies=True)
-
+    def handleFree(self, pyfile):
         if re.search(r'File is checked, please try again in a minute.', self.html) is not None:
             self.logInfo(_("The file is being checked. Waiting 1 minute"))
             self.retry(wait_time=60)
@@ -83,7 +81,7 @@ class DepositfilesCom(SimpleHoster):
                 self.logDebug(params)
                 continue
 
-            m = re.search(self.FREE_LINK_PATTERN, self.html)
+            m = re.search(self.LINK_FREE_PATTERN, self.html)
             if m:
                 if 'response' in params:
                     self.correctCaptcha()
@@ -101,7 +99,7 @@ class DepositfilesCom(SimpleHoster):
             self.retry(wait_time=60)
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         if '<span class="html_download_api-gold_traffic_limit">' in self.html:
             self.logWarning(_("Download limit reached"))
             self.retry(25, 60 * 60, "Download limit reached")
@@ -109,8 +107,8 @@ class DepositfilesCom(SimpleHoster):
             self.account.relogin(self.user)
             self.retry()
         else:
-            link = re.search(self.PREMIUM_LINK_PATTERN, self.html)
-            mirror = re.search(self.PREMIUM_MIRROR_PATTERN, self.html)
+            link = re.search(self.LINK_PREMIUM_PATTERN, self.html)
+            mirror = re.search(self.LINK_MIRROR_PATTERN, self.html)
             if link:
                 dlink = link.group(1)
             elif mirror:
-- 
cgit v1.2.3


From e1baccf1ec914563d3b2b845906cce024e7cd3b1 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 13 Jan 2015 23:14:50 +0100
Subject: Replace 'except' with 'except Exception'

---
 module/plugins/hoster/DepositfilesCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/hoster/DepositfilesCom.py')

diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index 9d060e75d..6e7f2909c 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -95,7 +95,7 @@ class DepositfilesCom(SimpleHoster):
 
         try:
             self.download(link, disposition=True)
-        except:
+        except Exception:
             self.retry(wait_time=60)
 
 
-- 
cgit v1.2.3


From cf4ded052964047de88d676045329b8fa4fca2dc Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 22 Jan 2015 21:31:19 +0100
Subject: Update plugins after CaptchaService changes

---
 module/plugins/hoster/DepositfilesCom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/hoster/DepositfilesCom.py')

diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index 6e7f2909c..3af309cae 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class DepositfilesCom(SimpleHoster):
     __name__    = "DepositfilesCom"
     __type__    = "hoster"
-    __version__ = "0.52"
+    __version__ = "0.53"
 
     __pattern__ = r'https?://(?:www\.)?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/(?P<ID>\w+)'
 
@@ -77,7 +77,7 @@ class DepositfilesCom(SimpleHoster):
             if '<input type=button value="Continue" onclick="check_recaptcha' in self.html:
                 if 'response' in params:
                     self.invalidCaptcha()
-                params['challenge'], params['response'] = recaptcha.challenge(captcha_key)
+                params['response'], params['challenge'] = recaptcha.challenge(captcha_key)
                 self.logDebug(params)
                 continue
 
-- 
cgit v1.2.3


From 6616c00ba1c40f5d56959bd0e4725f26250e1292 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 9 Feb 2015 17:42:31 +0100
Subject: Spare code cosmetics

---
 module/plugins/hoster/DepositfilesCom.py | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'module/plugins/hoster/DepositfilesCom.py')

diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index 3af309cae..6de05af9a 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -85,19 +85,14 @@ class DepositfilesCom(SimpleHoster):
             if m:
                 if 'response' in params:
                     self.correctCaptcha()
-                link = unquote(m.group(1))
-                self.logDebug("LINK: %s" % link)
+
+                self.link = unquote(m.group(1))
                 break
             else:
                 self.error(_("Download link"))
         else:
             self.fail(_("No valid captcha response received"))
 
-        try:
-            self.download(link, disposition=True)
-        except Exception:
-            self.retry(wait_time=60)
-
 
     def handlePremium(self, pyfile):
         if '<span class="html_download_api-gold_traffic_limit">' in self.html:
@@ -107,15 +102,14 @@ class DepositfilesCom(SimpleHoster):
             self.account.relogin(self.user)
             self.retry()
         else:
-            link = re.search(self.LINK_PREMIUM_PATTERN, self.html)
+            link   = re.search(self.LINK_PREMIUM_PATTERN, self.html)
             mirror = re.search(self.LINK_MIRROR_PATTERN, self.html)
+
             if link:
-                dlink = link.group(1)
+                self.link = link.group(1)
+
             elif mirror:
-                dlink = mirror.group(1)
-            else:
-                self.error(_("No direct download link or mirror found"))
-            self.download(dlink, disposition=True)
+                self.link = mirror.group(1)
 
 
 getInfo = create_getInfo(DepositfilesCom)
-- 
cgit v1.2.3