diff options
| author |  Stefano <l.stickell@yahoo.it>
| 2013-11-25 12:25:10 +0100 |
|---|---|---|
| committer | Stefano <l.stickell@yahoo.it>
| 2013-12-15 22:10:35 +0100 |
| commit | 40b471123f3231c37f180f477a156ab487f8d8d3 (patch) | |
| tree | febd11495c76712738eb0eadb1b4e5217efa2d2e /pyload | |
| parent | updated pywebsocket (diff) | |
| download | pyload-40b471123f3231c37f180f477a156ab487f8d8d3.tar.xz | |
Merge pull request #412 from vuolter/s/crypter/EasybytezComFolder
EasybytezComFolder: Fixed bad url processing (result in SimpleCrypter update)
(cherry picked from commit f6477822031ff1c6fffa30d62461eba3e5f1db35)
Conflicts:
pyload/plugins/internal/SimpleCrypter.py
Diffstat (limited to 'pyload')
| -rw-r--r-- | pyload/plugins/crypter/EasybytezComFolder.py | 6 | ||||
| -rw-r--r-- | pyload/plugins/internal/SimpleCrypter.py | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/pyload/plugins/crypter/EasybytezComFolder.py b/pyload/plugins/crypter/EasybytezComFolder.py index 56be72669..b9cf240a0 100644 --- a/pyload/plugins/crypter/EasybytezComFolder.py +++ b/pyload/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"http://(?:www\.)?easybytez\.com/users/(?P<ID>\d+/\d+)" + __version__ = "0.04" __description__ = """Easybytez Crypter Plugin""" __author_name__ = ("stickell") __author_mail__ = ("l.stickell@yahoo.it") + FILE_URL_REPLACEMENTS = [(__pattern__, r"http://www.easybytez.com/users/\g<ID>")] + LINK_PATTERN = r'<div class="link"><a href="(http://www\.easybytez\.com/\w+)" target="_blank">.+</a></div>' TITLE_PATTERN = r'<Title>Files of \d+: (?P<title>.+) folder</Title>' PAGES_PATTERN = r"<a href='[^']+'>(?P<pages>\d+)</a><a href='[^']+'>Next »</a><br><small>\(\d+ total\)</small></div>" diff --git a/pyload/plugins/internal/SimpleCrypter.py b/pyload/plugins/internal/SimpleCrypter.py index d8132f4b3..9eb80850d 100644 --- a/pyload/plugins/internal/SimpleCrypter.py +++ b/pyload/plugins/internal/SimpleCrypter.py @@ -21,11 +21,12 @@ import re from pyload.plugins.Crypter import Crypter, Package from pyload.utils import html_unescape +from pyload.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_URL_REPLACEMENTS = [] + def decryptURL(self, url): + url = replace_patterns(url, self.FILE_URL_REPLACEMENTS) + self.html = self.load(url, decode=True) package_name = self.getPackageName() |