Merge branch 'stable' of github.com:pyload/pyload into stable

4 files changed, 17 insertions, 16 deletions

diff --git a/module/plugins/hoster/BayfilesCom.py b/module/plugins/hoster/BayfilesCom.py
index a696bac26..a7a2c75d4 100644
--- a/module/plugins/hoster/BayfilesCom.py
+++ b/module/plugins/hoster/BayfilesCom.py
@@ -26,11 +26,11 @@ from module.common.json_layer import json_loads
 class BayfilesCom(SimpleHoster):
     __name__ = "BayfilesCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:www\.)?bayfiles\.(?:com|net)/file/\w+/\w+/.*"
-    __version__ = "0.05"
+    __pattern__ = r"https?://(?:www\.)?bayfiles\.(com|net)/file/(?P<ID>[a-zA-Z0-9]+/[a-zA-Z0-9]+/[^/]+)"
+    __version__ = "0.06"
     __description__ = """Bayfiles.com plugin - free only"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = ("zoidberg", "Walter Purcaro")
+    __author_mail__ = ("zoidberg@mujmail.cz", "vuolter@gmail.com")
 
     FILE_INFO_PATTERN = r'<p title="(?P<N>[^"]+)">[^<]*<strong>(?P<S>[0-9., ]+)(?P<U>[kKMG])i?B</strong></p>'
     FILE_OFFLINE_PATTERN = r'(<p>The requested file could not be found.</p>|<title>404 Not Found</title>)'
@@ -53,7 +53,7 @@ class BayfilesCom(SimpleHoster):
             self.parseError('VARS')
         vfid, delay = found.groups()
 
-        response = json_loads(self.load('http://bayfiles.com/ajax_download', get={
+        response = json_loads(self.load('https://bayfiles.com/ajax_download', get={
             "_": time() * 1000,
             "action": "startTimer",
             "vfid": vfid}, decode=True))
@@ -64,12 +64,12 @@ class BayfilesCom(SimpleHoster):
         self.setWait(int(delay))
         self.wait()
 
-        self.html = self.load('http://bayfiles.com/ajax_download', get={
+        self.html = self.load('https://bayfiles.com/ajax_download', get={
             "token": response['token'],
             "action": "getLink",
             "vfid": vfid})
 
-        # Get final link and download        
+        # Get final link and download
         found = re.search(self.LINK_PATTERN, self.html)
         if not found:
             self.parseError("Free link")
@@ -90,9 +90,9 @@ class BayfilesCom(SimpleHoster):
             "notfound": re.compile(r"<title>404 Not Found</title>")
         })
         if check == "waitforfreeslots":
-            self.retry(60, 300, "Wait for free slot")
+            self.retry(30, 60 * 5, "Wait for free slot")
         elif check == "notfound":
-            self.retry(60, 300, "404 Not found")
+            self.retry(30, 60 * 5, "404 Not found")
 
 
 getInfo = create_getInfo(BayfilesCom)
diff --git a/module/plugins/hoster/CrockoCom.py b/module/plugins/hoster/CrockoCom.py
index 7d5336cd9..77c45ed92 100644
--- a/module/plugins/hoster/CrockoCom.py
+++ b/module/plugins/hoster/CrockoCom.py
@@ -10,8 +10,8 @@ from module.plugins.internal.CaptchaService import ReCaptcha
 class CrockoCom(SimpleHoster):
     __name__ = "CrockoCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(www\.)?(crocko|easy-share).com/.*"
-    __version__ = "0.14"
+    __pattern__ = r"http://(www\.)?(crocko|easy-share).com/\w+"
+    __version__ = "0.15"
     __description__ = """Crocko Download Hoster"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
@@ -32,7 +32,7 @@ class CrockoCom(SimpleHoster):
         if "You need Premium membership to download this file." in self.html:
             self.fail("You need Premium membership to download this file.")
 
-        for i in range(5):
+        for _ in xrange(5):
             found = re.search(self.CAPTCHA_URL_PATTERN, self.html)
             if found:
                 url, wait_time = 'http://crocko.com' + found.group(1), found.group(2)
@@ -55,7 +55,7 @@ class CrockoCom(SimpleHoster):
 
         recaptcha = ReCaptcha(self)
 
-        for i in range(5):
+        for _ in xrange(5):
             inputs['recaptcha_challenge_field'], inputs['recaptcha_response_field'] = recaptcha.challenge(captcha_key)
             self.download(action, post=inputs)
 
diff --git a/module/plugins/hoster/NowDownloadEu.py b/module/plugins/hoster/NowDownloadEu.py
index ff7d237f5..bd84b58bc 100644
--- a/module/plugins/hoster/NowDownloadEu.py
+++ b/module/plugins/hoster/NowDownloadEu.py
@@ -24,8 +24,8 @@ from module.utils import fixup
 class NowDownloadEu(SimpleHoster):
     __name__ = "NowDownloadEu"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:www\.)?nowdownload\.(ch|eu|co)/(dl/|download\.php\?id=)(?P<ID>[a-zA-Z0-9]+)"
-    __version__ = "0.03"
+    __pattern__ = r"http://(?:www\.)?nowdownload\.(ch|co|eu|sx)/(dl/|download\.php\?id=)(?P<ID>\w+)"
+    __version__ = "0.04"
     __description__ = """NowDownloadCh"""
     __author_name__ = ("godofdream", "Walter Purcaro")
     __author_mail__ = ("", "vuolter@gmail.com")
diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py
index d574d1fa7..78d8b3deb 100644
--- a/module/plugins/hoster/TurbobitNet.py
+++ b/module/plugins/hoster/TurbobitNet.py
@@ -36,7 +36,7 @@ class TurbobitNet(SimpleHoster):
     __name__ = "TurbobitNet"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)?(turbobit.net|unextfiles.com)/(?!download/folder/)(?:download/free/)?(?P<ID>\w+).*"
-    __version__ = "0.10"
+    __version__ = "0.11"
     __description__ = """Turbobit.net plugin"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
@@ -168,6 +168,7 @@ class TurbobitNet(SimpleHoster):
 
     def handlePremium(self):
         self.logDebug("Premium download as user %s" % self.user)
+        self.html = self.load(self.pyfile.url)  # Useless in 0.5
         self.downloadFile()
 
     def downloadFile(self):