diff options
| author |  zoidberg10 <zoidberg@mujmail.cz>
| 2011-11-22 00:26:08 +0100 |
|---|---|---|
| committer | zoidberg10 <zoidberg@mujmail.cz>
| 2011-11-22 00:26:08 +0100 |
| commit | 9378237ddc39f8ee96e7a3ddb9cc37ce487c5f4d (patch) | |
| tree | 325aba4194c29ee7869f662e1b8f8b5015afd283 /module/plugins/hoster/MegasharesCom.py | |
| parent | SimpleHoster fix (diff) | |
| download | pyload-9378237ddc39f8ee96e7a3ddb9cc37ce487c5f4d.tar.xz | |
fix filepost (#431), hellspy, ifolder, letitbit, change SimpleHoster patterns
Diffstat (limited to 'module/plugins/hoster/MegasharesCom.py')
| -rw-r--r-- | module/plugins/hoster/MegasharesCom.py | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/module/plugins/hoster/MegasharesCom.py b/module/plugins/hoster/MegasharesCom.py index 3c17eb979..a1dd6e694 100644 --- a/module/plugins/hoster/MegasharesCom.py +++ b/module/plugins/hoster/MegasharesCom.py @@ -18,29 +18,20 @@ import re from time import time -from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo +from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo from module.network.RequestFactory import getURL -def getInfo(urls): - result = [] - - for url in urls: - file_info = parseFileInfo(MegasharesCom, url, getURL(url, decode=True)) - result.append(file_info) - - yield result - class MegasharesCom(SimpleHoster): __name__ = "MegasharesCom" __type__ = "hoster" __pattern__ = r"http://(\w+\.)?megashares.com/.*" - __version__ = "0.12" + __version__ = "0.13" __description__ = """megashares.com plugin - free only""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") - FILE_NAME_PATTERN = '<h1 class="black xxl"[^>]*title="([^"]+)">' - FILE_SIZE_PATTERN = '<strong><span class="black">Filesize:</span></strong> ([0-9.]+) (KB|MB|GB)<br />' + FILE_NAME_PATTERN = '<h1 class="black xxl"[^>]*title="(?P<N>[^"]+)">' + FILE_SIZE_PATTERN = '<strong><span class="black">Filesize:</span></strong> (?P<S>[0-9.]+) (?P<U>[kKMG])i?B<br />' DOWNLOAD_URL_PATTERN = '<div id="show_download_button_2" style="display:none">\s*<a href="([^"]+)">' PASSPORT_LEFT_PATTERN = 'Your Download Passport is: <[^>]*>(\w+).*\s*You have\s*<[^>]*>\s*([0-9.]+) ([kKMG]i?B)' PASSPORT_RENEW_PATTERN = 'Your download passport will renew in\s*<strong>(\d+)</strong>:<strong>(\d+)</strong>:<strong>(\d+)</strong>' @@ -104,4 +95,6 @@ class MegasharesCom(SimpleHoster): # Download self.logDebug("Download URL: %s" % download_url) - self.download(download_url)
\ No newline at end of file + self.download(download_url) + +getInfo = create_getInfo(MegasharesCom)
\ No newline at end of file |