dcc: Properly sync TransferManager

Existing transfers were not synced to the client. With this commit,
the list of transfer IDs is marked as a Q_PROPERTY and thus synced
automatically.
Also provides the necessary serialization support.

diff --git a/src/client/clienttransfermanager.cpp b/src/client/clienttransfermanager.cpp
index 81ca2de..0cc64cd 100644 (file)
--- a/src/client/clienttransfermanager.cpp
+++ b/src/client/clienttransfermanager.cpp
@@ -25,6 +25,14 @@
 
 INIT_SYNCABLE_OBJECT(ClientTransferManager)
 
+void ClientTransferManager::setTransferIds(const QList<QUuid> &transferIds)
+{
+    for(auto &&id : transferIds) {
+        onCoreTransferAdded(id);
+    }
+}
+
+
 void ClientTransferManager::onCoreTransferAdded(const QUuid &uuid)
 {
     if (uuid.isNull()) {

diff --git a/src/client/clienttransfermanager.h b/src/client/clienttransfermanager.h
index 3982062..d4af710 100644 (file)
--- a/src/client/clienttransfermanager.h
+++ b/src/client/clienttransfermanager.h
@@ -33,6 +33,7 @@ public:
     using TransferManager::TransferManager;
 
 private slots:
+    void setTransferIds(const QList<QUuid> &transferIds) override;
     void onCoreTransferAdded(const QUuid &uuid) override;
     void onTransferInitDone();
 };

diff --git a/src/common/transfermanager.cpp b/src/common/transfermanager.cpp
index 099d3d3..8564d4e 100644 (file)
--- a/src/common/transfermanager.cpp
+++ b/src/common/transfermanager.cpp
@@ -25,13 +25,24 @@
 
 INIT_SYNCABLE_OBJECT(TransferManager)
 
+TransferManager::TransferManager(QObject *parent)
+    : SyncableObject(parent)
+{
+    static auto regTypes = []() -> bool {
+        qRegisterMetaType<TransferIdList>("TransferManager::TransferIdList");
+        qRegisterMetaTypeStreamOperators<TransferIdList>("TransferManager::TransferIdList");
+        return true;
+    }();
+    Q_UNUSED(regTypes);
+}
+
 Transfer *TransferManager::transfer(const QUuid &uuid) const
 {
     return _transfers.value(uuid, nullptr);
 }
 
 
-QList<QUuid> TransferManager::transferIds() const
+TransferManager::TransferIdList TransferManager::transferIds() const
 {
     return _transfers.keys();
 }
@@ -63,3 +74,28 @@ void TransferManager::removeTransfer(const QUuid &uuid)
     auto transfer = _transfers.take(uuid);
     transfer->deleteLater();
 }
+
+
+QDataStream &operator<<(QDataStream &out, const TransferManager::TransferIdList &transferIds)
+{
+    out << static_cast<quint32>(transferIds.size());
+    for (auto &&id : transferIds) {
+        out << id;
+    }
+    return out;
+}
+
+
+QDataStream &operator>>(QDataStream &in, TransferManager::TransferIdList &transferIds)
+{
+    quint32 count;
+    in >> count;
+    transferIds.clear();
+    transferIds.reserve(count);
+    for (quint32 i = 0; i < count; ++i) {
+        QUuid id;
+        in >> id;
+        transferIds << id;
+    }
+    return in;
+}

diff --git a/src/common/transfermanager.h b/src/common/transfermanager.h
index b8dd185..2d09a1e 100644 (file)
--- a/src/common/transfermanager.h
+++ b/src/common/transfermanager.h
@@ -22,6 +22,8 @@
 
 #include "syncableobject.h"
 
+#include <QHash>
+#include <QList>
 #include <QUuid>
 
 class Transfer;
@@ -31,12 +33,16 @@ class TransferManager : public SyncableObject
     Q_OBJECT
     SYNCABLE_OBJECT
 
+    Q_PROPERTY(TransferManager::TransferIdList transferIds READ transferIds WRITE setTransferIds)
+
 public:
-    using SyncableObject::SyncableObject;
+    using TransferIdList = QList<QUuid>;
+
+    TransferManager(QObject *parent = nullptr);
     inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; }
 
     Transfer *transfer(const QUuid &uuid) const;
-    QList<QUuid> transferIds() const;
+    TransferIdList transferIds() const;
 
 signals:
     void transferAdded(const QUuid &uuid);
@@ -47,9 +53,14 @@ protected:
     void removeTransfer(const QUuid &uuid);
 
 protected slots:
+    virtual void setTransferIds(const TransferIdList &transferIds) { Q_UNUSED(transferIds) };
     virtual void onCoreTransferAdded(const QUuid &uuid) { Q_UNUSED(uuid) };
 
 private:
     QHash<QUuid, Transfer *> _transfers;
-
 };
+
+Q_DECLARE_METATYPE(TransferManager::TransferIdList)
+
+QDataStream &operator<<(QDataStream &out, const TransferManager::TransferIdList &transferIds);
+QDataStream &operator>>(QDataStream &in, TransferManager::TransferIdList &state);