From ff581d9a4a1637b4e06bcbe77d67591f9279fe1b Mon Sep 17 00:00:00 2001 From: Stefano Date: Sun, 21 Jul 2013 15:03:21 +0200 Subject: Fixed PEP 8 violations in Crypters (cherry-picked from 4b61d36bf18931df0a9720047b3619ce245f8a1b) --- pyload/plugins/crypter/OronComFolder.py | 34 +++++++++++---------------------- 1 file changed, 11 insertions(+), 23 deletions(-) (limited to 'pyload/plugins/crypter/OronComFolder.py') diff --git a/pyload/plugins/crypter/OronComFolder.py b/pyload/plugins/crypter/OronComFolder.py index 726371966..f6637033b 100755 --- a/pyload/plugins/crypter/OronComFolder.py +++ b/pyload/plugins/crypter/OronComFolder.py @@ -1,46 +1,34 @@ # -*- coding: utf-8 -*- -import re +import re from module.plugins.Crypter import Crypter + class OronComFolder(Crypter): __name__ = "OronComFolder" __type__ = "crypter" __pattern__ = r"http://(?:www\.)?oron.com/folder/\w+" - __version__ = "0.2" + __version__ = "0.1" __description__ = """Oron.com Folder Plugin""" __author_name__ = ("DHMH") __author_mail__ = ("webmaster@pcProfil.de") - FOLDER_PATTERN = r'(?:.*)(?P.*)(?:.*)' + FOLDER_PATTERN = r'(.*)

\n ' LINK_PATTERN = r'' - def decryptURL(self, url): - html = self.load(url) + def decrypt(self, pyfile): + html = self.load(self.pyfile.url) new_links = [] - if 'No such folder exist' in html: - # Don't fail because if there's more than a folder for this package - # and only one of them fails, no urls at all will be added. - self.logWarning("Folder does not exist") - return new_links - folder = re.search(self.FOLDER_PATTERN, html, re.DOTALL) if folder is None: - # Don't fail because if there's more than a folder for this package - # and only one of them fails, no urls at all will be added. - self.logWarning("Parse error (FOLDER)") - return new_links - + self.fail("Parse error (FOLDER)") + new_links.extend(re.findall(self.LINK_PATTERN, folder.group(0))) - + if new_links: - self.logDebug("Found %d new links" % len(new_links)) - return new_links + self.core.files.addLinks(new_links, self.pyfile.package().id) else: - # Don't fail because if there's more than a folder for this package - # and only one of them fails, no urls at all will be added. - self.logWarning('Could not extract any links') - return new_links + self.fail('Could not extract any links') \ No newline at end of file -- cgit v1.2.3