From 618388689e9dc7199acedfa7afb67a3f157973fd Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Wed, 10 Jan 2018 11:30:38 -0500
Subject: [PATCH] datatransfer: more D-Bus API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Expose more data transfer API to D-Bus binding:
* acceptFileTransfer
* cancelDataTransfer
Change-Id: Ida42caf775d1a411ac640276140ac6d69b6eebc7
Reviewed-by: Anthony Léonard <anthony.leonard@savoirfairelinux.com>
---
bin/dbus/cx.ring.Ring.ConfigurationManager.xml | 16 ++++++++++++++++
bin/dbus/dbusconfigurationmanager.cpp | 16 ++++++++++++++--
bin/dbus/dbusconfigurationmanager.h | 2 ++
3 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
index ee2525cfe5..b4f1d3b9fa 100644
--- a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
+++ b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
@@ -1434,6 +1434,22 @@
</arg>
</method>
+ <method name="acceptFileTransfer" tp:name-for-bindings="acceptFileTransfer">
+ <tp:added version="4.2.0"/>
+ <arg type="t" name="DataTransferId" direction="in">
+ </arg>
+ <arg type="s" name="file_path" direction="in">
+ </arg>
+ <arg type="t" name="offset" direction="in">
+ </arg>
+ </method>
+
+ <method name="cancelDataTransfer" tp:name-for-bindings="cancelDataTransfer">
+ <tp:added version="4.2.0"/>
+ <arg type="t" name="DataTransferId" direction="in">
+ </arg>
+ </method>
+
<signal name="mediaParametersChanged" tp:name-for-bindings="mediaParametersChanged">
<tp:added version="2.3.0"/>
<tp:docstring>
diff --git a/bin/dbus/dbusconfigurationmanager.cpp b/bin/dbus/dbusconfigurationmanager.cpp
index 8a632d8168..2c4c36fce7 100644
--- a/bin/dbus/dbusconfigurationmanager.cpp
+++ b/bin/dbus/dbusconfigurationmanager.cpp
@@ -638,11 +638,23 @@ DBusConfigurationManager::dataTransferInfo(const DRing::DataTransferId& id)
uint64_t
DBusConfigurationManager::dataTransferBytesSent(const uint64_t& id)
{
- return DRing::dataTransferBytesSent(id);;
+ return DRing::dataTransferBytesSent(id);
}
auto
DBusConfigurationManager::dataTransferList() -> decltype(DRing::dataTransferList())
{
- return DRing::dataTransferList();;
+ return DRing::dataTransferList();
+}
+
+void
+DBusConfigurationManager::acceptFileTransfer(const uint64_t& id, const std::string& file_path, const uint64_t& offset)
+{
+ DRing::acceptFileTransfer(id, file_path, offset);
+}
+
+void
+DBusConfigurationManager::cancelDataTransfer(const uint64_t& id)
+{
+ DRing::cancelDataTransfer(id);
}
diff --git a/bin/dbus/dbusconfigurationmanager.h b/bin/dbus/dbusconfigurationmanager.h
index 5e86a48ef3..a14fba54c6 100644
--- a/bin/dbus/dbusconfigurationmanager.h
+++ b/bin/dbus/dbusconfigurationmanager.h
@@ -158,6 +158,8 @@ class DBusConfigurationManager :
DBus::Struct<bool, uint32_t, uint64_t, uint64_t, std::string, std::string> dataTransferInfo(const DRing::DataTransferId& id);
uint64_t dataTransferBytesSent(const uint64_t& id);
std::vector<uint64_t> dataTransferList();
+ void acceptFileTransfer(const uint64_t& id, const std::string& file_path, const uint64_t& offset);
+ void cancelDataTransfer(const uint64_t& id);
};
#endif // __RING_DBUSCONFIGURATIONMANAGER_H__
--
GitLab