From 86abdafba8ee27e52682971f678844ba58e0fb77 Mon Sep 17 00:00:00 2001
From: Nicolas Jager <nicolas.jager@savoirfairelinux.com>
Date: Tue, 23 Jan 2018 14:51:27 -0500
Subject: [PATCH] Update datatransfer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- update DataTransferInfo and DataTransfer::Info with last daemon
patch.
Change-Id: Iaac20e12401480f7f11049277ee1ba108ad19c85
Reviewed-by: Anthony Léonard <anthony.leonard@savoirfairelinux.com>
---
src/api/datatransfer.h | 2 ++
src/datatransfermodel.cpp | 2 ++
src/dbus/metatypes.h | 4 ++++
src/qtwrapper/configurationmanager_wrap.h | 2 ++
src/typedefs.h | 2 ++
5 files changed, 12 insertions(+)
diff --git a/src/api/datatransfer.h b/src/api/datatransfer.h
index f9bf4b35..1de9fe7f 100644
--- a/src/api/datatransfer.h
+++ b/src/api/datatransfer.h
@@ -44,6 +44,8 @@ struct Info
std::size_t progress; ///< if status >= on_progress, gives number of bytes tx/rx until now
std::string path;
std::string displayName;
+ std::string accountId;
+ std::string peerUri;
};
} // namespace lrc::api::datatransfer
diff --git a/src/datatransfermodel.cpp b/src/datatransfermodel.cpp
index a322a456..5c48cd61 100644
--- a/src/datatransfermodel.cpp
+++ b/src/datatransfermodel.cpp
@@ -174,6 +174,8 @@ DataTransferModel::transferInfo(const std::string& lrc_id)
lrc_info.path = dring_info.displayName.toStdString();
lrc_info.displayName = dring_info.displayName.toStdString();
lrc_info.status = convertDataTransferEvent(DRing::DataTransferEventCode(dring_info.lastEvent));
+ lrc_info.accountId = dring_info.accountId.toStdString();
+ lrc_info.peerUri = dring_info.peer.toStdString();
return lrc_info;
}
diff --git a/src/dbus/metatypes.h b/src/dbus/metatypes.h
index 29df7c3d..f3f13e3f 100644
--- a/src/dbus/metatypes.h
+++ b/src/dbus/metatypes.h
@@ -73,6 +73,8 @@ static inline QDBusArgument &operator<<(QDBusArgument& argument, const DataTrans
argument << info.bytesProgress;
argument << info.displayName;
argument << info.path;
+ argument << info.accountId;
+ argument << info.peer;
argument.endStructure();
return argument;
@@ -87,6 +89,8 @@ static inline const QDBusArgument &operator>>(const QDBusArgument& argument, Dat
argument >> info.bytesProgress;
argument >> info.displayName;
argument >> info.path;
+ argument >> info.accountId;
+ argument >> info.peer;
argument.endStructure();
return argument;
diff --git a/src/qtwrapper/configurationmanager_wrap.h b/src/qtwrapper/configurationmanager_wrap.h
index 02f7fe6a..417c725f 100644
--- a/src/qtwrapper/configurationmanager_wrap.h
+++ b/src/qtwrapper/configurationmanager_wrap.h
@@ -603,6 +603,8 @@ public Q_SLOTS: // METHODS
lrc_info.bytesProgress = dring_info.bytesProgress;
lrc_info.displayName = QString::fromStdString(dring_info.displayName);
lrc_info.path = QString::fromStdString(dring_info.path);
+ lrc_info.accountId = QString::fromStdString(dring_info.accountId);
+ lrc_info.peer = QString::fromStdString(dring_info.peer);
return lrc_info;
}
diff --git a/src/typedefs.h b/src/typedefs.h
index 8dedadcd..a6e4ed4b 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -48,6 +48,8 @@ struct DataTransferInfo
qulonglong bytesProgress;
QString displayName;
QString path;
+ QString accountId;
+ QString peer;
};
/**
--
GitLab