debian-packages/ddbus
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Reply to introspection messages.

Browse source
This commit is contained in:
Tristan Hume 2015-05-03 20:52:55 -04:00
parent f8e389393f
commit 8771b8b2b1
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/ddbus/router.d
View file

@ -73,7 +73,7 @@ class MessageRouter {
if(pattern.iface == "org.freedesktop.DBus.Introspectable" && if(pattern.iface == "org.freedesktop.DBus.Introspectable" &&
pattern.method == "Introspect" && !pattern.signal) { pattern.method == "Introspect" && !pattern.signal) {
handleIntrospect(pattern.path, conn); handleIntrospect(pattern.path, msg, conn);
return true; return true;
} }
@ -116,9 +116,7 @@ class MessageRouter {
callTable[patt] = handleStruct; callTable[patt] = handleStruct;
} }
static string introspectHeader = ` static string introspectHeader = `<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node name="%s">`; <node name="%s">`;
string introspectXML(string path) { string introspectXML(string path) {
@ -144,10 +142,14 @@ class MessageRouter {
app.put("</interface>"); app.put("</interface>");
} }
string childPath = path ~ "/"; string childPath = path;
if(!childPath.endsWith("/")) {
childPath ~= "/";
}
auto children = callTable.byKey().filter!(a => (a.path.startsWith(childPath)) && !a.signal)() auto children = callTable.byKey().filter!(a => (a.path.startsWith(childPath)) && !a.signal)()
.map!((s) => s.path.chompPrefix(childPath)) .map!((s) => s.path.chompPrefix(childPath))
.map!((s) => s.splitter('/').front); .map!((s) => s.splitter('/').front)
.uniq();
foreach(child; children) { foreach(child; children) {
formattedWrite(app,`<node name="%s"/>`,child); formattedWrite(app,`<node name="%s"/>`,child);
} }
@ -156,8 +158,10 @@ class MessageRouter {
return app.data; return app.data;
} }
void handleIntrospect(string path, Connection conn) { void handleIntrospect(string path, Message call, Connection conn) {
// TODO auto retMsg = call.createReturn();
retMsg.build(introspectXML(path));
conn.sendBlocking(retMsg);
} }
} }
@ -196,6 +200,8 @@ unittest{
patt = MessagePattern("/root/wat","ca.thume.tester","lolwut"); patt = MessagePattern("/root/wat","ca.thume.tester","lolwut");
router.setHandler!(int,int)(patt,(int p) {return 6;}); router.setHandler!(int,int)(patt,(int p) {return 6;});
// import std.stdio; static string introspectResult = `<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
// writeln(router.introspectXML("/root")); <node name="/root"><interface name="ca.thume.test"><method name="test"><arg type="i" direction="in"/><arg type="i" direction="out"/></method></interface><interface name="ca.thume.tester"><method name="lolwut"><arg type="i" direction="in"/><arg type="s" direction="in"/></method></interface><node name="wat"/></node>`;
router.introspectXML("/root").assertEqual(introspectResult);
router.introspectXML("/").assertEndsWith(`<node name="/"><node name="root"/></node>`);
} }