From 106eb9578179b04dbe9278e3197391db168e6ebb Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@gmail.com>
Date: Fri, 30 Nov 2018 10:55:24 +0100
Subject: wandac: extract commander

---
 src/wandac.cpp | 58 ++++------------------------------------------------------
 1 file changed, 4 insertions(+), 54 deletions(-)

(limited to 'src/wandac.cpp')

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
-- 
cgit v1.2.3