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

Conflicts:
	module/plugins/hoster/UlozTo.py

1 files changed, 5 insertions, 8 deletions

diff --git a/module/plugins/hoster/FilerNet.py b/module/plugins/hoster/FilerNet.py
index a1ad5d8c9..cc4788772 100644
--- a/module/plugins/hoster/FilerNet.py
+++ b/module/plugins/hoster/FilerNet.py
@@ -32,7 +32,7 @@ class FilerNet(SimpleHoster):
     INFO_PATTERN    = r'<h1 class="page-header">Free Download (?P<N>\S+) <small>(?P<S>[\w.]+) (?P<U>[\w^_]+)</small></h1>'
     OFFLINE_PATTERN = r'Nicht gefunden'
 
-    WAIT_PATTERN = r'musst du <span id="time">(\d+)'
+    WAIT_PATTERN = r'var count = (\d+);'
 
     LINK_FREE_PATTERN = LINK_PREMIUM_PATTERN = r'href="([^"]+)">Get download</a>'
 
@@ -51,10 +51,7 @@ class FilerNet(SimpleHoster):
         self.captcha = ReCaptcha(pyfile)
         response, challenge = self.captcha.challenge()
 
-        header = self.load(pyfile.url,
-                           post={'recaptcha_challenge_field': challenge,
-                                 'recaptcha_response_field' : response,
-                                 'hash'                     : inputs['hash']},
-                           just_header=True)
-
-        self.link = header.get('location')
+        self.download(pyfile.url,
+                      post={'recaptcha_challenge_field': challenge,
+                            'recaptcha_response_field' : response,
+                            'hash'                     : inputs['hash']})