Teile vom CommandParser als CommandManager abgespalten

1 files changed, 7 insertions, 33 deletions

diff --git a/src/Client/CommandParser.h b/src/Client/CommandParser.h
index 9b94ef0..86be22f 100644
--- a/src/Client/CommandParser.h
+++ b/src/Client/CommandParser.h
@@ -20,6 +20,7 @@
 #ifndef MAD_CLIENT_COMMANDPARSER_H_
 #define MAD_CLIENT_COMMANDPARSER_H_
 
+#include "CommandManager.h"
 #include <Common/Request.h>
 
 #include <string>
@@ -27,18 +28,8 @@
 
 namespace Mad {
 
-namespace Common {
-class Exception;
-}
-
 namespace Net {
 class Connection;
-
-namespace Packets {
-class HostStatusPacket;
-class HostListPacket;
-}
-
 }
 
 namespace Client {
@@ -56,20 +47,15 @@ class CommandParser {
 
     static const Command commands[];
 
-    sigc::signal<void> finished;
+    CommandManager commandManager;
 
     Net::Connection *connection;
 
-    unsigned int activeRequests;
-    bool disconnect;
-
     bool split(const std::string &str, std::vector<std::string> &ret);
 
     const Command* findCommand(const std::string& command);
     void printUsage(const std::string& command);
 
-    void printHostStatus(const Net::Packets::HostStatusPacket &packet);
-
     void helpCommand(const std::vector<std::string> &args);
     void listHostsCommand(const std::vector<std::string> &args);
     void rebootCommand(const std::vector<std::string> &args);
@@ -77,31 +63,19 @@ class CommandParser {
     void statusCommand(const std::vector<std::string> &args);
     void exitCommand(const std::vector<std::string>&);
 
-    void coreStatusRequestFinished(const Common::Request<Net::Packets::HostStatusPacket> &request);
-    void daemonCommandRequestFinished(const Common::Request<> &request);
-    void daemonListRequestFinished(const Common::Request<Net::Packets::HostListPacket> &request, bool all);
-    void daemonStatusRequestFinished(const Common::Request<Net::Packets::HostStatusPacket> &request);
-    void disconnectRequestFinished(const Common::Request<> &request);
-
-    void requestFinished() {
-      activeRequests--;
-
-      finished();
-    }
-
   public:
-    CommandParser(Net::Connection *connection0) : connection(connection0), activeRequests(0), disconnect(false) {}
+    CommandParser(Net::Connection *connection0) : connection(connection0) {}
+
+    bool requestsActive() {return commandManager.requestsActive();}
+    bool willDisconnect() {return commandManager.willDisconnect();}
 
-    bool requestsActive() {return (activeRequests > 0);}
-    bool willDisconnect() {return disconnect;}
+    sigc::signal<void> signalFinished() const {return commandManager.signalFinished();}
 
     bool parse(const std::string &cmd);
 
     void requestDisconnect() {
       exitCommand(std::vector<std::string>());
     }
-
-    sigc::signal<void> signalFinished() const {return finished;}
 };
 
 }