Support for QByteArrayList

2 files changed, 47 insertions, 1 deletions

diff --git a/common/propertymapper.cpp b/common/propertymapper.cpp
index ebe5cb3..130ba0b 100644
--- a/common/propertymapper.cpp
+++ b/common/propertymapper.cpp
@@ -48,6 +48,21 @@ flatbuffers::uoffset_t variantToProperty<QDateTime>(const QVariant &property, fl
 }
 
 template <>
+flatbuffers::uoffset_t variantToProperty<QByteArrayList>(const QVariant &property, flatbuffers::FlatBufferBuilder &fbb)
+{
+    if (property.isValid()) {
+        const auto list = property.value<QByteArrayList>();
+        std::vector<flatbuffers::Offset<flatbuffers::String>> vector;
+        for (const auto value : list) {
+            auto offset = fbb.CreateString(value.toStdString());
+            vector.push_back(offset);
+        }
+        return fbb.CreateVector(vector).o;
+    }
+    return 0;
+}
+
+template <>
 QVariant propertyToVariant<QString>(const flatbuffers::String *property)
 {
     if (property) {
@@ -78,6 +93,21 @@ QVariant propertyToVariant<QByteArray>(const flatbuffers::Vector<uint8_t> *prope
 }
 
 template <>
+QVariant propertyToVariant<QByteArrayList>(const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *property)
+{
+    if (property) {
+        QByteArrayList list;
+        for (auto it = property->begin(); it != property->end();) {
+            // We have to copy the memory, otherwise it would become eventually invalid
+            list << QString::fromStdString((*it)->c_str()).toUtf8();
+            it.operator++();
+        }
+        return QVariant::fromValue(list);
+    }
+    return QVariant();
+}
+
+template <>
 QVariant propertyToVariant<bool>(uint8_t property)
 {
     return static_cast<bool>(property);
diff --git a/common/propertymapper.h b/common/propertymapper.h
index cf8ce7b..edbc7f1 100644
--- a/common/propertymapper.h
+++ b/common/propertymapper.h
@@ -40,7 +40,8 @@ template <typename T>
 QVariant SINK_EXPORT propertyToVariant(uint8_t);
 template <typename T>
 QVariant SINK_EXPORT propertyToVariant(const flatbuffers::Vector<uint8_t> *);
-
+template <typename T>
+QVariant SINK_EXPORT propertyToVariant(const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *);
 
 /**
  * The property mapper is a non-typesafe virtual dispatch.
@@ -100,6 +101,12 @@ public:
         addMapping(name, [f](Buffer const *buffer) -> QVariant { return propertyToVariant<T>((buffer->*f)()); });
     }
 
+    template <typename T, typename Buffer>
+    void addMapping(const QByteArray &name, const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *(Buffer::*f)() const)
+    {
+        addMapping(name, [f](Buffer const *buffer) -> QVariant { return propertyToVariant<T>((buffer->*f)()); });
+    }
+
 private:
     QHash<QByteArray, std::function<QVariant(BufferType const *)>> mReadAccessors;
 };
@@ -160,6 +167,15 @@ public:
         });
     }
 
+    template <typename T>
+    void addMapping(const QByteArray &name, void (BufferBuilder::*f)(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>>))
+    {
+        addMapping(name, [f](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
+            auto offset = variantToProperty<T>(value, fbb);
+            return [offset, f](BufferBuilder &builder) { (builder.*f)(offset); };
+        });
+    }
+
 private:
     QHash<QByteArray, std::function<std::function<void(BufferBuilder &)>(const QVariant &, flatbuffers::FlatBufferBuilder &)>> mWriteAccessors;
 };