diff options
Diffstat (limited to 'Plugins')
| -rw-r--r-- | Plugins/MegauploadCom.py | 10 | ||||
| -rw-r--r-- | Plugins/Plugin.py | 1 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Plugins/MegauploadCom.py b/Plugins/MegauploadCom.py index 63f033945..bcafec83f 100644 --- a/Plugins/MegauploadCom.py +++ b/Plugins/MegauploadCom.py @@ -60,8 +60,8 @@ class MegauploadCom(Plugin): if self.html[0] == None: self.download_html() if not self.want_reconnect: - file_name_pattern = '<font style="font-family:arial; color:#FF6700; font-size:22px; font-weight:bold;">(.*)</font><br>' - return re.search(file_name_pattern, self.html[0]).group(1) + file_name_pattern = 'id="downloadlink"><a href="(.*)" onclick="' + return re.search(file_name_pattern, self.html[1]).group(1).split("/")[-1] else: return self.parent.url @@ -70,10 +70,8 @@ class MegauploadCom(Plugin): """ if self.html[0] == None: self.download_html() - if re.search(r"Unfortunately, the link you have clicked is not available.", self.html[0]) != None: + if re.search(r"Unfortunately, the link you have clicked is not available.", self.html[0]) != None or \ + re.search(r"Download limit exceeded", self.html[0]): return False else: return True - - def proceed(self, url, location): - self.req.download(url, location, cookies=True) diff --git a/Plugins/Plugin.py b/Plugins/Plugin.py index 5d7fc8f45..0ff11ecb5 100644 --- a/Plugins/Plugin.py +++ b/Plugins/Plugin.py @@ -62,7 +62,6 @@ class Plugin(): pyfile.status.url = self.get_file_url() pyfile.status.want_reconnect = self.want_reconnect - thread.wait(self.parent) return True |