Skip to content

Commit 6f929f0

Browse files
authored
Merge pull request #141 from Integration-Automation/dev
Dev
2 parents abbc545 + c4eece5 commit 6f929f0

28 files changed

+250
-214
lines changed

.idea/discord.xml

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/workspace.xml

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

autocontrol_driver/generate_autocontrol_driver.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
from je_auto_control import start_autocontrol_socket_server
44

5-
try:
6-
server = start_autocontrol_socket_server()
7-
while not server.close_flag:
8-
pass
9-
sys.exit(0)
10-
except Exception as error:
11-
print(repr(error))
5+
server = start_autocontrol_socket_server()
6+
while True:
7+
if server.close_flag:
8+
sys.exit(0)

stable.toml renamed to dev.toml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Rename to build stable version
2-
# This is stable version
1+
# Rename to build dev version
2+
# This is dev version
33
[build-system]
4-
requires = ["setuptools>=61.0"]
4+
requires = ["setuptools"]
55
build-backend = "setuptools.build_meta"
66

77
[project]
8-
name = "je_auto_control"
9-
version = "0.0.158"
8+
name = "je_auto_control_dev"
9+
version = "0.0.104"
1010
authors = [
1111
{ name = "JE-Chen", email = "[email protected]" },
1212
]
@@ -17,11 +17,10 @@ dependencies = [
1717
"je_open_cv",
1818
"pillow",
1919
"APScheduler",
20+
"Pyside6",
2021
"pyobjc-core;platform_system=='Darwin'",
2122
"pyobjc;platform_system=='Darwin'",
2223
"python-Xlib;platform_system=='Linux'",
23-
"Pyside6",
24-
"qt-material"
2524
]
2625
classifiers = [
2726
"Programming Language :: Python :: 3.9",

dev_requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
je_auto_control_dev
22
wheel
3+
build
34
twine
45
sphinx
56
sphinx-rtd-theme

je_auto_control/__init__.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@
6060
package_manager
6161
from je_auto_control.utils.project.create_project_structure import \
6262
create_project_dir
63-
# Scheduler
64-
from je_auto_control.utils.scheduler.extend_apscheduler import SchedulerManager
6563
# Shell command
6664
from je_auto_control.utils.shell_process.shell_exec import ShellManager
6765
from je_auto_control.utils.shell_process.shell_exec import default_shell_manager
@@ -104,13 +102,13 @@
104102
# import screen
105103
from je_auto_control.wrapper.auto_control_screen import screen_size
106104
from je_auto_control.wrapper.auto_control_screen import screenshot
107-
# GUI
108-
from je_auto_control.gui.main_window import start_autocontrol_gui
105+
# Scheduler
106+
from je_auto_control.utils.scheduler.extend_apscheduler import SchedulerManager
109107
__all__ = [
110108
"click_mouse", "mouse_keys_table", "get_mouse_position", "press_mouse", "release_mouse",
111109
"mouse_scroll", "set_mouse_position", "special_mouse_keys_table",
112110
"keyboard_keys_table", "press_keyboard_key", "release_keyboard_key", "type_keyboard", "check_key_is_press",
113-
"write", "hotkey", "start_exe", "SchedulerManager", "get_keyboard_keys_table",
111+
"write", "hotkey", "start_exe", "get_keyboard_keys_table",
114112
"screen_size", "screenshot", "locate_all_image", "locate_image_center", "locate_and_click",
115113
"CriticalExit", "AutoControlException", "AutoControlKeyboardException",
116114
"AutoControlMouseException", "AutoControlCantFindKeyException",
@@ -121,5 +119,5 @@
121119
"generate_html", "generate_html_report", "generate_json", "generate_json_report", "generate_xml",
122120
"generate_xml_report", "get_dir_files_as_list", "create_project_dir", "start_autocontrol_socket_server",
123121
"callback_executor", "package_manager", "get_special_table", "ShellManager", "default_shell_manager",
124-
"start_autocontrol_gui"
122+
"SchedulerManager"
125123
]

je_auto_control/utils/callback/callback_function_executor.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,12 @@ def callback_function(
128128
**kwargs
129129
) -> Any:
130130
"""
131-
:param trigger_function_name: what function we want to trigger only accept function in event_dict
132-
:param callback_function: what function we want to callback
133-
:param callback_function_param: callback function's param only accept dict
134-
:param callback_param_method: what type param will use on callback function only accept kwargs and args
135-
:param kwargs: trigger_function's param
136-
:return: trigger_function_name return value
131+
:param trigger_function_name: what function we want to trigger only accept function in event_dict.
132+
:param callback_function: what function we want to callback.
133+
:param callback_function_param: callback function's param only accept dict.
134+
:param callback_param_method: what type param will use on callback function only accept kwargs and args.
135+
:param kwargs: trigger_function's param.
136+
:return: trigger_function_name return value.
137137
"""
138138
try:
139139
if trigger_function_name not in self.event_dict.keys():

0 commit comments

Comments
 (0)