From 9b408732ec59d4a1399e1c6dfeb3c10e25d75bdb Mon Sep 17 00:00:00 2001
From: "Harry T. Vennik" <htvennik@gmail.com>
Date: Sat, 4 Nov 2017 13:01:02 +0100
Subject: [PATCH] Added struct support to DBusAny

---
 source/ddbus/thin.d | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/source/ddbus/thin.d b/source/ddbus/thin.d
index 0cc9707..64b82f2 100644
--- a/source/ddbus/thin.d
+++ b/source/ddbus/thin.d
@@ -3,6 +3,7 @@ module ddbus.thin;
 
 import core.time : Duration;
 
+import ddbus.attributes : isAllowedField;
 import ddbus.c_lib;
 import ddbus.conv;
 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 ~= ')';
     } else static if (isAssociativeArray!T) {
       this(value.byDictionaryEntries);
@@ -539,6 +559,19 @@ struct DBusAny {
           foreach (i, T; ret.Types)
             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;
         }
       } else {
@@ -857,14 +890,16 @@ unittest {
   enum testStruct = S3(variant(5), "blah", S1(-7, 63.5, "test"), S2(84, -123,
         78, 432, &dummy), 16);
 
-  msg.build(testStruct);
-
   // Non-marshaled fields should appear as freshly initialized
   enum expectedResult = S3(variant(5), "blah", S1(int.init, 63.5, "test"),
         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);
 
+  // Test struct conversion in DBusAny
+  DBusAny(testStruct).to!S3.assertEqual(expectedResult);
 }
 
 Connection connectToBus(DBusBusType bus = DBusBusType.DBUS_BUS_SESSION) {