diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2012-09-18 17:59:50 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2012-09-18 17:59:50 +0200 |
| commit | 6130a2377ca6754fee88773097ce220abef1aa47 (patch) | |
| tree | 76bea0d76393100fcf393c164c96d34f286aba7a /module/plugins/crypter/FilesonicComFolder.py | |
| parent | Added DuckcryptInfo decrypter, smaller fixes (diff) | |
| parent | dropdowns in navbar (diff) | |
| download | pyload-6130a2377ca6754fee88773097ce220abef1aa47.tar.xz | |
merged stable into default
Diffstat (limited to 'module/plugins/crypter/FilesonicComFolder.py')
| -rw-r--r-- | module/plugins/crypter/FilesonicComFolder.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/module/plugins/crypter/FilesonicComFolder.py b/module/plugins/crypter/FilesonicComFolder.py index b967a74a1..02ae66295 100644 --- a/module/plugins/crypter/FilesonicComFolder.py +++ b/module/plugins/crypter/FilesonicComFolder.py @@ -4,8 +4,6 @@ import re from module.plugins.Crypter import Crypter class FilesonicComFolder(Crypter): - __name__ = "FilesonicComFolder" - __type__ = "crypter" __pattern__ = r"http://(\w*\.)?(sharingmatrix|filesonic|wupload)\.[^/]*/folder/\w+/?" __version__ = "0.11" __description__ = """Filesonic.com/Wupload.com Folder Plugin""" @@ -15,9 +13,8 @@ class FilesonicComFolder(Crypter): FOLDER_PATTERN = r'<table>\s*<caption>Files Folder</caption>(.*?)</table>' LINK_PATTERN = r'<a href="([^"]+)">' - def decrypt(self, pyfile): - html = self.load(self.pyfile.url) - + def decryptURL(self, url): + html = self.load(url) new_links = [] folder = re.search(self.FOLDER_PATTERN, html, re.DOTALL) @@ -26,6 +23,7 @@ class FilesonicComFolder(Crypter): new_links.extend(re.findall(self.LINK_PATTERN, folder.group(1))) if new_links: - self.core.files.addLinks(new_links, self.pyfile.package().id) + return new_links else: - self.fail('Could not extract any links')
\ No newline at end of file + self.fail('Could not extract any links') + |