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

Added struct support to DBusAny

Browse source
This commit is contained in:
Harry T. Vennik 2017-11-04 13:01:02 +01:00
parent c015f0ce15
commit 9b408732ec
1 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
source/ddbus/thin.d
View file

@ -3,6 +3,7 @@ module ddbus.thin;
import core.time : Duration; import core.time : Duration;
import ddbus.attributes : isAllowedField;
import ddbus.c_lib; import ddbus.c_lib;
import ddbus.conv; import ddbus.conv;
import ddbus.exception : TypeMismatchException; import ddbus.exception : TypeMismatchException;
@ -301,6 +302,25 @@ struct DBusAny {
} }
} }
this.signature ~= ')';
} else static if (is(T == struct) && canDBus!T) {
this.type = 'r';
this.signature = ['('];
this.explicitVariant = false;
foreach (index, R; Fields!T) {
static if (isAllowedField!(value.tupleof[index])) {
auto var = DBusAny(value.tupleof[index]);
tuple ~= var;
if (var.explicitVariant)
this.signature ~= 'v';
else {
if (var.type != 'r')
this.signature ~= cast(char) var.type;
if (var.type == 'a' || var.type == 'r')
this.signature ~= var.signature;
}
}
}
this.signature ~= ')'; this.signature ~= ')';
} else static if (isAssociativeArray!T) { } else static if (isAssociativeArray!T) {
this(value.byDictionaryEntries); this(value.byDictionaryEntries);
@ -539,6 +559,19 @@ struct DBusAny {
foreach (i, T; ret.Types) foreach (i, T; ret.Types)
ret[i] = tuple[i].to!T; ret[i] = tuple[i].to!T;
return ret;
}
} else static if (is(T == struct) && canDBus!T) {
if (type == 'r') {
T ret;
size_t j;
foreach (i, F; Fields!T) {
static if (isAllowedField!(ret.tupleof[i])) {
ret.tupleof[i] = tuple[j++].to!F;
}
}
return ret; return ret;
} }
} else { } else {
@ -857,14 +890,16 @@ unittest {
enum testStruct = S3(variant(5), "blah", S1(-7, 63.5, "test"), S2(84, -123, enum testStruct = S3(variant(5), "blah", S1(-7, 63.5, "test"), S2(84, -123,
78, 432, &dummy), 16); 78, 432, &dummy), 16);
msg.build(testStruct);
// Non-marshaled fields should appear as freshly initialized // Non-marshaled fields should appear as freshly initialized
enum expectedResult = S3(variant(5), "blah", S1(int.init, 63.5, "test"), enum expectedResult = S3(variant(5), "blah", S1(int.init, 63.5, "test"),
S2(int.init, int.init, 78, 432, null), uint.init); S2(int.init, int.init, 78, 432, null), uint.init);
// Test struct conversion in building/reading messages
msg.build(testStruct);
msg.read!S3().assertEqual(expectedResult); msg.read!S3().assertEqual(expectedResult);
// Test struct conversion in DBusAny
DBusAny(testStruct).to!S3.assertEqual(expectedResult);
} }
Connection connectToBus(DBusBusType bus = DBusBusType.DBUS_BUS_SESSION) { Connection connectToBus(DBusBusType bus = DBusBusType.DBUS_BUS_SESSION) {