summaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2015-01-13 01:47:03 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2015-01-13 01:47:03 +0100
commit56db4681e9dfa77b1e616d600d19ba98c915fef9 (patch)
tree6c3743cfed857a6ec594475906f2503b568046a6 /module
parent[MultiHook] Fix DOMAIN_REPLACEMENTS + retry feature (diff)
downloadpyload-56db4681e9dfa77b1e616d600d19ba98c915fef9.tar.xz
[FilerNet] Code cosmetics
Diffstat (limited to 'module')
-rw-r--r--module/plugins/crypter/FilerNetFolder.py8
-rw-r--r--module/plugins/hoster/FilerNet.py4
2 files changed, 5 insertions, 7 deletions
diff --git a/module/plugins/crypter/FilerNetFolder.py b/module/plugins/crypter/FilerNetFolder.py
index 00db173bb..d33e26ee8 100644
--- a/module/plugins/crypter/FilerNetFolder.py
+++ b/module/plugins/crypter/FilerNetFolder.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
class FilerNetFolder(SimpleCrypter):
__name__ = "FilerNetFolder"
__type__ = "crypter"
- __version__ = "0.41"
+ __version__ = "0.42"
__pattern__ = r'https?://filer\.net/folder/\w{16}'
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -19,11 +19,9 @@ class FilerNetFolder(SimpleCrypter):
LINK_PATTERN = r'href="(/get/\w{16})">(?!<)'
- NAME_PATTERN = r'<h3>(?P<N>.+?) - <small'
-
- def getLinks(self):
- return ['http://filer.net%s' % link for link in re.findall(self.LINK_PATTERN, self.html)]
+ NAME_PATTERN = r'<h3>(?P<N>.+?) - <small'
+ OFFLINE_PATTERN = r'Nicht gefunden'
getInfo = create_getInfo(FilerNetFolder)
diff --git a/module/plugins/hoster/FilerNet.py b/module/plugins/hoster/FilerNet.py
index 159aab964..a668a834b 100644
--- a/module/plugins/hoster/FilerNet.py
+++ b/module/plugins/hoster/FilerNet.py
@@ -62,8 +62,8 @@ class FilerNet(SimpleHoster):
#@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']})
+ 'recaptcha_response_field' : response,
+ 'hash' : inputs['hash']})
self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 1)
if 'location' in self.req.http.header.lower():