Added ProxyBase class for SimpleDBus

OpenBluetoothToolbox · Sep 27, 2024 · 56207d7 · 56207d7
1 parent 218c38c
commit 56207d7
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 10 deletions.
diff --git a/simpledbus/CMakeLists.txt b/simpledbus/CMakeLists.txt
@@ -34,6 +34,7 @@ set(SIMPLEDBUS_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 set(SIMPLEDBUS_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/src/advanced/InterfaceBase.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/advanced/ProxyBase.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/advanced/RemoteInterface.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/advanced/RemoteProxy.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/base/Connection.cpp

diff --git a/simpledbus/include/simpledbus/advanced/ProxyBase.h b/simpledbus/include/simpledbus/advanced/ProxyBase.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <simpledbus/base/Connection.h>
+#include <string>
+#include <memory>
+
+namespace SimpleDBus {
+
+class ProxyBase : public std::enable_shared_from_this<ProxyBase> {
+  public:
+    ProxyBase(std::shared_ptr<Connection> conn, const std::string& bus_name, const std::string& path);
+    virtual ~ProxyBase();
+
+    bool valid() const;
+    std::string path() const;
+
+  protected:
+    bool _valid;
+
+    std::string _path;
+    std::string _bus_name;
+    std::shared_ptr<Connection> _conn;
+};
+
+}  // namespace SimpleDBus
diff --git a/simpledbus/include/simpledbus/advanced/RemoteProxy.h b/simpledbus/include/simpledbus/advanced/RemoteProxy.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <simpledbus/advanced/RemoteInterface.h>
+#include <simpledbus/advanced/ProxyBase.h>
 #include <simpledbus/external/kvn_safe_callback.hpp>
 #include <simpledbus/base/Path.h>
 
@@ -10,14 +11,11 @@
 
 namespace SimpleDBus {
 
-class RemoteProxy {
+class RemoteProxy : public ProxyBase {
   public:
     RemoteProxy(std::shared_ptr<Connection> conn, const std::string& bus_name, const std::string& path);
     virtual ~RemoteProxy();
 
-    bool valid() const;
-    std::string path() const;
-
     bool path_exists(const std::string& path);
     std::shared_ptr<RemoteProxy> path_get(const std::string& path);
 
@@ -91,4 +89,4 @@ class RemoteProxy {
     std::recursive_mutex _child_access_mutex;
 };
 
-}  // namespace SimpleDBus
+}  // namespace SimpleDBus
diff --git a/simpledbus/src/advanced/ProxyBase.cpp b/simpledbus/src/advanced/ProxyBase.cpp
@@ -0,0 +1,12 @@
+#include "simpledbus/advanced/ProxyBase.h"
+
+using namespace SimpleDBus;
+
+ProxyBase::ProxyBase(std::shared_ptr<Connection> conn, const std::string& bus_name, const std::string& path)
+    : _conn(conn), _bus_name(bus_name), _path(path), _valid(true) {}
+
+ProxyBase::~ProxyBase() {}
+
+bool ProxyBase::valid() const { return _valid; }
+
+std::string ProxyBase::path() const { return _path; }
diff --git a/simpledbus/src/advanced/RemoteProxy.cpp b/simpledbus/src/advanced/RemoteProxy.cpp
@@ -7,7 +7,7 @@
 using namespace SimpleDBus;
 
 RemoteProxy::RemoteProxy(std::shared_ptr<Connection> conn, const std::string& bus_name, const std::string& path)
-    : _conn(conn), _bus_name(bus_name), _path(path), _valid(true) {}
+    : ProxyBase(conn, bus_name, path) {}
 
 RemoteProxy::~RemoteProxy() {
     on_child_created.unload();
@@ -22,10 +22,6 @@ std::shared_ptr<RemoteProxy> RemoteProxy::path_create(const std::string& path) {
     return std::make_shared<RemoteProxy>(_conn, _bus_name, path);
 }
 
-bool RemoteProxy::valid() const { return _valid; }
-
-std::string RemoteProxy::path() const { return _path; }
-
 const std::map<std::string, std::shared_ptr<RemoteProxy>>& RemoteProxy::children() { return _children; }
 
 const std::map<std::string, std::shared_ptr<RemoteInterface>>& RemoteProxy::interfaces() { return _interfaces; }