summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar mkaay <mkaay@mkaay.de> 2010-03-30 14:49:48 +0200
committerGravatar mkaay <mkaay@mkaay.de> 2010-03-30 14:49:48 +0200
commit993478670168d71c45582f0cba61ed6fb21bb7cb (patch)
tree63e6e24521708c879328363f26edc5ef8c720b3a
parentconfig set fix (diff)
downloadpyload-993478670168d71c45582f0cba61ed6fb21bb7cb.tar.xz
new server method (get_config)
-rw-r--r--module/XMLConfigParser.py3
-rwxr-xr-xpyLoadCore.py7
2 files changed, 8 insertions, 2 deletions
diff --git a/module/XMLConfigParser.py b/module/XMLConfigParser.py
index ea664e221..bde46afe5 100644
--- a/module/XMLConfigParser.py
+++ b/module/XMLConfigParser.py
@@ -112,6 +112,9 @@ class XMLConfigParser():
def getConfig(self):
return Config(self)
+
+ def getConfigDict(self):
+ return self.config
def set(self, section, data, value):
root = self.root
diff --git a/pyLoadCore.py b/pyLoadCore.py
index c2cf6d829..5c659e538 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -465,8 +465,11 @@ class ServerMethods():
raise Exception("not allowed!")
def get_config(self):
- pass
-
+ d = self.core.xmlconfig.getConfigDict()
+ del d["remote"]["username"]
+ del d["remote"]["password"]
+ return d
+
def pause_server(self):
self.core.thread_list.pause = True