Skip to content

Commit cf95a23

Browse files
JE-ChenJE-Chen
committed
Update dev version
Update dev version
1 parent 280b54d commit cf95a23

File tree

5 files changed

+183
-97
lines changed

5 files changed

+183
-97
lines changed

‎je_auto_control/utils/callback/callback_function_executor.py

+108-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,121 @@
33

44
from je_auto_control.utils.exception.exception_tags import get_bad_trigger_method, get_bad_trigger_function
55
from je_auto_control.utils.exception.exceptions import CallbackExecutorException
6-
from je_auto_control.utils.global_dict.event_dict import event_dict
6+
# executor
7+
from je_auto_control.utils.executor.action_executor import execute_action
8+
from je_auto_control.utils.executor.action_executor import execute_files
9+
# file process
10+
from je_auto_control.utils.file_process.get_dir_file_list import get_dir_files_as_list
11+
# html report
12+
from je_auto_control.utils.generate_report.generate_html_report import generate_html
13+
from je_auto_control.utils.generate_report.generate_html_report import generate_html_report
14+
from je_auto_control.utils.generate_report.generate_json_report import generate_json
15+
from je_auto_control.utils.generate_report.generate_json_report import generate_json_report
16+
# xml
17+
from je_auto_control.utils.generate_report.generate_xml_report import generate_xml
18+
from je_auto_control.utils.generate_report.generate_xml_report import generate_xml_report
19+
# utils image
20+
from je_auto_control.utils.image.screenshot import pil_screenshot
21+
# json
22+
from je_auto_control.utils.json.json_file import read_action_json
23+
from je_auto_control.utils.json.json_file import write_action_json
724
from je_auto_control.utils.package_manager.package_manager_class import \
825
package_manager
26+
from je_auto_control.utils.project.create_project_structure import create_project_dir
27+
from je_auto_control.utils.shell_process.shell_exec import ShellManager
28+
# socket server
29+
from je_auto_control.utils.socket_server.auto_control_socket_server import start_autocontrol_socket_server
30+
from je_auto_control.utils.start_exe.start_another_process import start_exe
31+
# test record
32+
from je_auto_control.utils.test_record.record_test_class import test_record_instance
33+
# import image
34+
from je_auto_control.wrapper.auto_control_image import locate_all_image
35+
from je_auto_control.wrapper.auto_control_image import locate_and_click
36+
from je_auto_control.wrapper.auto_control_image import locate_image_center
37+
from je_auto_control.wrapper.auto_control_keyboard import check_key_is_press, get_special_table, get_keyboard_keys_table
38+
from je_auto_control.wrapper.auto_control_keyboard import hotkey
39+
# import keyboard
40+
from je_auto_control.wrapper.auto_control_keyboard import press_keyboard_key
41+
from je_auto_control.wrapper.auto_control_keyboard import release_keyboard_key
42+
from je_auto_control.wrapper.auto_control_keyboard import type_keyboard
43+
from je_auto_control.wrapper.auto_control_keyboard import write
44+
# import mouse
45+
from je_auto_control.wrapper.auto_control_mouse import click_mouse, get_mouse_table
46+
from je_auto_control.wrapper.auto_control_mouse import get_mouse_position
47+
from je_auto_control.wrapper.auto_control_mouse import mouse_scroll
48+
from je_auto_control.wrapper.auto_control_mouse import press_mouse
49+
from je_auto_control.wrapper.auto_control_mouse import release_mouse
50+
from je_auto_control.wrapper.auto_control_mouse import set_mouse_position
51+
# test_record
52+
from je_auto_control.wrapper.auto_control_record import record
53+
from je_auto_control.wrapper.auto_control_record import stop_record
54+
# import screen
55+
from je_auto_control.wrapper.auto_control_screen import screen_size
56+
from je_auto_control.wrapper.auto_control_screen import screenshot
957

1058

1159
class CallbackFunctionExecutor(object):
1260

1361
def __init__(self):
14-
self.event_dict: dict = event_dict
62+
self.event_dict: dict = {
63+
# mouse
64+
"mouse_left": click_mouse,
65+
"mouse_right": click_mouse,
66+
"mouse_middle": click_mouse,
67+
"click_mouse": click_mouse,
68+
"get_mouse_table": get_mouse_table,
69+
"get_mouse_position": get_mouse_position,
70+
"press_mouse": press_mouse,
71+
"release_mouse": release_mouse,
72+
"mouse_scroll": mouse_scroll,
73+
"set_mouse_position": set_mouse_position,
74+
"get_special_table": get_special_table,
75+
# keyboard
76+
"get_keyboard_keys_table": get_keyboard_keys_table,
77+
"type_keyboard": type_keyboard,
78+
"press_keyboard_key": press_keyboard_key,
79+
"release_keyboard_key": release_keyboard_key,
80+
"check_key_is_press": check_key_is_press,
81+
"write": write,
82+
"hotkey": hotkey,
83+
# image
84+
"locate_all_image": locate_all_image,
85+
"locate_image_center": locate_image_center,
86+
"locate_and_click": locate_and_click,
87+
# screen
88+
"screen_size": screen_size,
89+
"screenshot": screenshot,
90+
# test record
91+
"set_record_enable": test_record_instance.set_record_enable,
92+
# only generate
93+
"generate_html": generate_html,
94+
"generate_json": generate_json,
95+
"generate_xml": generate_xml,
96+
# generate report
97+
"generate_html_report": generate_html_report,
98+
"generate_json_report": generate_json_report,
99+
"generate_xml_report": generate_xml_report,
100+
# record
101+
"record": record,
102+
"stop_record": stop_record,
103+
# execute
104+
"execute_action": execute_action,
105+
"execute_files": execute_files,
106+
"create_template_dir": create_project_dir,
107+
"get_dir_files_as_list": get_dir_files_as_list,
108+
"pil_screenshot": pil_screenshot,
109+
"read_action_json": read_action_json,
110+
"write_action_json": write_action_json,
111+
"start_autocontrol_socket_server": start_autocontrol_socket_server,
112+
"add_package_to_executor": package_manager.add_package_to_executor,
113+
"add_package_to_callback_executor": package_manager.add_package_to_callback_executor,
114+
# project
115+
"create_project": create_project_dir,
116+
# Shell
117+
"shell_command": ShellManager().exec_shell,
118+
# Another process
119+
"execute_process": start_exe,
120+
}
15121

16122
def callback_function(
17123
self,

‎je_auto_control/utils/executor/action_executor.py

+74-3
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,87 @@
88
from je_auto_control.utils.exception.exception_tags import cant_execute_action_error
99
from je_auto_control.utils.exception.exceptions import AutoControlActionException, AutoControlAddCommandException
1010
from je_auto_control.utils.exception.exceptions import AutoControlActionNullException
11-
from je_auto_control.utils.global_dict.event_dict import event_dict
11+
from je_auto_control.utils.generate_report.generate_html_report import generate_html
12+
from je_auto_control.utils.generate_report.generate_html_report import generate_html_report
13+
from je_auto_control.utils.generate_report.generate_json_report import generate_json
14+
from je_auto_control.utils.generate_report.generate_json_report import generate_json_report
15+
from je_auto_control.utils.generate_report.generate_xml_report import generate_xml
16+
from je_auto_control.utils.generate_report.generate_xml_report import generate_xml_report
1217
from je_auto_control.utils.json.json_file import read_action_json
1318
from je_auto_control.utils.package_manager.package_manager_class import package_manager
14-
from je_auto_control.utils.test_record.record_test_class import record_action_to_list
19+
from je_auto_control.utils.project.create_project_structure import create_project_dir
20+
from je_auto_control.utils.shell_process.shell_exec import ShellManager
21+
from je_auto_control.utils.start_exe.start_another_process import start_exe
22+
from je_auto_control.utils.test_record.record_test_class import record_action_to_list, test_record_instance
23+
from je_auto_control.wrapper.auto_control_image import locate_all_image, locate_and_click, locate_image_center
24+
from je_auto_control.wrapper.auto_control_keyboard import check_key_is_press
25+
from je_auto_control.wrapper.auto_control_keyboard import get_special_table, get_keyboard_keys_table
26+
from je_auto_control.wrapper.auto_control_keyboard import press_keyboard_key, release_keyboard_key, hotkey, \
27+
type_keyboard, write
28+
from je_auto_control.wrapper.auto_control_mouse import get_mouse_position, press_mouse, release_mouse, click_mouse, \
29+
mouse_scroll
30+
from je_auto_control.wrapper.auto_control_mouse import get_mouse_table
31+
from je_auto_control.wrapper.auto_control_mouse import set_mouse_position
32+
from je_auto_control.wrapper.auto_control_record import record, stop_record
33+
from je_auto_control.wrapper.auto_control_screen import screenshot, screen_size
1534

1635

1736
class Executor(object):
1837

1938
def __init__(self):
20-
self.event_dict: dict = event_dict
39+
self.event_dict: dict = {
40+
# mouse
41+
"mouse_left": click_mouse,
42+
"mouse_right": click_mouse,
43+
"mouse_middle": click_mouse,
44+
"click_mouse": click_mouse,
45+
"get_mouse_table": get_mouse_table,
46+
"get_mouse_position": get_mouse_position,
47+
"press_mouse": press_mouse,
48+
"release_mouse": release_mouse,
49+
"mouse_scroll": mouse_scroll,
50+
"set_mouse_position": set_mouse_position,
51+
"get_special_table": get_special_table,
52+
# keyboard
53+
"get_keyboard_keys_table": get_keyboard_keys_table,
54+
"type_keyboard": type_keyboard,
55+
"press_keyboard_key": press_keyboard_key,
56+
"release_keyboard_key": release_keyboard_key,
57+
"check_key_is_press": check_key_is_press,
58+
"write": write,
59+
"hotkey": hotkey,
60+
# image
61+
"locate_all_image": locate_all_image,
62+
"locate_image_center": locate_image_center,
63+
"locate_and_click": locate_and_click,
64+
# screen
65+
"screen_size": screen_size,
66+
"screenshot": screenshot,
67+
# test record
68+
"set_record_enable": test_record_instance.set_record_enable,
69+
# only generate
70+
"generate_html": generate_html,
71+
"generate_json": generate_json,
72+
"generate_xml": generate_xml,
73+
# generate report
74+
"generate_html_report": generate_html_report,
75+
"generate_json_report": generate_json_report,
76+
"generate_xml_report": generate_xml_report,
77+
# record
78+
"record": record,
79+
"stop_record": stop_record,
80+
# execute
81+
"execute_action": self.execute_action,
82+
"execute_files": self.execute_files,
83+
"add_package_to_executor": package_manager.add_package_to_executor,
84+
"add_package_to_callback_executor": package_manager.add_package_to_callback_executor,
85+
# project
86+
"create_project": create_project_dir,
87+
# Shell
88+
"shell_command": ShellManager().exec_shell,
89+
# Another process
90+
"execute_process": start_exe,
91+
}
2192
# get all builtin function and add to event dict
2293
for function in getmembers(builtins, isbuiltin):
2394
self.event_dict.update({str(function[0]): function[1]})

‎je_auto_control/utils/global_dict/__init__.py

Whitespace-only changes.

‎je_auto_control/utils/global_dict/event_dict.py

-91
This file was deleted.

‎pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
66

77
[project]
88
name = "je_auto_control_dev"
9-
version = "0.0.78"
9+
version = "0.0.79"
1010
authors = [
1111
{ name = "JE-Chen", email = "[email protected]" },
1212
]

0 commit comments

Comments
 (0)