wandac: extract commander

4 files changed, 82 insertions, 54 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3a87ea..fc0efe2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,8 @@ target_link_libraries("wandad"
   )
 
 add_executable("wandac"
+  "src/commander.cpp"
+  "src/commander.hpp"
   "src/wandac.cpp"
 )
 
diff --git a/src/commander.cpp b/src/commander.cpp
new file mode 100644
index 0000000..79294ac
--- /dev/null
+++ b/src/commander.cpp
@@ -0,0 +1,46 @@
+#include "commander.hpp"
+
+#include <iostream>
+
+namespace wanda
+{
+commander::commander(boost::asio::io_service &service, std::filesystem::path socket)
+    : m_endpoint{socket.string()},
+      m_socket{service}
+{
+}
+
+void commander::start()
+{
+    std::clog << "[commander::start] Starting commander on socket '" << m_endpoint.path() << "'\n";
+    m_socket.async_connect(m_endpoint, [&](auto const &error) {
+        if (error)
+        {
+            std::cerr << "[commander::start] error occured: " << error.message() << '\n';
+        }
+        else
+        {
+            std::clog << "[commander::start] Control connection established\n";
+            m_connection = wanda::make_control_connection(std::move(m_socket));
+            m_connection->start();
+            send("C:HELLO:1.0.0\n");
+            m_connection->close();
+        }
+    });
+}
+
+void commander::send(std::string message)
+{
+    if (m_connection)
+    {
+        std::clog << "[commander::send] sending message: " << message;
+        m_connection->send(std::move(message));
+    }
+}
+
+void commander::on_error(wanda::control_connection::pointer connection, boost::system::error_code error)
+{
+    std::cerr << "[commander::on_error] error occured: " << error.message() << '\n';
+}
+
+} // namespace wanda
\ No newline at end of file
diff --git a/src/commander.hpp b/src/commander.hpp
new file mode 100644
index 0000000..9842c9f
--- /dev/null
+++ b/src/commander.hpp
@@ -0,0 +1,30 @@
+#ifndef WANDA_COMMANDER_HPP
+#define WANDA_COMMANDER_HPP
+
+#include "control_connection.hpp"
+
+#include <boost/system/error_code.hpp>
+
+#include <filesystem>
+#include <string>
+
+namespace wanda
+{
+
+struct commander : wanda::control_connection::listener
+{
+  commander(boost::asio::io_service &service, std::filesystem::path socket);
+
+  void start();
+  void send(std::string message);
+
+  void on_error(wanda::control_connection::pointer connection, boost::system::error_code error) override;
+
+private:
+  wanda::control_connection::protocol::endpoint m_endpoint;
+  wanda::control_connection::protocol::socket m_socket;
+  wanda::control_connection::pointer m_connection;
+};
+
+} // namespace wanda
+#endif
\ No newline at end of file
diff --git a/src/wandac.cpp b/src/wandac.cpp
index db072ec..9835b38 100644
--- a/src/wandac.cpp
+++ b/src/wandac.cpp
@@ -1,4 +1,4 @@
-#include "control_connection.hpp"
+#include "commander.hpp"
 #include "environment.hpp"
 #include "xdg.hpp"
 
@@ -8,66 +8,16 @@
 #include <iostream>
 #include <memory>
 
-namespace
-{
-struct commander : wanda::control_connection::listener, std::enable_shared_from_this<commander>
-{
-    commander(boost::asio::io_service &service, std::filesystem::path socket)
-        : m_endpoint{socket.string()},
-          m_socket{service}
-    {
-    }
-
-    void start()
-    {
-        std::clog << "[commander::start] Starting commander on socket '" << m_endpoint.path() << "'\n";
-        m_socket.async_connect(m_endpoint, [&](auto const &error) {
-            if (error)
-            {
-                std::cerr << "[commander::start] error occured: " << error.message() << '\n';
-            }
-            else
-            {
-                std::clog << "[commander::start] Control connection established\n";
-                m_connection = wanda::make_control_connection(std::move(m_socket));
-                m_connection->start();
-                send("C:HELLO:1.0.0\n");
-                m_connection->close();
-            }
-        });
-    }
-
-    void send(std::string message)
-    {
-        if (m_connection)
-        {
-            std::clog << "[commander::send] sending message: " << message;
-            m_connection->send(std::move(message));
-        }
-    }
-
-    void on_error(wanda::control_connection::pointer connection, boost::system::error_code error) override
-    {
-        std::cerr << "[commander::on_error] error occured: " << error.message() << '\n';
-    }
-
-  private:
-    wanda::control_connection::protocol::endpoint m_endpoint;
-    wanda::control_connection::protocol::socket m_socket;
-    wanda::control_connection::pointer m_connection;
-};
-} // namespace
-
 int main()
 {
     auto environment = wanda::environment{};
     auto interface = wanda::xdg_path_for(wanda::xdg_directory::runtime_dir, environment) / ".wanda_interface";
     auto service = boost::asio::io_service{};
 
-    std::clog << "[wandac::main] Initializing commander for socket '" << interface.native() << "'\n";    
-    auto command_processor = commander{service, interface};
+    std::clog << "[wandac::main] Initializing commander for socket '" << interface.native() << "'\n";
+    auto commander = wanda::commander{service, interface};
 
-    command_processor.start();
+    commander.start();
 
     service.run();
 }
\ No newline at end of file