From 3c85d66783b0f03a36d36356ecdebf17754f75ec Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 29 Dec 2010 22:22:50 +0100 Subject: MU free fixed --- module/plugins/PluginManager.py | 18 ++++-------------- module/plugins/accounts/MegauploadCom.py | 2 +- 2 files changed, 5 insertions(+), 15 deletions(-) (limited to 'module/plugins') diff --git a/module/plugins/PluginManager.py b/module/plugins/PluginManager.py index 52712f160..10604dc9b 100644 --- a/module/plugins/PluginManager.py +++ b/module/plugins/PluginManager.py @@ -36,9 +36,7 @@ try: except ImportError: # python 2.5 from module.SafeEval import safe_eval as literal_eval - -IGNORE = ["FreakshareNet", "SpeedManager"] -#ignore this plugins in homefolder, add deleted plugins here +from module.ConfigParser import IGNORE class PluginManager(): def __init__(self, core): @@ -53,17 +51,9 @@ class PluginManager(): self.captchaPlugins = {} self.accountPlugins = {} self.hookPlugins = {} - - self.createHomeDirs() - + self.createIndex() - - #@TODO plugin updater - #---------------------------------------------------------------------- - def createHomeDirs(self): - """create homedirectories containing plugins""" - #@TODO implement... - pass + def createIndex(self): """create information for all plugins available""" @@ -170,7 +160,7 @@ class PluginManager(): try: plugins[name]["re"] = re.compile(pattern) except: - self.log.error(_("%s has invalid pattern.") % name) + self.log.error(_("%s has a invalid pattern.") % name) config = self.reConfig.findall(content) diff --git a/module/plugins/accounts/MegauploadCom.py b/module/plugins/accounts/MegauploadCom.py index 3432c299a..2f33e791b 100644 --- a/module/plugins/accounts/MegauploadCom.py +++ b/module/plugins/accounts/MegauploadCom.py @@ -33,7 +33,7 @@ class MegauploadCom(Account): def loadAccountInfo(self, user, req): page = req.load("http://www.megaupload.com/?c=account") - free = re.findall(r"Account type:\s*Regular",page,re.IGNORECASE+re.MULTILINE) + free = re.findall(r"Account type:\s*\s*
\s*Regular",page,re.IGNORECASE+re.MULTILINE) if free: return {"validuntil": -1, "trafficleft":-1, "premium": False} -- cgit v1.2.3