diff options
| author |  Stefano <l.stickell@yahoo.it>
| 2013-07-20 22:03:34 +0200 |
|---|---|---|
| committer | Stefano <l.stickell@yahoo.it>
| 2013-07-20 22:03:34 +0200 |
| commit | 4aa8241528f997509282bd9c8edbc83d7096d66a (patch) | |
| tree | 45148d014c8129c8cd1f2935adf49f9725280948 /pyload/plugins/crypter | |
| parent | added missing init file (diff) | |
| parent | Using the same translatable string (diff) | |
| download | pyload-4aa8241528f997509282bd9c8edbc83d7096d66a.tar.xz | |
Merge plugins from stable
Conflicts:
module/plugins/hoster/UnrestrictLi.py
pyload/plugins/hooks/Captcha9kw.py
pyload/plugins/hoster/AlldebridCom.py
pyload/plugins/hoster/BitshareCom.py
pyload/plugins/hoster/EgoFilesCom.py
pyload/plugins/hoster/FreakshareCom.py
pyload/plugins/hoster/LuckyShareNet.py
pyload/plugins/hoster/Premium4Me.py
pyload/plugins/hoster/PremiumizeMe.py
pyload/plugins/hoster/RapidshareCom.py
pyload/plugins/hoster/RealdebridCom.py
pyload/plugins/hoster/ShareplaceCom.py
pyload/plugins/hoster/UploadedTo.py
pyload/plugins/hoster/UploadingCom.py
pyload/plugins/hoster/Xdcc.py
pyload/plugins/hoster/YourfilesTo.py
pyload/plugins/hoster/ZeveraCom.py
Diffstat (limited to 'pyload/plugins/crypter')
| -rw-r--r-- | pyload/plugins/crypter/EasybytezComFolder.py | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/pyload/plugins/crypter/EasybytezComFolder.py b/pyload/plugins/crypter/EasybytezComFolder.py index 1b887e421..83ec6472e 100644 --- a/pyload/plugins/crypter/EasybytezComFolder.py +++ b/pyload/plugins/crypter/EasybytezComFolder.py @@ -15,8 +15,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################ -import re - from module.plugins.internal.SimpleCrypter import SimpleCrypter @@ -24,37 +22,14 @@ class EasybytezComFolder(SimpleCrypter): __name__ = "EasybytezComFolder" __type__ = "crypter" __pattern__ = r"https?://(www\.)?easybytez\.com/users/\w+/\w+" - __version__ = "0.01" + __version__ = "0.02" __description__ = """Easybytez Crypter Plugin""" __author_name__ = ("stickell") __author_mail__ = ("l.stickell@yahoo.it") LINK_PATTERN = r'<div class="link"><a href="(http://www\.easybytez\.com/\w+)" target="_blank">.+</a></div>' TITLE_PATTERN = r'<Title>Files of (?P<title>.+) folder</Title>' - PAGES_PATTERN = r"<a href='[^']+'>(\d+)</a><a href='[^']+'>Next »</a><br><small>\(\d+ total\)</small></div>" - - def decrypt(self, pyfile): - self.html = self.load(pyfile.url, decode=True) - - package_name, folder_name = self.getPackageNameAndFolder() - - package_links = re.findall(self.LINK_PATTERN, self.html) - - pages = re.search(self.PAGES_PATTERN, self.html) - if pages: - pages = int(pages.group(1)) - else: - pages = 1 - - p = 2 - while p <= pages: - self.html = self.load(pyfile.url, get={'page': p}, decode=True) - package_links += re.findall(self.LINK_PATTERN, self.html) - p += 1 - - self.logDebug('Package has %d links' % len(package_links)) + PAGES_PATTERN = r"<a href='[^']+'>(?P<pages>\d+)</a><a href='[^']+'>Next »</a><br><small>\(\d+ total\)</small></div>" - if package_links: - self.packages = [(package_name, package_links, folder_name)] - else: - self.fail('Could not extract any links')
\ No newline at end of file + def loadPage(self, page_n): + return self.load(self.pyfile.url, get={'page': page_n}, decode=True) |