1 files changed, 22 insertions, 38 deletions
diff --git a/module/plugins/hoster/FilerNet.py b/module/plugins/hoster/FilerNet.py
index 159aab964..3b876ed48 100644
--- a/module/plugins/hoster/FilerNet.py
+++ b/module/plugins/hoster/FilerNet.py
@@ -6,19 +6,19 @@
 
 import pycurl
 import re
+import urlparse
 
-from urlparse import urljoin
-
-from module.plugins.internal.CaptchaService import ReCaptcha
+from module.plugins.internal.ReCaptcha import ReCaptcha
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class FilerNet(SimpleHoster):
     __name__    = "FilerNet"
     __type__    = "hoster"
-    __version__ = "0.13"
+    __version__ = "0.20"
 
     __pattern__ = r'https?://(?:www\.)?filer\.net/get/\w+'
+    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """Filer.net hoster plugin"""
     __license__     = "GPLv3"
@@ -29,17 +29,9 @@ 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'
 
-    LINK_FREE_PATTERN = LINK_PREMIUM_PATTERN = r'href="([^"]+)">Get download</a>'
-
+    WAIT_PATTERN = r'musst du <span id="time">(\d+)'
 
-    def checkErrors(self):
-        # Wait between downloads
-        m = re.search(r'musst du <span id="time">(\d+)</span> Sekunden warten', self.html)
-        if m:
-            errmsg = self.info['error'] = _("Wait between free downloads")
-            self.retry(wait_time=int(m.group(1)), reason=errmsg)
-
-        self.info.pop('error', None)
+    LINK_FREE_PATTERN = LINK_PREMIUM_PATTERN = r'href="([^"]+)">Get download</a>'
 
 
     def handleFree(self, pyfile):
@@ -53,30 +45,22 @@ class FilerNet(SimpleHoster):
         if 'hash' not in inputs:
             self.error(_("Unable to detect hash"))
 
-        recaptcha = ReCaptcha(self)
-
-        for _i in xrange(5):
-            challenge, response = recaptcha.challenge()
-
-            #@NOTE: Work-around for v0.4.9 just_header issue
-            #@TODO: Check for v0.4.10
-            self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 0)
-            self.load(pyfile.url, post={'recaptcha_challenge_field': challenge,
-                                             'recaptcha_response_field' : response,
-                                             'hash'                     : inputs['hash']})
-            self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 1)
-
-            if 'location' in self.req.http.header.lower():
-                self.link = re.search(r'location: (\S+)', self.req.http.header, re.I).group(1)
-                self.correctCaptcha()
-                break
-            else:
-                self.invalidCaptcha()
-
-
-    def downloadLink(self, link):
-        if link and isinstance(link, basestring):
-            self.download(urljoin("http://filer.net/", link), disposition=True)
+        recaptcha           = ReCaptcha(self)
+        response, challenge = recaptcha.challenge()
+
+        #@NOTE: Work-around for v0.4.9 just_header issue
+        #@TODO: Check for v0.4.10
+        self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 0)
+        self.load(pyfile.url, post={'recaptcha_challenge_field': challenge,
+                                    'recaptcha_response_field' : response,
+                                    'hash'                     : inputs['hash']})
+        self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 1)
+
+        if 'location' in self.req.http.header.lower():
+            self.link = re.search(r'location: (\S+)', self.req.http.header, re.I).group(1)
+            self.correctCaptcha()
+        else:
+            self.invalidCaptcha()
 
 
 getInfo = create_getInfo(FilerNet)