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

 type::StringList autocomplete_list;
 char* buffer = NULL;
 bool waiting_for_autocomplete = false;
 boost::condition on_message_condition;
 boost::mutex guard_mutex;
+std::string prompt;
+int prompt_id = -1;
 class ConsoleClient : public net::Subscriber
+{
 public:
     typedef boost::shared_ptr<ConsoleClient> Pointer;
     ConsoleClient(std::string address, unsigned int port)
+    {
+        this->identifier_ = address + ":" + boost::lexical_cast<std::string>(port);
         this->client_id_ = net::Manager::Instance()->Connect(net::PROTOCOL_TCP, address, port);
+    }
     virtual ~ConsoleClient()
+    {
+    }
     bool IsConnected()
+    {
         return this->client_id_ != 0;
+    }
+    std::string GetIdentifier()
+    {
+        return this->identifier_;
+    }
 private:
     net::ClientId client_id_;
+    std::string identifier_;
     void SlotOnNewStateHandler(net::ClientId client_id, net::ServerId server_id, net::ClientState client_state)
+    {
         if (client_state == net::CLIENT_STATE_CONNECTED)
+        {
+        }
+    }
     void SlotOnNewDataHandler(net::ClientId client_id, net::ServerId server_id, type::Byteset data)
+    {
+        prompt_id = -1;
         std::string s(data.ToCharString());
         if (waiting_for_autocomplete)
+        {
             autocomplete_list.clear();
             boost::algorithm::trim_if(s, boost::is_any_of("\n"));
             boost::algorithm::trim_if(s, boost::is_any_of(" "));
             if (s != "")
             {
                 boost::algorithm::split(autocomplete_list, s, boost::is_any_of("\n"), boost::algorithm::token_compress_on);
             }
         }
         else
         {
-            if (s[s.length()-1] != '\n')
+            type::StringList lines;
+            boost::algorithm::split(lines, s, boost::is_any_of("\n"), boost::algorithm::token_compress_on);
+            for (unsigned int n = 0; n < lines.size(); n++)
             {
+                type::StringList parts;
+                boost::algorithm::split(parts, lines[n], boost::is_any_of(";"), boost::algorithm::token_compress_off);
+                if (parts[0].length() == 1 && parts[0] == "P")
+                {
+                    prompt_id = boost::lexical_cast<unsigned int>(parts[1]);
+                    prompt = "";
+                    for (unsigned int c = 2; c < parts.size(); c++)
+                    {
+                        prompt += parts[c] + " ";
-                s += "\n";
+                    }
-            }
+                }
+                else
+                {
+                    boost::algorithm::trim_if(lines[n], boost::is_any_of(" "));
+                    if (lines[n] != "")
+                    {
-            printf("%s", s.data());
+                        printf("%s\n", lines[n].data());
+                    }
+                }
+            }
         }
         on_message_condition.notify_all();
     }
 };
 ConsoleClient::Pointer cc;
 struct termios original_flags;
 std::string history_filename;
     signal(SIGINT, Handler);
     signal(SIGQUIT, Handler);
     signal(SIGABRT, Handler);
     signal(SIGPIPE, Handler);
     tcgetattr(fileno(stdin), &original_flags);
     printf("Atom Interactive Console, version 1.5.0 starting...\n");
     printf("Written by Mattias Runge 2010.\n");
     printf("Released under GPL version 2.\n");
     net::Manager::Create();
     std::string address = "localhost";
     unsigned int port = 1202;
     printf("Connecting to %s:%d...", address.data(), port);
     try
     {
         cc = ConsoleClient::Pointer(new ConsoleClient(address, port));
     }
     catch (std::runtime_error& e)
+    {
         printf("%s\n", e.what());
         CleanUp();
         return EXIT_FAILURE;
     }
     printf("success!\n");
-    std::string prompt = address + ":" + boost::lexical_cast<std::string>(port) + "] ";
-    passwd* user_struct = getpwuid(getuid());
+    prompt = cc->GetIdentifier() + "] ";
-    history_filename = std::string(user_struct->pw_dir) + "/.atomic_history";
+    passwd* user_struct = getpwuid(getuid());
+    history_filename = std::string(user_struct->pw_dir) + "/.atomic_history";
     read_history(history_filename.data());
     rl_attempted_completion_function = AutoComplete;
     while ((buffer = readline(prompt.data())) != NULL)
+    {
         if (strlen(buffer) == 0)
+        {
             continue;
         }
         if (strcmp(buffer, "quit") == 0)
+        {
             break;
         }
         waiting_for_autocomplete = false;
+        prompt = cc->GetIdentifier() + "] ";
+        if (prompt_id == -1)
+        {
-        cc->Send("E;" + std::string(buffer));
+            cc->Send("E;" + std::string(buffer));
+            add_history(buffer);
+        }
+        else
+        {
+            cc->Send("R;" + boost::lexical_cast<std::string>(prompt_id) + ";" + std::string(buffer));
+            prompt_id = -1;
+        }
         boost::mutex::scoped_lock guard(guard_mutex);
         on_message_condition.wait(guard);
-        add_history(buffer);
+    }
     CleanUp();
     return EXIT_SUCCESS;

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom1.5/src/atomic.cpp @ 1663 – Rev 1609 → 1620