diff options
author | spoob <spoob@gmx.de> | 2010-09-13 22:22:53 +0200 |
---|---|---|
committer | spoob <spoob@gmx.de> | 2010-09-13 22:22:53 +0200 |
commit | 54fd4f87c48820742d2ad963d43c4f84e0de2eb8 (patch) | |
tree | a1be9e41fb5e897737d7705eab36ea03202b499f | |
parent | new package ui for webif (diff) | |
download | pyload-54fd4f87c48820742d2ad963d43c4f84e0de2eb8.tar.xz |
better rs server select
-rw-r--r-- | module/PluginManager.py | 6 | ||||
-rw-r--r-- | module/plugins/hoster/RapidshareCom.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/module/PluginManager.py b/module/PluginManager.py index 29c01ce21..ae516e0ec 100644 --- a/module/PluginManager.py +++ b/module/PluginManager.py @@ -165,12 +165,14 @@ class PluginManager(): config = self.reConfig.findall(content) if config: - config = [ [y.strip() for y in x.replace("'","").replace('"',"").replace(")","").split(",")] for x in config[0].split("(") if x.strip()] - + print config + config = [ [y.strip() for y in x.replace("'","").replace('"',"").replace("\") ","").split(",")] for x in config[0].split(" (\"") if x.strip()] + print config if folder == "hooks": config.append( ["load", "bool", "Load on startup", True if name not in ("XMPPInterface", "MultiHome") else False] ) for item in config: + #~ print item self.core.config.addPluginConfig([name]+item) if not home: diff --git a/module/plugins/hoster/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py index cf8bc9069..3d40ba9d5 100644 --- a/module/plugins/hoster/RapidshareCom.py +++ b/module/plugins/hoster/RapidshareCom.py @@ -40,7 +40,7 @@ class RapidshareCom(Hoster): __pattern__ = r"http://[\w\.]*?rapidshare.com/files/(\d*?)/(.*)" __version__ = "1.1" __description__ = """Rapidshare.com Download Hoster""" - __config__ = [ ("server", "str", "Preferred Server", "None") ] + __config__ = [["server", "Cogent;Deutsche Telekom;Level(3);Level(3) #2;GlobalCrossing;Level(3) #3;Teleglobe;GlobalCrossing #2;TeliaSonera #2;Teleglobe #2;TeliaSonera #3;TeliaSonera", "Preferred Server", "None"]] __author_name__ = ("spoob", "RaNaN", "mkaay") __author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "mkaay@mkaay.de") |