Skip to content

Commit 280b54d

Browse files
JE-ChenJE-Chen
committed
Refactor and update dev version
Refactor and update dev version
1 parent 061802a commit 280b54d

File tree

7 files changed

+131
-212
lines changed

7 files changed

+131
-212
lines changed

‎.idea/workspace.xml‎

Lines changed: 25 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎je_auto_control/utils/callback/callback_function_executor.py‎

Lines changed: 2 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,17 @@
11
import typing
22
from sys import stderr
33

4-
from je_auto_control.utils.shell_process.shell_exec import ShellManager
5-
from je_auto_control.utils.start_exe.start_another_process import start_exe
64
from je_auto_control.utils.exception.exception_tags import get_bad_trigger_method, get_bad_trigger_function
75
from je_auto_control.utils.exception.exceptions import CallbackExecutorException
8-
# executor
9-
from je_auto_control.utils.executor.action_executor import execute_action
10-
from je_auto_control.utils.executor.action_executor import execute_files
11-
# file process
12-
from je_auto_control.utils.file_process.get_dir_file_list import get_dir_files_as_list
13-
# html report
14-
from je_auto_control.utils.generate_report.generate_html_report import generate_html
15-
from je_auto_control.utils.generate_report.generate_html_report import generate_html_report
16-
from je_auto_control.utils.generate_report.generate_json_report import generate_json
17-
from je_auto_control.utils.generate_report.generate_json_report import generate_json_report
18-
# xml
19-
from je_auto_control.utils.generate_report.generate_xml_report import generate_xml
20-
from je_auto_control.utils.generate_report.generate_xml_report import generate_xml_report
21-
# utils image
22-
from je_auto_control.utils.image.screenshot import pil_screenshot
23-
# json
24-
from je_auto_control.utils.json.json_file import read_action_json
25-
from je_auto_control.utils.json.json_file import write_action_json
6+
from je_auto_control.utils.global_dict.event_dict import event_dict
267
from je_auto_control.utils.package_manager.package_manager_class import \
278
package_manager
28-
from je_auto_control.utils.project.create_project_structure import create_project_dir
29-
# socket server
30-
from je_auto_control.utils.socket_server.auto_control_socket_server import start_autocontrol_socket_server
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
579

5810

5911
class CallbackFunctionExecutor(object):
6012

6113
def __init__(self):
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-
}
14+
self.event_dict: dict = event_dict
12115

12216
def callback_function(
12317
self,

‎je_auto_control/utils/executor/action_executor.py‎

Lines changed: 3 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -3,92 +3,21 @@
33
import types
44
from inspect import getmembers, isbuiltin
55

6-
from je_auto_control.utils.start_exe.start_another_process import start_exe
7-
from je_auto_control.utils.shell_process.shell_exec import ShellManager
86
from je_auto_control.utils.exception.exception_tags import action_is_null_error, add_command_exception_tag, \
97
executor_list_error
108
from je_auto_control.utils.exception.exception_tags import cant_execute_action_error
119
from je_auto_control.utils.exception.exceptions import AutoControlActionException, AutoControlAddCommandException
1210
from je_auto_control.utils.exception.exceptions import AutoControlActionNullException
13-
from je_auto_control.utils.generate_report.generate_html_report import generate_html
14-
from je_auto_control.utils.generate_report.generate_html_report import generate_html_report
15-
from je_auto_control.utils.generate_report.generate_json_report import generate_json
16-
from je_auto_control.utils.generate_report.generate_json_report import generate_json_report
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
11+
from je_auto_control.utils.global_dict.event_dict import event_dict
1912
from je_auto_control.utils.json.json_file import read_action_json
2013
from je_auto_control.utils.package_manager.package_manager_class import package_manager
21-
from je_auto_control.utils.project.create_project_structure import create_project_dir
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
14+
from je_auto_control.utils.test_record.record_test_class import record_action_to_list
3415

3516

3617
class Executor(object):
3718

3819
def __init__(self):
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-
}
20+
self.event_dict: dict = event_dict
9221
# get all builtin function and add to event dict
9322
for function in getmembers(builtins, isbuiltin):
9423
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‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
from je_auto_control.utils.socket_server.auto_control_socket_server import start_autocontrol_socket_server
2+
3+
from je_auto_control.utils.image.screenshot import pil_screenshot
4+
5+
from je_auto_control.utils.file_process.get_dir_file_list import get_dir_files_as_list
6+
7+
from je_auto_control.utils.executor.action_executor import execute_action, execute_files
8+
9+
from je_auto_control.utils.generate_report.generate_html_report import generate_html
10+
from je_auto_control.utils.generate_report.generate_html_report import generate_html_report
11+
from je_auto_control.utils.generate_report.generate_json_report import generate_json
12+
from je_auto_control.utils.generate_report.generate_json_report import generate_json_report
13+
from je_auto_control.utils.generate_report.generate_xml_report import generate_xml
14+
from je_auto_control.utils.generate_report.generate_xml_report import generate_xml_report
15+
from je_auto_control.utils.json.json_file import read_action_json, write_action_json
16+
from je_auto_control.utils.package_manager.package_manager_class import package_manager
17+
from je_auto_control.utils.project.create_project_structure import create_project_dir
18+
from je_auto_control.utils.shell_process.shell_exec import ShellManager
19+
from je_auto_control.utils.start_exe.start_another_process import start_exe
20+
from je_auto_control.utils.test_record.record_test_class import test_record_instance
21+
from je_auto_control.wrapper.auto_control_image import locate_all_image, locate_and_click, locate_image_center
22+
from je_auto_control.wrapper.auto_control_keyboard import check_key_is_press
23+
from je_auto_control.wrapper.auto_control_keyboard import get_special_table, get_keyboard_keys_table
24+
from je_auto_control.wrapper.auto_control_keyboard import press_keyboard_key, release_keyboard_key, hotkey, \
25+
type_keyboard, write
26+
from je_auto_control.wrapper.auto_control_mouse import get_mouse_position, press_mouse, release_mouse, click_mouse, \
27+
mouse_scroll
28+
from je_auto_control.wrapper.auto_control_mouse import get_mouse_table
29+
from je_auto_control.wrapper.auto_control_mouse import set_mouse_position
30+
from je_auto_control.wrapper.auto_control_record import record, stop_record
31+
from je_auto_control.wrapper.auto_control_screen import screenshot, screen_size
32+
33+
event_dict: dict = {
34+
# mouse
35+
"mouse_left": click_mouse,
36+
"mouse_right": click_mouse,
37+
"mouse_middle": click_mouse,
38+
"click_mouse": click_mouse,
39+
"get_mouse_table": get_mouse_table,
40+
"get_mouse_position": get_mouse_position,
41+
"press_mouse": press_mouse,
42+
"release_mouse": release_mouse,
43+
"mouse_scroll": mouse_scroll,
44+
"set_mouse_position": set_mouse_position,
45+
"get_special_table": get_special_table,
46+
# keyboard
47+
"get_keyboard_keys_table": get_keyboard_keys_table,
48+
"type_keyboard": type_keyboard,
49+
"press_keyboard_key": press_keyboard_key,
50+
"release_keyboard_key": release_keyboard_key,
51+
"check_key_is_press": check_key_is_press,
52+
"write": write,
53+
"hotkey": hotkey,
54+
# image
55+
"locate_all_image": locate_all_image,
56+
"locate_image_center": locate_image_center,
57+
"locate_and_click": locate_and_click,
58+
# screen
59+
"screen_size": screen_size,
60+
"screenshot": screenshot,
61+
# test record
62+
"set_record_enable": test_record_instance.set_record_enable,
63+
# only generate
64+
"generate_html": generate_html,
65+
"generate_json": generate_json,
66+
"generate_xml": generate_xml,
67+
# generate report
68+
"generate_html_report": generate_html_report,
69+
"generate_json_report": generate_json_report,
70+
"generate_xml_report": generate_xml_report,
71+
# record
72+
"record": record,
73+
"stop_record": stop_record,
74+
# execute
75+
"execute_action": execute_action,
76+
"execute_files": execute_files,
77+
"create_template_dir": create_project_dir,
78+
"get_dir_files_as_list": get_dir_files_as_list,
79+
"pil_screenshot": pil_screenshot,
80+
"read_action_json": read_action_json,
81+
"write_action_json": write_action_json,
82+
"start_autocontrol_socket_server": start_autocontrol_socket_server,
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+
}

0 commit comments

Comments
 (0)