summaryrefslogtreecommitdiffstats
path: root/pyload/plugins/crypter/FileserveComFolder.py
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/plugins/crypter/FileserveComFolder.py')
-rw-r--r--pyload/plugins/crypter/FileserveComFolder.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/pyload/plugins/crypter/FileserveComFolder.py b/pyload/plugins/crypter/FileserveComFolder.py
index 23aa3a14a..d601e2365 100644
--- a/pyload/plugins/crypter/FileserveComFolder.py
+++ b/pyload/plugins/crypter/FileserveComFolder.py
@@ -6,14 +6,17 @@ from pyload.plugins.base.Crypter import Crypter
class FileserveComFolder(Crypter):
- __name__ = "FileserveComFolder"
- __type__ = "crypter"
+ __name__ = "FileserveComFolder"
+ __type__ = "crypter"
__version__ = "0.11"
- __pattern__ = r'http://(?:www\.)?fileserve.com/list/\w+'
+ __pattern__ = r'http://(?:www\.)?fileserve\.com/list/\w+'
+ __config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
+ ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
__description__ = """FileServe.com folder decrypter plugin"""
- __authors__ = [("fionnc", "fionnc@gmail.com")]
+ __license__ = "GPLv3"
+ __authors__ = [("fionnc", "fionnc@gmail.com")]
FOLDER_PATTERN = r'<table class="file_list">(.*?)</table>'
@@ -25,13 +28,11 @@ class FileserveComFolder(Crypter):
new_links = []
- folder = re.search(self.FOLDER_PATTERN, html, re.DOTALL)
+ folder = re.search(self.FOLDER_PATTERN, html, re.S)
if folder is None:
- self.fail("Parse error (FOLDER)")
+ self.error(_("FOLDER_PATTERN not found"))
new_links.extend(re.findall(self.LINK_PATTERN, folder.group(1)))
if new_links:
self.urls = [map(lambda s: "http://fileserve.com%s" % s, new_links)]
- else:
- self.fail('Could not extract any links')