add ready_state

chrisfsmith · Dec 2, 2016 · b9d6ee4 · b9d6ee4
1 parent 6cc4919
commit b9d6ee4
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/src/core/grabber/include/device_grabber.hpp b/src/core/grabber/include/device_grabber.hpp
@@ -339,8 +339,22 @@ class device_grabber final {
         return human_interface_device::grabbable_state::ungrabbable_permanently;
       }
     }
-    if (!event_manipulator_.is_ready()) {
-      is_grabbable_callback_log_reducer_.warn("event_manipulator_ is not ready. Please wait for a while.");
+
+    auto ready_state = event_manipulator_.is_ready();
+    if (ready_state != manipulator::event_manipulator::ready_state::ready) {
+      std::string message = "event_manipulator_ is not ready. ";
+      switch (ready_state) {
+        case manipulator::event_manipulator::ready_state::ready:
+          break;
+        case manipulator::event_manipulator::ready_state::virtual_hid_device_client_is_not_ready:
+          message += "(virtual_hid_device_client is not ready) ";
+          break;
+        case manipulator::event_manipulator::ready_state::event_dispatcher_manager_is_not_ready:
+          message += "(event_dispatcher_manager_is_not_ready is not ready) ";
+          break;
+      }
+      message += "Please wait for a while.";
+      is_grabbable_callback_log_reducer_.warn(message);
       return human_interface_device::grabbable_state::ungrabbable_temporarily;
     }
     return human_interface_device::grabbable_state::grabbable;

diff --git a/src/core/grabber/include/manipulator/event_manipulator.hpp b/src/core/grabber/include/manipulator/event_manipulator.hpp
@@ -31,9 +31,20 @@ class event_manipulator final {
   ~event_manipulator(void) {
   }
 
-  bool is_ready(void) {
-    return virtual_hid_device_client_.is_connected() &&
-           event_dispatcher_manager_.is_connected();
+  enum class ready_state {
+    ready,
+    virtual_hid_device_client_is_not_ready,
+    event_dispatcher_manager_is_not_ready,
+  };
+
+  ready_state is_ready(void) {
+    if (!virtual_hid_device_client_.is_connected()) {
+      return ready_state::virtual_hid_device_client_is_not_ready;
+    }
+    if (!event_dispatcher_manager_.is_connected()) {
+      return ready_state::event_dispatcher_manager_is_not_ready;
+    }
+    return ready_state::ready;
   }
 
   void reset(void) {