Skip to content
Snippets Groups Projects
Commit 86abdafb authored by Nicolas Jager's avatar Nicolas Jager Committed by Anthony Léonard
Browse files

Update datatransfer


- update DataTransferInfo and DataTransfer::Info with last daemon
  patch.

Change-Id: Iaac20e12401480f7f11049277ee1ba108ad19c85
Reviewed-by: default avatarAnthony Léonard <anthony.leonard@savoirfairelinux.com>
parent dafecae2
No related branches found
No related tags found
No related merge requests found
...@@ -44,6 +44,8 @@ struct Info ...@@ -44,6 +44,8 @@ struct Info
std::size_t progress; ///< if status >= on_progress, gives number of bytes tx/rx until now std::size_t progress; ///< if status >= on_progress, gives number of bytes tx/rx until now
std::string path; std::string path;
std::string displayName; std::string displayName;
std::string accountId;
std::string peerUri;
}; };
} // namespace lrc::api::datatransfer } // namespace lrc::api::datatransfer
......
...@@ -174,6 +174,8 @@ DataTransferModel::transferInfo(const std::string& lrc_id) ...@@ -174,6 +174,8 @@ DataTransferModel::transferInfo(const std::string& lrc_id)
lrc_info.path = dring_info.displayName.toStdString(); lrc_info.path = dring_info.displayName.toStdString();
lrc_info.displayName = dring_info.displayName.toStdString(); lrc_info.displayName = dring_info.displayName.toStdString();
lrc_info.status = convertDataTransferEvent(DRing::DataTransferEventCode(dring_info.lastEvent)); 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; return lrc_info;
} }
......
...@@ -73,6 +73,8 @@ static inline QDBusArgument &operator<<(QDBusArgument& argument, const DataTrans ...@@ -73,6 +73,8 @@ static inline QDBusArgument &operator<<(QDBusArgument& argument, const DataTrans
argument << info.bytesProgress; argument << info.bytesProgress;
argument << info.displayName; argument << info.displayName;
argument << info.path; argument << info.path;
argument << info.accountId;
argument << info.peer;
argument.endStructure(); argument.endStructure();
return argument; return argument;
...@@ -87,6 +89,8 @@ static inline const QDBusArgument &operator>>(const QDBusArgument& argument, Dat ...@@ -87,6 +89,8 @@ static inline const QDBusArgument &operator>>(const QDBusArgument& argument, Dat
argument >> info.bytesProgress; argument >> info.bytesProgress;
argument >> info.displayName; argument >> info.displayName;
argument >> info.path; argument >> info.path;
argument >> info.accountId;
argument >> info.peer;
argument.endStructure(); argument.endStructure();
return argument; return argument;
......
...@@ -603,6 +603,8 @@ public Q_SLOTS: // METHODS ...@@ -603,6 +603,8 @@ public Q_SLOTS: // METHODS
lrc_info.bytesProgress = dring_info.bytesProgress; lrc_info.bytesProgress = dring_info.bytesProgress;
lrc_info.displayName = QString::fromStdString(dring_info.displayName); lrc_info.displayName = QString::fromStdString(dring_info.displayName);
lrc_info.path = QString::fromStdString(dring_info.path); 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; return lrc_info;
} }
......
...@@ -48,6 +48,8 @@ struct DataTransferInfo ...@@ -48,6 +48,8 @@ struct DataTransferInfo
qulonglong bytesProgress; qulonglong bytesProgress;
QString displayName; QString displayName;
QString path; QString path;
QString accountId;
QString peer;
}; };
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment