WebSVN – HomeAutomation – Diff – /trunk/PcSoftware/Atom1.5/src/atomic.cpp/

     void SlotOnNewStateHandler(net::ClientId client_id, net::ServerId server_id, net::ClientState client_state)
+    {
         if (client_state != net::CLIENT_STATE_CONNECTED)
+        {
-            std::cout << "Disconnected from server" << std::endl;
+            std::cout << "Disconnected from server." << std::endl;
             this->client_id_ = 0;
             finish = true;
-            kill(getpid(), SIGTERM);
+            on_message_condition.notify_all();
+        }
+    }
     void SlotOnNewDataHandler(net::ClientId client_id, net::ServerId server_id, common::Byteset data)
+    {
     boost::program_options::options_description command_line;
     boost::program_options::variables_map variable_map;
     command_line.add_options()
     ("help,h",    "produce help message")
+    ("command,c", boost::program_options::value<std::string>()->default_value(""), "command")
     ("server,s",  boost::program_options::value<std::string>()->default_value("localhost"), "server address")
     ("port,p",    boost::program_options::value<unsigned int>()->default_value(1202), "server port");
     try
+    {
         std::cout << command_line << std::endl;
         CleanUp();
         return EXIT_SUCCESS;
+    }
+    net::Manager::Create();
+    if (variable_map["command"].as<std::string>() == "")
+    {
-    std::cout << "\033[29;1mAtom Interactive Console, version " + std::string(VERSION) + " starting...\033[0m" << std::endl;
+        std::cout << "\033[29;1mAtom Interactive Console, version " + std::string(VERSION) + " starting...\033[0m" << std::endl;
-    std::cout << "\033[29;1mReleased under GPL version 2.\033[0m" << std::endl;
+        std::cout << "\033[29;1mReleased under GPL version 2.\033[0m" << std::endl;
-    std::cout << "Written by Mattias Runge 2010." << std::endl;
+        std::cout << "Written by Mattias Runge 2010." << std::endl;
-    net::Manager::Create();
-    std::cout << "Connecting to " << variable_map["server"].as<std::string>().data() << ":" << variable_map["port"].as<unsigned int>() << "..." << std::endl;
+        std::cout << "Connecting to " << variable_map["server"].as<std::string>().data() << ":" << variable_map["port"].as<unsigned int>() << "..." << std::endl;
+    }
     try
+    {
         cc = ConsoleClient::Pointer(new ConsoleClient(variable_map["server"].as<std::string>(), variable_map["port"].as<unsigned int>()));
+    }
     catch (std::runtime_error& e)
     {
-        std::cout << "error!" << std::endl;
-        std::cerr << e.what() << std::endl;
+        std::cerr << "Connection error: " << e.what() << std::endl;
         CleanUp();
         return EXIT_FAILURE;
     }
-    while (true)
+    if (variable_map["command"].as<std::string>() != "")
+    {
         boost::mutex::scoped_lock guard(guard_mutex);
         on_message_condition.wait(guard);
-        if (finish)
+        if (!finish)
-        {
-            break;
-        }
-        while ((buffer = readline(cc->GetPrompt().data())) != NULL)
+        {
+            cc->SendResponse(variable_map["command"].as<std::string>());
-            if (strlen(buffer) == 0)
+            if (!finish)
+            {
+                on_message_condition.wait(guard);
+            }
+        }
+    }
+    else
+    {
+        while (true)
+        {
+            boost::mutex::scoped_lock guard(guard_mutex);
+            on_message_condition.wait(guard);
+            if (finish)
+            {
+                break;
+            }
+            while ((buffer = readline(cc->GetPrompt().data())) != NULL)
+            {
+                if (strlen(buffer) == 0)
+                {
-                continue;
+                    continue;
+                }
+                break;
+            }
+            cc->SendResponse(buffer);
-            break;
+            add_history(buffer);
+        }
-        cc->SendResponse(buffer);
-        add_history(buffer);
+    }
     CleanUp();
     return EXIT_SUCCESS;
     return NULL;
+}
 void CleanUp()
+{
+    std::cout << std::endl;
-    std::cout << "Cleaning up..." << std::endl;
+    //std::cout << "Cleaning up..." << std::endl;
     write_history(history_filename.data());
     cc.reset();
     if (buffer != NULL)
+    {
         free(buffer);
+    }
-    std::cout << "Thank you for using Atom. Goodbye!" << std::endl;
+    //std::cout << "Thank you for using Atom. Goodbye!" << std::endl;
     tcsetattr(fileno(stdin), TCSANOW, &original_flags); // Restore
+}
 void Handler(int status)

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom1.5/src/atomic.cpp/ – Rev 1657 → 1664