diff options
author | Stefano <l.stickell@yahoo.it> | 2013-07-16 18:26:23 +0200 |
---|---|---|
committer | Stefano <l.stickell@yahoo.it> | 2013-07-16 18:26:23 +0200 |
commit | 5a8774b26ce4f7b20eefa9dbf4a7dfd1c3c630b9 (patch) | |
tree | 5e5f33620d3986d51952c2cae87f02a58ae7e45e /module/plugins/internal/SimpleCrypter.py | |
parent | Captcha9kw: fixed bad gettext use (diff) | |
download | pyload-5a8774b26ce4f7b20eefa9dbf4a7dfd1c3c630b9.tar.xz |
SimpleCrypter is now able to handle links on multiple pages
Diffstat (limited to 'module/plugins/internal/SimpleCrypter.py')
-rw-r--r-- | module/plugins/internal/SimpleCrypter.py | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py index d935bf1da..546b920e0 100644 --- a/module/plugins/internal/SimpleCrypter.py +++ b/module/plugins/internal/SimpleCrypter.py @@ -25,7 +25,7 @@ from module.utils import html_unescape class SimpleCrypter(Crypter): __name__ = "SimpleCrypter" - __version__ = "0.04" + __version__ = "0.05" __pattern__ = None __type__ = "crypter" __description__ = """Base crypter plugin""" @@ -39,6 +39,15 @@ class SimpleCrypter(Crypter): TITLE_PATTERN: (optional) the group defined by 'title' should be the title example: <title>Files of: (?P<title>[^<]+) folder</title> + + If the links are disposed on multiple pages you need to define a pattern: + + PAGES_PATTERN: the group defined by 'pages' must be the total number of pages + + and a function: + + loadPage(self, page_n): + must return the html of the page number 'page_n' """ def decrypt(self, pyfile): @@ -46,11 +55,15 @@ class SimpleCrypter(Crypter): package_name, folder_name = self.getPackageNameAndFolder() - package_links = re.findall(self.LINK_PATTERN, self.html) - self.logDebug('Package has %d links' % len(package_links)) + self.package_links = re.findall(self.LINK_PATTERN, self.html) + + if hasattr(self, 'PAGES_PATTERN') and hasattr(self, 'loadPage'): + self.handleMultiPages() - if package_links: - self.packages = [(package_name, package_links, folder_name)] + self.logDebug('Package has %d links' % len(self.package_links)) + + if self.package_links: + self.packages = [(package_name, self.package_links, folder_name)] else: self.fail('Could not extract any links') @@ -66,3 +79,14 @@ class SimpleCrypter(Crypter): folder = self.pyfile.package().folder self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder)) return name, folder + + def handleMultiPages(self): + pages = re.search(self.PAGES_PATTERN, self.html) + if pages: + pages = int(pages.group('pages')) + else: + pages = 1 + + for p in range(2, pages + 1): + self.html = self.loadPage(p) + self.package_links += re.findall(self.LINK_PATTERN, self.html) |