From 4cc24cbbce4ca12b5c55cf9b030105be4ee08415 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 21 Nov 2013 00:31:39 +0100 Subject: Crypter: EasybytezComFolder: Fixed bad url processing (result in SimpleCrypter update) --- module/plugins/crypter/EasybytezComFolder.py | 6 ++++-- module/plugins/internal/SimpleCrypter.py | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py index 56be72669..cfd52545e 100644 --- a/module/plugins/crypter/EasybytezComFolder.py +++ b/module/plugins/crypter/EasybytezComFolder.py @@ -21,12 +21,14 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter class EasybytezComFolder(SimpleCrypter): __name__ = "EasybytezComFolder" __type__ = "crypter" - __pattern__ = r"https?://(www\.)?easybytez\.com/users/\w+/\w+" - __version__ = "0.03" + __pattern__ = r"https?://(?:www\.)?easybytez\.com/users/\d+/\d+" + __version__ = "0.04" __description__ = """Easybytez Crypter Plugin""" __author_name__ = ("stickell") __author_mail__ = ("l.stickell@yahoo.it") + FILE_URL_REPLACEMENTS = [__pattern__] + LINK_PATTERN = r'' TITLE_PATTERN = r'Files of \d+: (?P<title>.+) folder' PAGES_PATTERN = r"(?P\d+)Next »
\(\d+ total\)" diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py index f0fe0b764..d0b36bb6c 100644 --- a/module/plugins/internal/SimpleCrypter.py +++ b/module/plugins/internal/SimpleCrypter.py @@ -21,11 +21,12 @@ import re from module.plugins.Crypter import Crypter from module.utils import html_unescape +from module.plugins.internal.SimpleHoster import replace_patterns class SimpleCrypter(Crypter): __name__ = "SimpleCrypter" - __version__ = "0.06" + __version__ = "0.07" __pattern__ = None __type__ = "crypter" __description__ = """Base crypter plugin""" @@ -52,7 +53,11 @@ class SimpleCrypter(Crypter): must return the html of the page number 'page_n' """ + FILE_SIZE_REPLACEMENTS = [] + def decrypt(self, pyfile): + pyfile.url = replace_patterns(pyfile.url, self.FILE_URL_REPLACEMENTS) + self.html = self.load(pyfile.url, decode=True) package_name, folder_name = self.getPackageNameAndFolder() -- cgit v1.2.3