Skip to content

Commit 6ed64a7

Browse files
committed
update stable and dev version
now execute action will return dict refactor execute action
1 parent e1ba490 commit 6ed64a7

File tree

5 files changed

+36
-29
lines changed

5 files changed

+36
-29
lines changed

.idea/workspace.xml

+16-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev_setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name="je_auto_control_dev",
8-
version="0.0.27",
8+
version="0.0.28",
99
author="JE-Chen",
1010
author_email="zenmailman@gmail.com",
1111
description="auto testing",

je_auto_control/utils/executor/action_executor.py

+17-14
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,23 @@ def __init__(self):
5252
"generate_html": generate_html,
5353
}
5454

55-
def execute_action(self, action_list: list) -> str:
55+
def _execute_event(self, action: list):
56+
event = self.event_dict.get(action[0])
57+
if len(action) == 2:
58+
event(**action[1])
59+
elif len(action) == 1:
60+
event()
61+
else:
62+
raise AutoControlActionException(cant_execute_action_error)
63+
64+
def execute_action(self, action_list: list) -> dict:
5665
"""
5766
use to execute all action on action list(action file or program list)
5867
:param action_list the list include action
5968
for loop the list and execute action
6069
"""
61-
execute_record_string = ""
70+
71+
execute_record_dict = dict()
6272
try:
6373
if len(action_list) > 0 or type(action_list) is list:
6474
pass
@@ -69,20 +79,13 @@ def execute_action(self, action_list: list) -> str:
6979
print(repr(error), file=sys.stderr)
7080
for action in action_list:
7181
try:
72-
event = self.event_dict.get(action[0])
73-
if len(action) == 2:
74-
event(**action[1])
75-
elif len(action) == 1:
76-
event()
77-
else:
78-
raise AutoControlActionException(cant_execute_action_error)
82+
event_response = self._execute_event(action)
83+
execute_record = "execute: " + str(action)
84+
execute_record_dict.update({execute_record: event_response})
7985
except Exception as error:
8086
print(repr(error), file=sys.stderr)
8187
record_action_to_list("execute_action", None, repr(error))
82-
temp_string = "execute: " + str(action)
83-
print(temp_string)
84-
execute_record_string = "".join([execute_record_string, temp_string + "\n"])
85-
return execute_record_string
88+
return execute_record_dict
8689

8790
def execute_files(self, execute_files_list: list) -> list:
8891
"""
@@ -106,7 +109,7 @@ def add_command_to_executor(command_dict: dict):
106109
raise AutoControlAddCommandException(add_command_exception_tag)
107110

108111

109-
def execute_action(action_list: list) -> str:
112+
def execute_action(action_list: list) -> dict:
110113
return executor.execute_action(action_list)
111114

112115

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name="je_auto_control",
8-
version="0.0.94",
8+
version="0.0.95",
99
author="JE-Chen",
1010
author_email="zenmailman@gmail.com",
1111
description="auto testing",

test/unit_test/execute_action/execute_action_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@
3434
["type_key", {"mouse_keycode": "dwadwawda", "dwadwad": 500, "wdawddwawad": 500}],
3535
]
3636
print("\n\n")
37-
execute_action(test_list)
37+
print(execute_action(test_list))
3838
print(test_record_instance.test_record_list)

0 commit comments

Comments
 (0)