From d01a3b44f60e3b8defe362dddf77ffa668ff56e8 Mon Sep 17 00:00:00 2001
From: Jing Hua <tohjinghua123@gmail.com>
Date: Wed, 25 Oct 2023 18:26:13 +0800
Subject: [PATCH] add more actions

---
 controller.py | 30 +++++++++++++++++++++++++++---
 main.py       |  9 +++++++--
 simulator.py  | 27 ++++++++++++++++++++++-----
 3 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/controller.py b/controller.py
index cba66d0..7491da7 100644
--- a/controller.py
+++ b/controller.py
@@ -1,7 +1,19 @@
+from enum import Enum
+
 import numpy as np
 from PIL import Image
 
-from simulator import EmulatorSimulator
+from simulator import EmulatorSimulator, MouseClick
+
+
+class Action(Enum):
+    CLICK = "click"
+    MOUSE_DOWN = "mousedown"
+    MOUSE_UP = "mouseup"
+    MOUSE_MOVE = "mousemove"
+    KEY = "key"
+    TYPE = "type"
+
 
 class Controller:
     def __init__(self, vm_name: str, username: str, password: str, host: str) -> None:
@@ -13,5 +25,17 @@ class Controller:
         with Image.open(image_path) as img:
             return np.array(img)
     
-    def step(self) -> None:
-        self.simulator.keyboard_type("hello word")
\ No newline at end of file
+    def step(self, action: Action, **action_args) -> None:
+        if action == Action.CLICK:
+            print(action_args)
+            self.simulator.click(**action_args)
+        elif action == Action.MOUSE_DOWN:
+            self.simulator.mousedown(**action_args)
+        elif action == Action.MOUSE_UP:
+            self.simulator.mouseup(**action_args)
+        elif action == Action.MOUSE_MOVE:
+            self.simulator.mouse_move(**action_args)
+        elif action == Action.KEY:
+            self.simulator.key(**action_args)
+        elif action == Action.TYPE:
+            self.simulator.type(**action_args)
\ No newline at end of file
diff --git a/main.py b/main.py
index 7612dd1..8209884 100644
--- a/main.py
+++ b/main.py
@@ -1,4 +1,4 @@
-from controller import Controller
+from controller import Controller, Action, MouseClick
 
 controller = Controller(vm_name="KUbuntu-23.10", username="username", password="password", host="192.168.56.101")
 
@@ -6,4 +6,9 @@ input("enter to continue")
 img = controller.get_state()
 print(img)
 input("enter to continue")
-controller.step()
\ No newline at end of file
+controller.step(action=Action.MOUSE_MOVE, x=100, y=100)
+input("enter to continue")
+controller.step(action=Action.CLICK, click=MouseClick.LEFT)
+input("enter to continue")
+controller.step(action=Action.TYPE, text="hello world")
+
diff --git a/simulator.py b/simulator.py
index 896f9bd..30a4586 100644
--- a/simulator.py
+++ b/simulator.py
@@ -1,6 +1,17 @@
+from enum import Enum
+
 import subprocess
 from fabric import Connection
 
+
+class MouseClick(Enum):
+    LEFT = 1
+    MIDDLE = 2
+    RIGHT = 3
+    WHEEL_UP = 4
+    WHEEL_DOWN = 5
+
+
 class EmulatorSimulator:
     def __init__(self, vm_name: str, username: str, password: str, host:str, snapshot_name: str = "snapshot"):
         self.vm_name = vm_name
@@ -34,16 +45,22 @@ class EmulatorSimulator:
     def save_state(self) -> None:
         self._execute_command(["VBoxManage", "snapshot", self.vm_name, "take", self.snapshot_name])
 
-    def send_click(self, click: int) -> None:
-        self._execute_xdotool_command(f"click {click}")
+    def click(self, click: MouseClick) -> None:
+        self._execute_xdotool_command(f"click {click.value}")
 
-    def send_key(self) -> None:
-        pass
+    def mousedown(self, click: MouseClick) -> None:
+        self._execute_xdotool_command(f"mousedown {click}")
+    
+    def mouseup(self, click: MouseClick) -> None:
+        self._execute_xdotool_command(f"mouseup {click}")
 
     def mouse_move(self, x: int, y: int) -> None:
         self._execute_xdotool_command(f"mousemove {x} {y}")
 
-    def keyboard_type(self, text: str) -> None:
+    def key(self, key: str) -> None:
+        self._execute_xdotool_command(f"key {key}")
+
+    def type(self, text: str) -> None:
         self._execute_xdotool_command(f"type {text}")
 
     def get_screenshot(self) -> str: