Skip to content
Merged

Dev #141

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .idea/discord.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

79 changes: 55 additions & 24 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions autocontrol_driver/generate_autocontrol_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

from je_auto_control import start_autocontrol_socket_server

try:
server = start_autocontrol_socket_server()
while not server.close_flag:
pass
sys.exit(0)
except Exception as error:
print(repr(error))
server = start_autocontrol_socket_server()
while True:
if server.close_flag:
sys.exit(0)
13 changes: 6 additions & 7 deletions stable.toml → dev.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Rename to build stable version
# This is stable version
# Rename to build dev version
# This is dev version
[build-system]
requires = ["setuptools>=61.0"]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"

[project]
name = "je_auto_control"
version = "0.0.158"
name = "je_auto_control_dev"
version = "0.0.104"
authors = [
{ name = "JE-Chen", email = "[email protected]" },
]
Expand All @@ -17,11 +17,10 @@ dependencies = [
"je_open_cv",
"pillow",
"APScheduler",
"Pyside6",
"pyobjc-core;platform_system=='Darwin'",
"pyobjc;platform_system=='Darwin'",
"python-Xlib;platform_system=='Linux'",
"Pyside6",
"qt-material"
]
classifiers = [
"Programming Language :: Python :: 3.9",
Expand Down
1 change: 1 addition & 0 deletions dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
je_auto_control_dev
wheel
build
twine
sphinx
sphinx-rtd-theme
Expand Down
10 changes: 4 additions & 6 deletions je_auto_control/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@
package_manager
from je_auto_control.utils.project.create_project_structure import \
create_project_dir
# Scheduler
from je_auto_control.utils.scheduler.extend_apscheduler import SchedulerManager
# Shell command
from je_auto_control.utils.shell_process.shell_exec import ShellManager
from je_auto_control.utils.shell_process.shell_exec import default_shell_manager
Expand Down Expand Up @@ -104,13 +102,13 @@
# import screen
from je_auto_control.wrapper.auto_control_screen import screen_size
from je_auto_control.wrapper.auto_control_screen import screenshot
# GUI
from je_auto_control.gui.main_window import start_autocontrol_gui
# Scheduler
from je_auto_control.utils.scheduler.extend_apscheduler import SchedulerManager
__all__ = [
"click_mouse", "mouse_keys_table", "get_mouse_position", "press_mouse", "release_mouse",
"mouse_scroll", "set_mouse_position", "special_mouse_keys_table",
"keyboard_keys_table", "press_keyboard_key", "release_keyboard_key", "type_keyboard", "check_key_is_press",
"write", "hotkey", "start_exe", "SchedulerManager", "get_keyboard_keys_table",
"write", "hotkey", "start_exe", "get_keyboard_keys_table",
"screen_size", "screenshot", "locate_all_image", "locate_image_center", "locate_and_click",
"CriticalExit", "AutoControlException", "AutoControlKeyboardException",
"AutoControlMouseException", "AutoControlCantFindKeyException",
Expand All @@ -121,5 +119,5 @@
"generate_html", "generate_html_report", "generate_json", "generate_json_report", "generate_xml",
"generate_xml_report", "get_dir_files_as_list", "create_project_dir", "start_autocontrol_socket_server",
"callback_executor", "package_manager", "get_special_table", "ShellManager", "default_shell_manager",
"start_autocontrol_gui"
"SchedulerManager"
]
12 changes: 6 additions & 6 deletions je_auto_control/utils/callback/callback_function_executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ def callback_function(
**kwargs
) -> Any:
"""
:param trigger_function_name: what function we want to trigger only accept function in event_dict
:param callback_function: what function we want to callback
:param callback_function_param: callback function's param only accept dict
:param callback_param_method: what type param will use on callback function only accept kwargs and args
:param kwargs: trigger_function's param
:return: trigger_function_name return value
:param trigger_function_name: what function we want to trigger only accept function in event_dict.
:param callback_function: what function we want to callback.
:param callback_function_param: callback function's param only accept dict.
:param callback_param_method: what type param will use on callback function only accept kwargs and args.
:param kwargs: trigger_function's param.
:return: trigger_function_name return value.
"""
try:
if trigger_function_name not in self.event_dict.keys():
Expand Down
Loading