diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-13 09:22:01 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-13 09:22:01 +0200 |
| commit | 2432ade6c9bd7284a5bf0d760796638eef634be9 (patch) | |
| tree | 877cfd29c6e5117a974377ead73cbbc150f6544d /pyload/plugin/hoster/MegasharesCom.py | |
| parent | Prepare hook plugins to merging from stable (diff) | |
| parent | [LolabitsEs] Cleanup (diff) | |
| download | pyload-2432ade6c9bd7284a5bf0d760796638eef634be9.tar.xz | |
Merge branch 'stable' into 0.4.10
Conflicts:
module/plugins/hooks/MultihostersComHook.py
module/plugins/hooks/PutdriveComHook.py
module/plugins/internal/CaptchaService.py
pyload/plugin/account/OboomCom.py
pyload/plugin/account/SmoozedCom.py
pyload/plugin/addon/AntiVirus.py
pyload/plugin/addon/ExternalScripts.py
pyload/plugin/addon/ExtractArchive.py
pyload/plugin/addon/RestartSlow.py
pyload/plugin/crypter/CrockoCom.py
pyload/plugin/crypter/DepositfilesCom.py
pyload/plugin/crypter/FshareVn.py
pyload/plugin/crypter/LinkdecrypterCom.py
pyload/plugin/crypter/MegaRapidCz.py
pyload/plugin/crypter/PastebinCom.py
pyload/plugin/hoster/CatShareNet.py
pyload/plugin/hoster/EdiskCz.py
pyload/plugin/hoster/ExtabitCom.py
pyload/plugin/hoster/GigapetaCom.py
pyload/plugin/hoster/GooIm.py
pyload/plugin/hoster/IfolderRu.py
pyload/plugin/hoster/LuckyShareNet.py
pyload/plugin/hoster/MegasharesCom.py
pyload/plugin/hoster/MovReelCom.py
pyload/plugin/hoster/NarodRu.py
pyload/plugin/hoster/NowDownloadSx.py
pyload/plugin/hoster/NowVideoSx.py
pyload/plugin/hoster/QuickshareCz.py
pyload/plugin/hoster/RemixshareCom.py
pyload/plugin/hoster/RgHostNet.py
pyload/plugin/hoster/SendspaceCom.py
pyload/plugin/hoster/UlozTo.py
pyload/plugin/hoster/UnibytesCom.py
pyload/plugin/hoster/UploadingCom.py
pyload/plugin/hoster/WrzucTo.py
pyload/plugin/internal/MultiHook.py
pyload/plugin/internal/SimpleHoster.py
Diffstat (limited to 'pyload/plugin/hoster/MegasharesCom.py')
| -rw-r--r-- | pyload/plugin/hoster/MegasharesCom.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pyload/plugin/hoster/MegasharesCom.py b/pyload/plugin/hoster/MegasharesCom.py index ed07f373b..f7ad28f68 100644 --- a/pyload/plugin/hoster/MegasharesCom.py +++ b/pyload/plugin/hoster/MegasharesCom.py @@ -20,17 +20,17 @@ class MegasharesCom(SimpleHoster): ("Walter Purcaro", "vuolter@gmail.com")] - NAME_PATTERN = r'<h1 class="black xxl"[^>]*title="(?P<N>[^"]+)">' + NAME_PATTERN = r'<h1 class="black xxl"[^>]*title="(?P<N>.+?)">' SIZE_PATTERN = r'<strong><span class="black">Filesize:</span></strong> (?P<S>[\d.,]+) (?P<U>[\w^_]+)' OFFLINE_PATTERN = r'<dd class="red">(Invalid Link Request|Link has been deleted|Invalid link)' - LINK_PATTERN = r'<div id="show_download_button_%d"[^>]*>\s*<a href="([^"]+)">' + LINK_PATTERN = r'<div id="show_download_button_%d".*?>\s*<a href="(.+?)">' - PASSPORT_LEFT_PATTERN = r'Your Download Passport is: <[^>]*>(\w+).*?You have.*?<[^>]*>.*?([\d.]+) (\w+)' + PASSPORT_LEFT_PATTERN = r'Your Download Passport is: <.*?>(\w+).*?You have.*?<.*?>.*?([\d.]+) (\w+)' PASSPORT_RENEW_PATTERN = r'(\d+):<strong>(\d+)</strong>:<strong>(\d+)</strong>' REACTIVATE_NUM_PATTERN = r'<input[^>]*id="random_num" value="(\d+)" />' REACTIVATE_PASSPORT_PATTERN = r'<input[^>]*id="passport_num" value="(\w+)" />' - REQUEST_URI_PATTERN = r'var request_uri = "([^"]+)";' + REQUEST_URI_PATTERN = r'var request_uri = "(.+?)";' NO_SLOTS_PATTERN = r'<dd class="red">All download slots for this link are currently filled' @@ -105,6 +105,6 @@ class MegasharesCom(SimpleHoster): if m is None: self.error(msg) - download_url = m.group(1) - self.logDebug("%s: %s" % (msg, download_url)) - self.download(download_url) + self.link = m.group(1) + self.logDebug("%s: %s" % (msg, self.link)) + |